From edcd81199dbad5db11ae91b507cec1d46dd94a49 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 30 Jan 2008 13:33:16 +0100
Subject: [PATCH] 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>
---
arch/x86/mm/fault_32.c | 2 +-
arch/x86/mm/fault_64.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index 71c722bb6963d..13d295506a176 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -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
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 75b7b165bdf33..b606bdefbb729 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -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
--
GitLab