Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: unify page fault oops printing

Browse Source 
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>
This commit is contained in:
Harvey Harrison 2008-01-30 13:34:10 +01:00 committed by Ingo Molnar
parent b3279c7fd7
commit 19f0dda91e
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/mm/fault_32.c
View File

@ -340,15 +340,15 @@ static void show_fault_oops(struct pt_regs *regs, unsigned long error_code,
"(uid: %d)\n", current->uid); "(uid: %d)\n", current->uid);
} }
#endif #endif
printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE) if (address < PAGE_SIZE)
printk(KERN_ALERT "BUG: unable to handle kernel NULL " printk(KERN_CONT "NULL pointer dereference");
"pointer dereference");
else else
printk(KERN_ALERT "BUG: unable to handle kernel paging" printk(KERN_CONT "paging request");
" request"); printk(KERN_CONT " at %08lx\n", address);
printk(" at virtual address %08lx\n", address);
printk(KERN_ALERT "printing ip: %08lx ", regs->ip);
printk(KERN_ALERT "IP:");
printk_address(regs->ip, 1);
dump_pagetable(address); dump_pagetable(address);
} }

9
arch/x86/mm/fault_64.c
View File

@ -296,11 +296,14 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, static void show_fault_oops(struct pt_regs *regs, unsigned long error_code,
unsigned long address) unsigned long address)
{ {
printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE) if (address < PAGE_SIZE)
printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference"); printk(KERN_CONT "NULL pointer dereference");
else else
printk(KERN_ALERT "Unable to handle kernel paging request"); printk(KERN_CONT "paging request");
printk(" at %016lx RIP: \n" KERN_ALERT, address); printk(KERN_CONT " at %016lx\n", address);
printk(KERN_ALERT "IP:");
printk_address(regs->ip, 1); printk_address(regs->ip, 1);
dump_pagetable(address); dump_pagetable(address);
} }