From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbdB1KpG (ORCPT ); Tue, 28 Feb 2017 05:45:06 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48962 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751452AbdB1KpD (ORCPT ); Tue, 28 Feb 2017 05:45:03 -0500 Date: Mon, 27 Feb 2017 22:49:37 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: jpoimboe@redhat.com, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, linux@roeck-us.net, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Reply-To: linux@roeck-us.net, peterz@infradead.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, hpa@zytor.com, jpoimboe@redhat.com, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <20170228042116.glmwmwiohcix7o4a@treble> References: <20170228042116.glmwmwiohcix7o4a@treble> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/urgent] objtool: Enclose contents of unreachable() macro in a block Git-Commit-ID: 4e4636cf981b5b629fbfb78aa9f232e015f7d521 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: 4e4636cf981b5b629fbfb78aa9f232e015f7d521 Gitweb: http://git.kernel.org/tip/4e4636cf981b5b629fbfb78aa9f232e015f7d521 Author: Josh Poimboeuf AuthorDate: Mon, 27 Feb 2017 22:21:16 -0600 Committer: Ingo Molnar CommitDate: Tue, 28 Feb 2017 07:47:26 +0100 objtool: Enclose contents of unreachable() macro in a block Guenter Roeck reported a boot failure in mips64. It was bisected to the following commit: d1091c7fa3d5 ("objtool: Improve detection of BUG() and other dead ends") The unreachable() macro was formerly only composed of a single statement. The above commit added a second statement, but neglected to enclose the statements in a block. Suggested-by: Guenter Roeck Reported-by: Guenter Roeck Signed-off-by: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: d1091c7fa3d5 ("objtool: Improve detection of BUG() and other dead ends") Link: http://lkml.kernel.org/r/20170228042116.glmwmwiohcix7o4a@treble Signed-off-by: Ingo Molnar --- include/linux/compiler-gcc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index de47134..f457b52 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -215,7 +215,8 @@ * this in the preprocessor, but we can live with this because they're * unreleased. Really, we need to have autoconf for the kernel. */ -#define unreachable() annotate_unreachable(); __builtin_unreachable() +#define unreachable() \ + do { annotate_unreachable(); __builtin_unreachable(); } while (0) /* Mark a function definition as prohibited from being cloned. */ #define __noclone __attribute__((__noclone__, __optimize__("no-tracer")))