diff options
Diffstat (limited to 'arch/powerpc/mm/fault.c')
-rw-r--r-- | arch/powerpc/mm/fault.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 24b3f4949df4..08d659a9fcdb 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/kprobes.h> | 30 | #include <linux/kprobes.h> |
31 | #include <linux/kdebug.h> | 31 | #include <linux/kdebug.h> |
32 | #include <linux/perf_event.h> | 32 | #include <linux/perf_event.h> |
33 | #include <linux/magic.h> | ||
34 | #include <linux/ratelimit.h> | 33 | #include <linux/ratelimit.h> |
35 | #include <linux/context_tracking.h> | 34 | #include <linux/context_tracking.h> |
36 | #include <linux/hugetlb.h> | 35 | #include <linux/hugetlb.h> |
@@ -521,7 +520,6 @@ bail: | |||
521 | void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) | 520 | void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) |
522 | { | 521 | { |
523 | const struct exception_table_entry *entry; | 522 | const struct exception_table_entry *entry; |
524 | unsigned long *stackend; | ||
525 | 523 | ||
526 | /* Are we prepared to handle this fault? */ | 524 | /* Are we prepared to handle this fault? */ |
527 | if ((entry = search_exception_tables(regs->nip)) != NULL) { | 525 | if ((entry = search_exception_tables(regs->nip)) != NULL) { |
@@ -550,8 +548,7 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) | |||
550 | printk(KERN_ALERT "Faulting instruction address: 0x%08lx\n", | 548 | printk(KERN_ALERT "Faulting instruction address: 0x%08lx\n", |
551 | regs->nip); | 549 | regs->nip); |
552 | 550 | ||
553 | stackend = end_of_stack(current); | 551 | if (task_stack_end_corrupted(current)) |
554 | if (current != &init_task && *stackend != STACK_END_MAGIC) | ||
555 | printk(KERN_ALERT "Thread overran stack, or stack corrupted\n"); | 552 | printk(KERN_ALERT "Thread overran stack, or stack corrupted\n"); |
556 | 553 | ||
557 | die("Kernel access of bad area", regs, sig); | 554 | die("Kernel access of bad area", regs, sig); |