From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751493AbdALKJV (ORCPT ); Thu, 12 Jan 2017 05:09:21 -0500 Received: from terminus.zytor.com ([198.137.202.10]:39098 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750819AbdALKJS (ORCPT ); Thu, 12 Jan 2017 05:09:18 -0500 Date: Thu, 12 Jan 2017 02:07:48 -0800 From: tip-bot for Andy Shevchenko Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org, andriy.shevchenko@linux.intel.com, torvalds@linux-foundation.org, mingo@kernel.org Reply-To: mingo@kernel.org, torvalds@linux-foundation.org, andriy.shevchenko@linux.intel.com, peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <20170110164354.47372-1-andriy.shevchenko@linux.intel.com> References: <20170110164354.47372-1-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] locking/jump_labels: Update bug_at() boot message Git-Commit-ID: 6e03f66c001790d6ca853c68a56c87460bc86467 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6e03f66c001790d6ca853c68a56c87460bc86467 Gitweb: http://git.kernel.org/tip/6e03f66c001790d6ca853c68a56c87460bc86467 Author: Andy Shevchenko AuthorDate: Tue, 10 Jan 2017 18:43:54 +0200 Committer: Ingo Molnar 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 Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20170110164354.47372-1-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar --- 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(); }