From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFEEA39A4A4; Sat, 30 May 2026 17:15:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161331; cv=none; b=aA2GGNFvgu/OEVXPyzc/f0iM1v3BxgpgGXcnV5TLJe1+C7N0ZHBVoRcTubm84aut0EuoV3ksm4Dz31LvLElscoNw8alzaxjkK2W21t9l+vR0amfhCtKV9bUwknEqg0KASJsHAz9WKwapaFSZ4WdlU3VVyWZJS68lfpX2pp4V4I8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161331; c=relaxed/simple; bh=qHUE/1TFoZYD2TpOsaCDceb2039oxsmxh5CG5V1MOrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CZsgvQR8L8bcEri7c4vw/DeA+01+n0UXN3/eR4wdcXbbdmUeWn6DaMyrTaHaLxecb74rLDU1GQRJ7Yogc/SVSuk21dsRT0dg1lUboe5Ae8qQ9mr4PFkQwGnlHAPG4n9/NstxHll9SUjNrMrlVQJLRKSLNVEHvuE7mS87CSPxSEY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Fj1Y1Vnm; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Fj1Y1Vnm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B99A1F00893; Sat, 30 May 2026 17:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780161329; bh=Z31vyFptaDP6H4LHIrX1Am4fsS2IKqwmHovDgzTQIMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Fj1Y1VnmYs7097m08ajpV49d+qC3q7dPoa68ZZa+PXBJCPt5E7by1jGMwA+7RDUzn C+PgxuyAhVWz95hwPy6RqfDZ/LS3rD8r3VuP/MBNhIZ3BFDouDIpvoIX03VQjwqNQw sOSzZYaMyCGUDfjVl2zNxOzdgrtA61EcLpNVvvxI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Eric Biggers , Albert Ou , Alexander Gordeev , Alexandre Ghiti , Andreas Larsson , Anton Ivanov , Ard Biesheuvel , Arnd Bergmann , "Borislav Petkov (AMD)" , Catalin Marinas , Chris Mason , Christian Borntraeger , Dan Williams , "David S. Miller" , David Sterba , Heiko Carstens , Herbert Xu , "H. Peter Anvin" , Huacai Chen , Ingo Molnar , "Jason A. Donenfeld" , Johannes Berg , Li Nan , Madhavan Srinivasan , Magnus Lindholm , Matt Turner , Michael Ellerman , Nicholas Piggin , Palmer Dabbelt , Richard Henderson , Richard Weinberger , Russell King , Song Liu , Sven Schnelle , Ted Tso , Vasily Gorbik , WANG Xuerui , Will Deacon , Andrew Morton , Sasha Levin Subject: [PATCH 6.1 592/969] arm64/xor: fix conflicting attributes for xor_block_template Date: Sat, 30 May 2026 18:01:56 +0200 Message-ID: <20260530160316.763476772@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christoph Hellwig [ Upstream commit 675a0dd596e712404557286d0a883b54ee28e4f4 ] Commit 2c54b423cf85 ("arm64/xor: use EOR3 instructions when available") changes the definition to __ro_after_init instead of const, but failed to update the external declaration in xor.h. This was not found because xor-neon.c doesn't include , and can't easily do that due to current architecture of the XOR code. Link: https://lkml.kernel.org/r/20260327061704.3707577-4-hch@lst.de Fixes: 2c54b423cf85 ("arm64/xor: use EOR3 instructions when available") Signed-off-by: Christoph Hellwig Reviewed-by: Eric Biggers Tested-by: Eric Biggers Cc: Albert Ou Cc: Alexander Gordeev Cc: Alexandre Ghiti Cc: Andreas Larsson Cc: Anton Ivanov Cc: Ard Biesheuvel Cc: Arnd Bergmann Cc: "Borislav Petkov (AMD)" Cc: Catalin Marinas Cc: Chris Mason Cc: Christian Borntraeger Cc: Dan Williams Cc: David S. Miller Cc: David Sterba Cc: Heiko Carstens Cc: Herbert Xu Cc: "H. Peter Anvin" Cc: Huacai Chen Cc: Ingo Molnar Cc: Jason A. Donenfeld Cc: Johannes Berg Cc: Li Nan Cc: Madhavan Srinivasan Cc: Magnus Lindholm Cc: Matt Turner Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Palmer Dabbelt Cc: Richard Henderson Cc: Richard Weinberger Cc: Russell King Cc: Song Liu Cc: Sven Schnelle Cc: Ted Ts'o Cc: Vasily Gorbik Cc: WANG Xuerui Cc: Will Deacon Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- arch/arm64/include/asm/xor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/xor.h b/arch/arm64/include/asm/xor.h index befcd8a7abc98..7c03207157196 100644 --- a/arch/arm64/include/asm/xor.h +++ b/arch/arm64/include/asm/xor.h @@ -13,7 +13,7 @@ #ifdef CONFIG_KERNEL_MODE_NEON -extern struct xor_block_template const xor_block_inner_neon; +extern struct xor_block_template xor_block_inner_neon __ro_after_init; static void xor_neon_2(unsigned long bytes, unsigned long * __restrict p1, -- 2.53.0