Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2519545pxp; Fri, 18 Mar 2022 12:14:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5OGwhiP1SjHyeDDTzX+vcZ2MXl7cAdLHrDWH35/D5nzwTNLkeKQX0haIz2faeWTdf9Wyt X-Received: by 2002:a17:906:6841:b0:6cf:9c02:8965 with SMTP id a1-20020a170906684100b006cf9c028965mr10141978ejs.440.1647630892116; Fri, 18 Mar 2022 12:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647630892; cv=none; d=google.com; s=arc-20160816; b=SXZzHsYUUCsdTPeumpkCSG6frs2V4SNdLJOaKHfmp4NQyrN2GVGe6Jj/3W2rKiIt92 Yvff+mpb3OnbvIyU0zc/yw4EG2T77n4KNATZLvlP2jbgsuAjhfjopdHk+R+T4WXcEByu uklk/ibehWkeot9Pj0r+wUaqZDupIed+J2gHS0FgVeg6/eRREL4uKJxlw4IYKHgWQJu3 6WoZFCFflFp3FPu5arOp0AspjHgcceu/OSzDBQV6iKCBM0JkNDydgLq5QmCikxmGQRzt QYmdHIDc+dMzljDl/I8qHSsfhRxhth7KzuY7Llgvp5Vp/McWDHhPeR44EZT+HUhWRQgp KcsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=+WoYTLnTo4krkBMXeKxc9s5sFnkRN1XTJumptS/KJa0=; b=J5QBJFhYEOxzGcFfcO6hsyBch4USsrYvVSBScoDzAfDbBco4s5uHdjSXXbmIAx7qwD 3WvtVFw/t5304fSH7IZwKnJy9oD9KeR3Y7a61WK/oXJ+5sQki3HyqPy3QztnzbE8IqsP hSxEjduHx+eiyQP7c9Cw4HZSQAX/qk1bdowBAm0rMVA5Xaf0jTx9kDixS0XKyK8oYAFG g+xZ6KfNKGqiyXEM67vEF+AttYl/H8vxQGcsy/Ao4uWnGOSicTc2YdLoRhNooKbWdeIN dN29yt4yCFxCVEDyTdMMFAtZuQv9Ze6Z9hWQel0MsGUMOeKMJ6s8W3d2mHtPbzEovaOM yAPg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c6-20020a50f606000000b00418fc8a4b63si3481321edn.529.2022.03.18.12.14.26; Fri, 18 Mar 2022 12:14:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239696AbiCRRip (ORCPT + 99 others); Fri, 18 Mar 2022 13:38:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239693AbiCRRii (ORCPT ); Fri, 18 Mar 2022 13:38:38 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 756903076F8; Fri, 18 Mar 2022 10:37:19 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1CE191515; Fri, 18 Mar 2022 10:37:19 -0700 (PDT) Received: from eglon.cambridge.arm.com (eglon.cambridge.arm.com [10.1.196.218]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 203123F7B4; Fri, 18 Mar 2022 10:37:18 -0700 (PDT) From: James Morse To: Greg Kroah-Hartman Cc: James Morse , Florian Fainelli , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Catalin Marinas , Sasha Levin Subject: fixup for [PATCH 5.4 18/43] arm64 entry: Add macro for reading symbol address from the trampoline Date: Fri, 18 Mar 2022 17:37:13 +0000 Message-Id: <20220318173713.2320567-1-james.morse@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __sdei_asm_trampoline_next_handler shouldn't have its own name as the tramp_data_read_var takes the symbol name, and generates the name for the value in the data page if CONFIG_RANDOMIZE_BASE is clear. This means when CONFIG_RANDOMIZE_BASE is clear, this code won't compile as __sdei_asm_trampoline_next_handler doesn't exist. Use the proper name, and let the macro do its thing. Reported-by: Florian Fainelli Tested-by: Florian Fainelli Signed-off-by: James Morse --- arch/arm64/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index e4b5a15c2e2e..cfc0bb6c49f7 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -1190,7 +1190,7 @@ __entry_tramp_data_start: __entry_tramp_data_vectors: .quad vectors #ifdef CONFIG_ARM_SDE_INTERFACE -__entry_tramp_data___sdei_asm_trampoline_next_handler: +__entry_tramp_data___sdei_asm_handler: .quad __sdei_asm_handler #endif /* CONFIG_ARM_SDE_INTERFACE */ .popsection // .rodata @@ -1319,7 +1319,7 @@ ENTRY(__sdei_asm_entry_trampoline) */ 1: str x4, [x1, #(SDEI_EVENT_INTREGS + S_ORIG_ADDR_LIMIT)] - tramp_data_read_var x4, __sdei_asm_trampoline_next_handler + tramp_data_read_var x4, __sdei_asm_handler br x4 ENDPROC(__sdei_asm_entry_trampoline) NOKPROBE(__sdei_asm_entry_trampoline) -- 2.30.2