diff options
| author |   Harvey Harrison <harvey.harrison@gmail.com> | 2008-01-30 13:34:10 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:34:10 +0100 |
| commit | b3279c7fd7acf807ab8395d16658514e8c222a37 (patch) | |
| tree | 2ce674dc4a99ca594c7e1a40da3db1545bc8731c /arch/x86/mm/fault_64.c | |
| parent | x86: add is_errata100 helper to fault_32|64.c (diff) | |
| download | linux-dev-b3279c7fd7acf807ab8395d16658514e8c222a37.tar.xz linux-dev-b3279c7fd7acf807ab8395d16658514e8c222a37.zip | |
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) return 0; } +static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, + unsigned long address) +{ + if (address < PAGE_SIZE) + printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference"); + else + printk(KERN_ALERT "Unable to handle kernel paging request"); + printk(" at %016lx RIP: \n" KERN_ALERT, address); + printk_address(regs->ip, 1); + dump_pagetable(address); +} + static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs, unsigned long error_code) { @@ -636,13 +648,8 @@ no_context: flags = oops_begin(); - if (address < PAGE_SIZE) - printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference"); - else - printk(KERN_ALERT "Unable to handle kernel paging request"); - printk(" at %016lx RIP: \n" KERN_ALERT, address); - printk_address(regs->ip, 1); - dump_pagetable(address); + show_fault_oops(regs, error_code, address); + tsk->thread.cr2 = address; tsk->thread.trap_no = 14; tsk->thread.error_code = error_code; |