arm/xor: remove in_interrupt() handling

xor_blocks can't be called from interrupt context, so remove the handling
for that.

Link: https://lkml.kernel.org/r/20260327061704.3707577-3-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Biggers <ebiggers@kernel.org>
Tested-by: Eric Biggers <ebiggers@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Mason <clm@fb.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: David Sterba <dsterba@suse.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason A. Donenfeld <jason@zx2c4.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Li Nan <linan122@huawei.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Magnus Lindholm <linmag7@gmail.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Song Liu <song@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/arm/include/asm/xor.h b/arch/arm/include/asm/xor.h
index 934b549905f5c578a4a7079b153a6f7aee908e99..bca2a6514746e150f9c2c6c764c9c5a8fc8473d2 100644 (file)
--- a/arch/arm/include/asm/xor.h
+++ b/arch/arm/include/asm/xor.h
@@ -4,7 +4,6 @@
  *
  *  Copyright (C) 2001 Russell King
  */
-#include <linux/hardirq.h>
 #include <asm-generic/xor.h>
 #include <asm/hwcap.h>
 #include <asm/neon.h>
@@ -156,13 +155,9 @@ static void
 xor_neon_2(unsigned long bytes, unsigned long * __restrict p1,
           const unsigned long * __restrict p2)
 {
-       if (in_interrupt()) {
-               xor_arm4regs_2(bytes, p1, p2);
-       } else {
-               kernel_neon_begin();
-               xor_block_neon_inner.do_2(bytes, p1, p2);
-               kernel_neon_end();
-       }
+       kernel_neon_begin();
+       xor_block_neon_inner.do_2(bytes, p1, p2);
+       kernel_neon_end();
 }
 
 static void
@@ -170,13 +165,9 @@ xor_neon_3(unsigned long bytes, unsigned long * __restrict p1,
           const unsigned long * __restrict p2,
           const unsigned long * __restrict p3)
 {
-       if (in_interrupt()) {
-               xor_arm4regs_3(bytes, p1, p2, p3);
-       } else {
-               kernel_neon_begin();
-               xor_block_neon_inner.do_3(bytes, p1, p2, p3);
-               kernel_neon_end();
-       }
+       kernel_neon_begin();
+       xor_block_neon_inner.do_3(bytes, p1, p2, p3);
+       kernel_neon_end();
 }
 
 static void
@@ -185,13 +176,9 @@ xor_neon_4(unsigned long bytes, unsigned long * __restrict p1,
           const unsigned long * __restrict p3,
           const unsigned long * __restrict p4)
 {
-       if (in_interrupt()) {
-               xor_arm4regs_4(bytes, p1, p2, p3, p4);
-       } else {
-               kernel_neon_begin();
-               xor_block_neon_inner.do_4(bytes, p1, p2, p3, p4);
-               kernel_neon_end();
-       }
+       kernel_neon_begin();
+       xor_block_neon_inner.do_4(bytes, p1, p2, p3, p4);
+       kernel_neon_end();
 }
 
 static void
@@ -201,13 +188,9 @@ xor_neon_5(unsigned long bytes, unsigned long * __restrict p1,
           const unsigned long * __restrict p4,
           const unsigned long * __restrict p5)
 {
-       if (in_interrupt()) {
-               xor_arm4regs_5(bytes, p1, p2, p3, p4, p5);
-       } else {
-               kernel_neon_begin();
-               xor_block_neon_inner.do_5(bytes, p1, p2, p3, p4, p5);
-               kernel_neon_end();
-       }
+       kernel_neon_begin();
+       xor_block_neon_inner.do_5(bytes, p1, p2, p3, p4, p5);
+       kernel_neon_end();
 }
 
 static struct xor_block_template xor_block_neon = {