Commit-ID: 6e03f66c001790d6ca853c68a56c87460bc86467 Gitweb: http://git.kernel.org/tip/6e03f66c001790d6ca853c68a56c87460bc86467 Author: Andy Shevchenko <andriy.shevche...@linux.intel.com> AuthorDate: Tue, 10 Jan 2017 18:43:54 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Thu, 12 Jan 2017 09:43:07 +0100
locking/jump_labels: Update bug_at() boot message First of all, %*ph specifier allows to dump data in hex format using the pointer to a buffer. This is suitable to use here. Besides that Thomas suggested to move it to critical level and replace __FILE__ by explicit mention of "jumplabel". Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Link: http://lkml.kernel.org/r/20170110164354.47372-1-andriy.shevche...@linux.intel.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/kernel/jump_label.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c index fc25f69..c37bd0f 100644 --- a/arch/x86/kernel/jump_label.c +++ b/arch/x86/kernel/jump_label.c @@ -32,8 +32,7 @@ static void bug_at(unsigned char *ip, int line) * Something went wrong. Crash the box, as something could be * corrupting the kernel. */ - pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n", - ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line); + pr_crit("jump_label: Fatal kernel bug, unexpected op at %pS [%p] (%5ph) %d\n", ip, ip, ip, line); BUG(); }
