[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-4188f063e3694ccbf2a2044cf17cc325f91e458f@git.kernel.org>
Date: Tue, 26 Jun 2018 03:25:01 -0700
From: tip-bot for Dmitry Vyukov <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, linux-kernel@...r.kernel.org,
sergey.senozhatsky@...il.com, brgerst@...il.com,
peterz@...radead.org, hpa@...or.com, luto@...nel.org,
dvyukov@...gle.com, mingo@...nel.org,
torvalds@...ux-foundation.org, jpoimboe@...hat.com,
dvlasenk@...hat.com, bp@...en8.de
Subject: [tip:x86/urgent] x86/mm: Get rid of KERN_CONT in show_fault_oops()
Commit-ID: 4188f063e3694ccbf2a2044cf17cc325f91e458f
Gitweb: https://git.kernel.org/tip/4188f063e3694ccbf2a2044cf17cc325f91e458f
Author: Dmitry Vyukov <dvyukov@...gle.com>
AuthorDate: Mon, 25 Jun 2018 14:38:08 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 26 Jun 2018 09:00:25 +0200
x86/mm: Get rid of KERN_CONT in show_fault_oops()
KERN_CONT leads to split lines in kernel output
and complicates useful changes to printk like
printing context before each line.
Only acceptable use of continuations is basically
boot-time testing.
Get rid of it.
Signed-off-by: Dmitry Vyukov <dvyukov@...gle.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@...il.com>
Cc: Andy Lutomirski <luto@...nel.org>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Josh Poimboeuf <jpoimboe@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/20180625123808.227417-1-dvyukov@gmail.com
[ Removed unnecessary parentheses and prettified the printk statement. ]
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/mm/fault.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 9a84a0d08727..ee85766e6329 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -671,13 +671,9 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
}
- printk(KERN_ALERT "BUG: unable to handle kernel ");
- if (address < PAGE_SIZE)
- printk(KERN_CONT "NULL pointer dereference");
- else
- printk(KERN_CONT "paging request");
-
- printk(KERN_CONT " at %px\n", (void *) address);
+ pr_alert("BUG: unable to handle kernel %s at %px\n",
+ address < PAGE_SIZE ? "NULL pointer dereference" : "paging request",
+ (void *)address);
dump_pagetable(address);
}
Powered by blists - more mailing lists