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 7C2C3C433FE for ; Sat, 19 Mar 2022 08:17:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242473AbiCSISg (ORCPT ); Sat, 19 Mar 2022 04:18:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233088AbiCSISe (ORCPT ); Sat, 19 Mar 2022 04:18:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E905C23193D; Sat, 19 Mar 2022 01:17:14 -0700 (PDT) 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 84C8260DB4; Sat, 19 Mar 2022 08:17:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78192C340EC; Sat, 19 Mar 2022 08:17:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647677834; bh=XKOQjqIaURxgBzAC86d2mUm8wd3h7T9RaXyq8DIm5MU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=herOR2Ypvi98+mCJGFrD9bfd8rZH/+UE7Gad4k5Zda5Vt8fIyMEQRsFmqxukYcOSn CArPvPGzHu2n+UY5I8Pd3d1L9Q79yiZltv0OesnYPuV/LjOo2pynTvOaAFBOeOXEwK 7gC8Om8TZrwu3CACnuwqKBhjm7USf5gOx89IlLj4= Date: Sat, 19 Mar 2022 09:17:10 +0100 From: Greg Kroah-Hartman To: James Morse Cc: Florian Fainelli , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Catalin Marinas , Sasha Levin Subject: Re: fixup for [PATCH 5.4 18/43] arm64 entry: Add macro for reading symbol address from the trampoline Message-ID: References: <20220318173713.2320567-1-james.morse@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220318173713.2320567-1-james.morse@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 18, 2022 at 05:37:13PM +0000, James Morse wrote: > __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 > Thanks, now queued up. greg k-h