From patchwork Tue Feb 14 21:39:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9572975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C7D860578 for ; Tue, 14 Feb 2017 21:40:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E06427CEA for ; Tue, 14 Feb 2017 21:40:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62AAD27D5E; Tue, 14 Feb 2017 21:40:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 20F2F27CEA for ; Tue, 14 Feb 2017 21:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=TBQtIqWoqo3rq5SQTaEdGO5hE2iFJs9BjaWF6e0WSss=; b=GGI M50X9msm/CUzz0O1i/s1ipPGNlgxTVECW8GINIAxjvJr1RXJ8MWXBhK1fMngrhd8KH3Uefjwiumpd 9HRlvk+OnTrqD9IxdSpgYyMHqgWUhq4vvPDPgehjjucvW21qbXswkaRtFgqmno2zPOwjFCed0NuP7 DVE+GelRQDSsPYijrNdmBdRpnw5Ab/+jOkEKVguOH0d2xc1ky63fLLHZRKPNS6Q3v1RFzQdYvsI/1 GfRjp4STIIau66QQRkxsUCswJb6eLqB4loWQidasGpgMwVUKBlOTU6jh4mZdFHHGAqD10W4rez7Dg gU6plPFCgK6HVadQlcmZCihMqy6494g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cdkph-0001kb-Aa; Tue, 14 Feb 2017 21:40:21 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cdkpb-0000Wu-Th for linux-arm-kernel@lists.infradead.org; Tue, 14 Feb 2017 21:40:19 +0000 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LfsQF-1c1bv01NUZ-00pfkH; Tue, 14 Feb 2017 22:39:45 +0100 From: Arnd Bergmann To: Catalin Marinas , Will Deacon 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= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170214_134016_288182_95D8E7EF X-CRM114-Status: UNSURE ( 9.18 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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