aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/fault_64.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-01-30 07:34:10 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:34:10 -0500
commit19f0dda91e0dcb38c97bbfcff62b108a3bbc7907 (patch)
tree7b181ffbbc893f78e200c1c813fac1f0f4108ee6 /arch/x86/mm/fault_64.c
parentb3279c7fd7acf807ab8395d16658514e8c222a37 (diff)
x86: unify page fault oops printing
This changes the oops dumping format for page faults to be similar between X86_32 and 64. This is the first user of printk_address on X86_32. 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.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 1897704dad46..e12c34ba4ba1 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -296,11 +296,14 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
296static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, 296static void show_fault_oops(struct pt_regs *regs, unsigned long error_code,
297 unsigned long address) 297 unsigned long address)
298{ 298{
299 printk(KERN_ALERT "BUG: unable to handle kernel ");
299 if (address < PAGE_SIZE) 300 if (address < PAGE_SIZE)
300 printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference"); 301 printk(KERN_CONT "NULL pointer dereference");
301 else 302 else
302 printk(KERN_ALERT "Unable to handle kernel paging request"); 303 printk(KERN_CONT "paging request");
303 printk(" at %016lx RIP: \n" KERN_ALERT, address); 304 printk(KERN_CONT " at %016lx\n", address);
305
306 printk(KERN_ALERT "IP:");
304 printk_address(regs->ip, 1); 307 printk_address(regs->ip, 1);
305 dump_pagetable(address); 308 dump_pagetable(address);
306} 309}