Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19f0dda9 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b3279c7f

arch/x86/mm/fault_32.c

+6 −6
Original line number Diff line number Diff line
@@ -340,15 +340,15 @@ static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, 
				"(uid: %d)\n", current->uid);

	}

#endif

	printk(KERN_ALERT "BUG: unable to handle kernel ");

	if (address < PAGE_SIZE)

		printk(KERN_ALERT "BUG: unable to handle kernel NULL "

				"pointer dereference");

		printk(KERN_CONT "NULL pointer dereference");

	else

		printk(KERN_ALERT "BUG: unable to handle kernel paging"

				" request");

	printk(" at virtual address %08lx\n", address);

	printk(KERN_ALERT "printing ip: %08lx ", regs->ip);

		printk(KERN_CONT "paging request");

	printk(KERN_CONT " at %08lx\n", address);



	printk(KERN_ALERT "IP:");

	printk_address(regs->ip, 1);

	dump_pagetable(address);

}

arch/x86/mm/fault_64.c

+6 −3
Original line number Diff line number Diff line
@@ -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,

			    unsigned long address)

{

	printk(KERN_ALERT "BUG: unable to handle kernel ");

	if (address < PAGE_SIZE)

		printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");

		printk(KERN_CONT "NULL pointer dereference");

	else

		printk(KERN_ALERT "Unable to handle kernel paging request");

	printk(" at %016lx RIP: \n" KERN_ALERT, address);

		printk(KERN_CONT "paging request");

	printk(KERN_CONT " at %016lx\n", address);



	printk(KERN_ALERT "IP:");

	printk_address(regs->ip, 1);

	dump_pagetable(address);

}