From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755497AbdBNVkX (ORCPT ); Tue, 14 Feb 2017 16:40:23 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:49857 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752316AbdBNVkV (ORCPT ); Tue, 14 Feb 2017 16:40:21 -0500 From: Arnd Bergmann To: Catalin Marinas , Will Deacon Cc: Arnd Bergmann , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: define BUG() instruction without CONFIG_BUG Date: Tue, 14 Feb 2017 22:39:28 +0100 Message-Id: <20170214213941.3026318-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:LUfUIgvEqfFqa9Fhx5YifSNcr4OaYt0Bgqi8YEwDa7YIJvo9fZa Sxb86jEBJ9GSDLFigyeFwOmV+KD6Hw299nemUTMTwpyhn2vo24q+e5jZA+CFQBiqXwZDjuS IokGYb0cI7VmUnv1hk5JQkm85mG9rzeIrbnqKqsZRtf2VXs2vL+v+co8qxj07/WWbsX6PjQ qiTtcqPQzDC5XitUmjAbQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:Wwl+oc5iF9g=:OBkLWf1V/S6PJ8dJB8HrdJ rAYJ6k8VGogYIe+CzIlYdJsOTsuNp4A2ZSTRrqYsH0XKWKk6tPN+0a+wofTWCqroFTNOnI6q+ kys/wU9FJnFEWIbgZsvteQuMtJAo+3NbcD4yD1iot570G9iGE7Uo3c4bhl7d9LVQDNA6qz+Kx JaTutijK/GlcNVHDKTfcQ+PfVN/IhZqf4KOn4BQFyGaWAcoxyW2BlK9z3HzUd/79JSIZD0X9T Ohn09p82h+JQRPuIhMjEChawFpPMlBzIQxlYpTr1xJNvTEpwVndErlIekEEBPKjDfPxlsan10 1uv3a5JfIlhupYEHMJxdjZ4R/cWWO65vqjfnwWZKcYMbzek8U6xQLXAsIxBxOaJrUE+1QlS0V haD1Plj4GH21hZDw7GLtcbGyKspXDEjcUqsdOLm0q8a00vvXNC4W3A5n6kexe6CCEXrOjHeZa le92cjdebzdPYa1TCYvNrHPCMAkMyEfl9a74PBPJ9DPemvOEt5MnIIXiy4L0T9c83Zj9dhYBt Ob4sdHDuoZUG8EouMfPcpdvTLw54NVTr8usTueh14pMNBWNZV4CHmkUPl1yKx4HRgsAoYk/M1 vjDDp0igb/AOxK145wS0LrRulFp8RaBWyAuHS8IQWnlPHAqj3FZye3aXzLA5z0wfc6LYFmeaA jwUD8viNuMIl6Rk1HvMhmsZiaLq0jESWmkiaIZqG15WrKqWed1B6O0ZqZor9UT1pwi9k= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This mirrors commit e9c38ceba8d9 ("ARM: 8455/1: define __BUG as asm(BUG_INSTR) without CONFIG_BUG") to make the behavior of arm64 consistent with arm and x86, and avoids lots of warnings in randconfig builds, such as: kernel/seccomp.c: In function '__seccomp_filter': kernel/seccomp.c:666:1: error: no return statement in function returning non-void [-Werror=return-type] Signed-off-by: Arnd Bergmann --- arch/arm64/include/asm/bug.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/bug.h b/arch/arm64/include/asm/bug.h index 561190d15881..461751429fc3 100644 --- a/arch/arm64/include/asm/bug.h +++ b/arch/arm64/include/asm/bug.h @@ -20,9 +20,10 @@ #include -#ifdef CONFIG_GENERIC_BUG #define HAVE_ARCH_BUG +#ifdef CONFIG_GENERIC_BUG + #ifdef CONFIG_DEBUG_BUGVERBOSE #define _BUGVERBOSE_LOCATION(file, line) __BUGVERBOSE_LOCATION(file, line) #define __BUGVERBOSE_LOCATION(file, line) \ @@ -57,6 +58,14 @@ _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ #define __WARN_TAINT(taint) _BUG_FLAGS(BUGFLAG_TAINT(taint)) +#else + +#define BUG() do { \ + asm volatile("brk %[imm]" \ + :: [imm] "i" (BUG_BRK_IMM)); \ + unreachable(); \ +} while (0) + #endif /* ! CONFIG_GENERIC_BUG */ #include -- 2.9.0