diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-01-30 07:34:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:34:10 -0500 |
commit | b3279c7fd7acf807ab8395d16658514e8c222a37 (patch) | |
tree | 2ce674dc4a99ca594c7e1a40da3db1545bc8731c /arch/x86/mm/fault_64.c | |
parent | 35f3266ffbee7ff8ca0474dc8dfa3b73d5a1d1ef (diff) |
x86: introduce show_fault_oops helper to fault_32|64.c
This will help when unifying the oops dumping code on 32/64
bit. No functional changes.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/fault_64.c')
-rw-r--r-- | arch/x86/mm/fault_64.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c index ccbb8e30d9f5..1897704dad46 100644 --- a/arch/x86/mm/fault_64.c +++ b/arch/x86/mm/fault_64.c | |||
@@ -293,6 +293,18 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address) | |||
293 | return 0; | 293 | return 0; |
294 | } | 294 | } |
295 | 295 | ||
296 | static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, | ||
297 | unsigned long address) | ||
298 | { | ||
299 | if (address < PAGE_SIZE) | ||
300 | printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference"); | ||
301 | else | ||
302 | printk(KERN_ALERT "Unable to handle kernel paging request"); | ||
303 | printk(" at %016lx RIP: \n" KERN_ALERT, address); | ||
304 | printk_address(regs->ip, 1); | ||
305 | dump_pagetable(address); | ||
306 | } | ||
307 | |||
296 | static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs, | 308 | static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs, |
297 | unsigned long error_code) | 309 | unsigned long error_code) |
298 | { | 310 | { |
@@ -636,13 +648,8 @@ no_context: | |||
636 | 648 | ||
637 | flags = oops_begin(); | 649 | flags = oops_begin(); |
638 | 650 | ||
639 | if (address < PAGE_SIZE) | 651 | show_fault_oops(regs, error_code, address); |
640 | printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference"); | 652 | |
641 | else | ||
642 | printk(KERN_ALERT "Unable to handle kernel paging request"); | ||
643 | printk(" at %016lx RIP: \n" KERN_ALERT, address); | ||
644 | printk_address(regs->ip, 1); | ||
645 | dump_pagetable(address); | ||
646 | tsk->thread.cr2 = address; | 653 | tsk->thread.cr2 = address; |
647 | tsk->thread.trap_no = 14; | 654 | tsk->thread.trap_no = 14; |
648 | tsk->thread.error_code = error_code; | 655 | tsk->thread.error_code = error_code; |