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

Commit edcd8119 authored Jan 30, 2008 by Harvey Harrison Committed by Ingo Molnar Jan 30, 2008

x86: unify printk strings in fault_32|64.c



Adding the address of the faulting library missed removing a
line ending from X86_32.

Also update the shorter printk format for X86_32 in fault_64.c
to make it easier to se the remaining differences.

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>

parent 27cc2a81

arch/x86/mm/fault_32.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -512,7 +512,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
		printk_ratelimit()) {
		printk(
		#ifdef CONFIG_X86_32
		"%s%s[%d]: segfault at %lx ip %08lx sp %08lx error %lx\n",
		"%s%s[%d]: segfault at %lx ip %08lx sp %08lx error %lx",
		#else
		"%s%s[%d]: segfault at %lx ip %lx sp %lx error %lx\n",
		#endif

arch/x86/mm/fault_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -550,7 +550,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
		printk_ratelimit()) {
		printk(
		#ifdef CONFIG_X86_32
		"%s%s[%d]: segfault at %08lx ip %08lx sp %08lx error %lx\n",
		"%s%s[%d]: segfault at %lx ip %08lx sp %08lx error %lx",
		#else
		"%s%s[%d]: segfault at %lx ip %lx sp %lx error %lx\n",
		#endif