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 | 19f0dda91e0dcb38c97bbfcff62b108a3bbc7907 (patch) | |
tree | 7b181ffbbc893f78e200c1c813fac1f0f4108ee6 /arch/x86/mm/fault_32.c | |
parent | b3279c7fd7acf807ab8395d16658514e8c222a37 (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_32.c')
-rw-r--r-- | arch/x86/mm/fault_32.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index fda399758820..28ea3d3ec8f8 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c | |||
@@ -340,15 +340,15 @@ static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, | |||
340 | "(uid: %d)\n", current->uid); | 340 | "(uid: %d)\n", current->uid); |
341 | } | 341 | } |
342 | #endif | 342 | #endif |
343 | printk(KERN_ALERT "BUG: unable to handle kernel "); | ||
343 | if (address < PAGE_SIZE) | 344 | if (address < PAGE_SIZE) |
344 | printk(KERN_ALERT "BUG: unable to handle kernel NULL " | 345 | printk(KERN_CONT "NULL pointer dereference"); |
345 | "pointer dereference"); | ||
346 | else | 346 | else |
347 | printk(KERN_ALERT "BUG: unable to handle kernel paging" | 347 | printk(KERN_CONT "paging request"); |
348 | " request"); | 348 | printk(KERN_CONT " at %08lx\n", address); |
349 | printk(" at virtual address %08lx\n", address); | ||
350 | printk(KERN_ALERT "printing ip: %08lx ", regs->ip); | ||
351 | 349 | ||
350 | printk(KERN_ALERT "IP:"); | ||
351 | printk_address(regs->ip, 1); | ||
352 | dump_pagetable(address); | 352 | dump_pagetable(address); |
353 | } | 353 | } |
354 | 354 | ||