lib/raid6: Drop IA64 support

Drop Itanium support from the RAID6 code, and along with it, the 16x and
32x unrolled versions, which were only used by IA64.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 006e18decfad0796a9b8d14cc09170c074493c27..98030accf641feecf33dfbe891a1236fb94f4ae3 100644 (file)
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -84,8 +84,6 @@ extern const struct raid6_calls raid6_intx1;
 extern const struct raid6_calls raid6_intx2;
 extern const struct raid6_calls raid6_intx4;
 extern const struct raid6_calls raid6_intx8;
-extern const struct raid6_calls raid6_intx16;
-extern const struct raid6_calls raid6_intx32;
 extern const struct raid6_calls raid6_mmxx1;
 extern const struct raid6_calls raid6_mmxx2;
 extern const struct raid6_calls raid6_sse1x1;

diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile
index 035b0a4db476a1fba02620c2a422323dc5a1f560..1c5420ff254e8475f786437544a954ac1a87ea5a 100644 (file)
--- a/lib/raid6/Makefile
+++ b/lib/raid6/Makefile
@@ -2,7 +2,7 @@
 obj-$(CONFIG_RAID6_PQ) += raid6_pq.o
 
 raid6_pq-y     += algos.o recov.o tables.o int1.o int2.o int4.o \
-                  int8.o int16.o int32.o
+                  int8.o
 
 raid6_pq-$(CONFIG_X86) += recov_ssse3.o recov_avx2.o mmx.o sse1.o sse2.o avx2.o avx512.o recov_avx512.o
 raid6_pq-$(CONFIG_ALTIVEC) += altivec1.o altivec2.o altivec4.o altivec8.o \
@@ -55,7 +55,7 @@ endif
 quiet_cmd_unroll = UNROLL  $@
       cmd_unroll = $(AWK) -v N=$* -f $(srctree)/$(src)/unroll.awk < $< > $@
 
-targets += int1.c int2.c int4.c int8.c int16.c int32.c
+targets += int1.c int2.c int4.c int8.c
 $(obj)/int%.c: $(src)/int.uc $(src)/unroll.awk FORCE
        $(call if_changed,unroll)
 

diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index 0ec534faf019bc966095f9cecf082720a834d412..cd2e88ee1f148cf42dbebca4749c8fa44e2c3f37 100644 (file)
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -80,10 +80,6 @@ const struct raid6_calls * const raid6_algos[] = {
 #ifdef CONFIG_CPU_HAS_LSX
        &raid6_lsx,
 #endif
-#endif
-#if defined(__ia64__)
-       &raid6_intx32,
-       &raid6_intx16,
 #endif
        &raid6_intx8,
        &raid6_intx4,

diff --git a/lib/raid6/int.uc b/lib/raid6/int.uc
index 558aeac9342aa8e4b1a40832a7fd4464cb9c06a9..1ba56c3fa482526c257bfa7b85da85ac028a3340 100644 (file)
--- a/lib/raid6/int.uc
+++ b/lib/raid6/int.uc
@@ -41,13 +41,6 @@ typedef u32 unative_t;
 
 
 
-/*
- * IA-64 wants insane amounts of unrolling.  On other architectures that
- * is just a waste of space.
- */
-#if ($# <= 8) || defined(__ia64__)
-
-
 /*
  * These sub-operations are separate inlines since they can sometimes be
  * specially optimized using architecture-specific hacks.
@@ -152,5 +145,3 @@ const struct raid6_calls raid6_intx$# = {
        "int" NSTRING "x$#",
        0
 };
-
-#endif