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 E3BD4C433EF for ; Fri, 3 Dec 2021 13:05:20 +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:MIME-Version:Message-Id:Date:Subject:Cc :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=YJvn8atsei3HtVP4Vu3j1SDGPLn/kLekOy6+PUVKTXA=; b=I0K6AM/fs5eKAo +jhjCfXGRm/g0O3NqZ9RLPR6wWppjy+j1M/Vs3D0JjUqOKRjpRMQrUoFeuR29axO/Jsp5iUeXGpSb /MhX0xBf7yEtCtF3cUw2CC6IXjG02od+xO8SFhoA0LzZG4Yc4FCd83cjsBcqr4FK/FR+YfxK90HE8 wNdGk9/RxJQjwoOsPJE9Z9IJ6hJMPp8inL49wvbhZYZ0sZK/wRUJex3gtNQUvNOe+XwiJCNeNRX1J PobMBdE/9XOS3bowCM4quOU6/OGg+NjSViS/Ts1N3BDlGZ/Xg/1dn+9kKvHgJVlWRxuucF+L7Rid5 LJ5pmFMw4PliXuIFu4nw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mt8E6-00FqAn-KL; Fri, 03 Dec 2021 13:03:46 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mt8E2-00Fq9n-Ux for linux-arm-kernel@lists.infradead.org; Fri, 03 Dec 2021 13:03:44 +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 8AE0E629FD; Fri, 3 Dec 2021 13:03:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1479C53FAD; Fri, 3 Dec 2021 13:03:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638536620; bh=J5bUhjP1Z2urwHtJBTzDfk0VLIuXyjfvjA5jUIojGOM=; h=From:To:Cc:Subject:Date:From; b=Asl2UY6xbIHs4BFURL4OnqdWKb+gQnOvR6kmdL1Muagko7qldl73/f8QJJSmtX1Og cY82DMiv69PZn32yl4FIMz4QioRgQoqR27sRFhUlNwaxx0PPQnKD5r2y5xswaRIjaa G5HLnF496K4F5nmQnvIv2fZeOfCvUqmIPCCk1ExYvHXvZS8MXHabsihI3pBHO0R4Eu tjMhsyhL5rB0qy4arh95tdjoZLHVhZWZ2dZq5nNgYcQ4fTbOtLzBcaaAoDY0w6tM25 i3zHoI6vUcOolL3oOyhV1WLsg1rI/a5eNo8argcIsKatMrk0S6TrHk3bO1sEEKREyq 1/MAfoab8lVdw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH] arm64: asmlinkage: Enable use of BTI_C macro in SYM_CODE Date: Fri, 3 Dec 2021 13:03:35 +0000 Message-Id: <20211203130335.84733-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1781; h=from:subject; bh=J5bUhjP1Z2urwHtJBTzDfk0VLIuXyjfvjA5jUIojGOM=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhqhWi9u1FfAOawg9h93YfvFeKh7KLTACQM3YTyebP ekMbtIyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYaoVogAKCRAk1otyXVSH0HCnB/ sH1mTNLWZpT8jPB32H3sfvu9/l0dZSX59HZ3xlI4VrzBsnvS2sfouMhN8MVyDk+636m9pqyzOjAw1X uiLlImJc+okj89CEIrcZbIaOcZWQQ19l33+hgfWagv2//GY6n6E5QqSKVyQH2VY0iWrrXIHIr40aV1 mjo+/nLDtYPLwtgrhap6zU89eKI+swzJcMGQK9VwU8hZTYm6NgSSSRjWAs9Fzvwn4uHgdhjht9xtWF 70G+8yNCyDORfMqDocZ9iBkY5z4eczzrqj9RXsHJek8NEZt1Nv4qULqKdGujZt4iB/Z200wyHmQhES LgSq8OwMPF+pH1KDPHeaoHXqaR66rt X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211203_050343_084510_A0B29FDA X-CRM114-Status: GOOD ( 13.23 ) 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 A couple of SYM_CODE sections have added usage of BTI_C which is currently only defined when building for BTI. This means that the users have ugly ifdefs for the case where BTI is disabled so let's provide an empty definition in that case and remove the ifdefs. Signed-off-by: Mark Brown --- arch/arm64/include/asm/linkage.h | 4 ++++ arch/arm64/kernel/entry-ftrace.S | 4 ---- arch/arm64/lib/kasan_sw_tags.S | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h index 9906541a6861..9c70136d7f94 100644 --- a/arch/arm64/include/asm/linkage.h +++ b/arch/arm64/include/asm/linkage.h @@ -42,6 +42,10 @@ SYM_START(name, SYM_L_WEAK, SYM_A_NONE) \ BTI_C +#else + +#define BTI_C + #endif /* diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S index 8cf970d219f5..46a2de864794 100644 --- a/arch/arm64/kernel/entry-ftrace.S +++ b/arch/arm64/kernel/entry-ftrace.S @@ -77,17 +77,13 @@ .endm SYM_CODE_START(ftrace_regs_caller) -#ifdef BTI_C BTI_C -#endif ftrace_regs_entry 1 b ftrace_common SYM_CODE_END(ftrace_regs_caller) SYM_CODE_START(ftrace_caller) -#ifdef BTI_C BTI_C -#endif ftrace_regs_entry 0 b ftrace_common SYM_CODE_END(ftrace_caller) diff --git a/arch/arm64/lib/kasan_sw_tags.S b/arch/arm64/lib/kasan_sw_tags.S index 5b04464c045e..a6d6fa2f761e 100644 --- a/arch/arm64/lib/kasan_sw_tags.S +++ b/arch/arm64/lib/kasan_sw_tags.S @@ -38,9 +38,7 @@ * incremented by 256 prior to return). */ SYM_CODE_START(__hwasan_tag_mismatch) -#ifdef BTI_C BTI_C -#endif add x29, sp, #232 stp x2, x3, [sp, #8 * 2] stp x4, x5, [sp, #8 * 4] -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel