From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD4D8C433EF for ; Fri, 17 Dec 2021 15:53:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238520AbhLQPx2 (ORCPT ); Fri, 17 Dec 2021 10:53:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238504AbhLQPxT (ORCPT ); Fri, 17 Dec 2021 10:53:19 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09A02C061763; Fri, 17 Dec 2021 07:53:19 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9F2E262287; Fri, 17 Dec 2021 15:53:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 766A3C36AEA; Fri, 17 Dec 2021 15:53:16 +0000 (UTC) Date: Fri, 17 Dec 2021 15:53:13 +0000 From: Catalin Marinas To: Mark Brown Cc: Naresh Kamboju , Linux ARM , open list , Linux-Next Mailing List , Will Deacon , Arnd Bergmann , Stephen Rothwell Subject: Re: [next] arm64: efi-rt-wrapper.S:8: Error: unknown mnemonic `bti' -- `bti c' Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, Dec 17, 2021 at 02:49:30PM +0000, Mark Brown wrote: > On Fri, Dec 17, 2021 at 02:00:24PM +0000, Catalin Marinas wrote: > > We defined the bti macro in assembler.h but that's not included by > > linkage.h and not all asm files seem to include the former. At a quick > > grep we need the diff below, not sure it's the best solution: > > That seems sensible to me, especially given the small number of files > affected. The other thing would be to decide that all assembly files > should have the header included by default but that seems like it's > invasive and probably disproportionate. There's also this: diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h index 9065e4749b42..b77e9b3f5371 100644 --- a/arch/arm64/include/asm/linkage.h +++ b/arch/arm64/include/asm/linkage.h @@ -1,6 +1,10 @@ #ifndef __ASM_LINKAGE_H #define __ASM_LINKAGE_H +#ifdef __ASSEMBLY__ +#include +#endif + #define __ALIGN .align 2 #define __ALIGN_STR ".align 2" -- Catalin From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 37B05C433EF for ; Fri, 17 Dec 2021 15:58:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MkDVBNE1iK9Hk56/5zm7QXCuOpeaeO+8DLIYMP/JnfQ=; b=bUgq622hFFC6PY guP4Sqx5cq1Ldn83OJ6Yc8SkC1VSOvUc5eUdEvIAszLN+vqNkL+HsqmXnxZ5EYDAJm2fdUUA4AfbV /PLHpGmjVzJtkph90tQV+khboMswAbgAQJhAgwa87n8szPun3lIagoHT+96Sis4sufTQRYKlMOpUF hDswPrI3DrmMQ0orhdaa80MT6f2Zm4wrR9mRd8z2lKECbnxaxrVJyNBMxpFuKQk3vyVEKwEvNxIul tXThE+eDRhP1VGyPoGxec1YpyIZ8tXaiZ5Kh1CIoNsM/Er/EjwYBuQOjDVOBxUZKpCaOyfAbgqemk zN7G+oxt/lVK0dvP6z1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1myFbQ-00B1qx-GY; Fri, 17 Dec 2021 15:57:00 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1myFXq-00B0WZ-OZ for linux-arm-kernel@lists.infradead.org; Fri, 17 Dec 2021 15:53:20 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3A4E862285; Fri, 17 Dec 2021 15:53:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 766A3C36AEA; Fri, 17 Dec 2021 15:53:16 +0000 (UTC) Date: Fri, 17 Dec 2021 15:53:13 +0000 From: Catalin Marinas To: Mark Brown Cc: Naresh Kamboju , Linux ARM , open list , Linux-Next Mailing List , Will Deacon , Arnd Bergmann , Stephen Rothwell Subject: Re: [next] arm64: efi-rt-wrapper.S:8: Error: unknown mnemonic `bti' -- `bti c' Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211217_075318_891912_C13167B6 X-CRM114-Status: GOOD ( 15.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Dec 17, 2021 at 02:49:30PM +0000, Mark Brown wrote: > On Fri, Dec 17, 2021 at 02:00:24PM +0000, Catalin Marinas wrote: > > We defined the bti macro in assembler.h but that's not included by > > linkage.h and not all asm files seem to include the former. At a quick > > grep we need the diff below, not sure it's the best solution: > > That seems sensible to me, especially given the small number of files > affected. The other thing would be to decide that all assembly files > should have the header included by default but that seems like it's > invasive and probably disproportionate. There's also this: diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h index 9065e4749b42..b77e9b3f5371 100644 --- a/arch/arm64/include/asm/linkage.h +++ b/arch/arm64/include/asm/linkage.h @@ -1,6 +1,10 @@ #ifndef __ASM_LINKAGE_H #define __ASM_LINKAGE_H +#ifdef __ASSEMBLY__ +#include +#endif + #define __ALIGN .align 2 #define __ALIGN_STR ".align 2" -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel