diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2023-01-13 18:08:32 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2023-09-11 08:13:18 +0000 |
| commit | b089ea3cc30de85ea7e20aa66500feb4082dfbf7 (patch) | |
| tree | d4f85bffc35e851b1608fb992d54fde2d16237e6 | |
| parent | af1f459233d4edeef634f559539e7f4b64cb1d25 (diff) | |
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>
| -rw-r--r-- | include/linux/raid/pq.h | 2 | ||||
| -rw-r--r-- | lib/raid6/Makefile | 4 | ||||
| -rw-r--r-- | lib/raid6/algos.c | 4 | ||||
| -rw-r--r-- | lib/raid6/int.uc | 9 |
4 files changed, 2 insertions, 17 deletions
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h index 006e18decfad..98030accf641 100644 --- 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 035b0a4db476..1c5420ff254e 100644 --- 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 0ec534faf019..cd2e88ee1f14 100644 --- a/lib/raid6/algos.c +++ b/lib/raid6/algos.c @@ -81,10 +81,6 @@ const struct raid6_calls * const raid6_algos[] = { &raid6_lsx, #endif #endif -#if defined(__ia64__) - &raid6_intx32, - &raid6_intx16, -#endif &raid6_intx8, &raid6_intx4, &raid6_intx2, diff --git a/lib/raid6/int.uc b/lib/raid6/int.uc index 558aeac9342a..1ba56c3fa482 100644 --- a/lib/raid6/int.uc +++ b/lib/raid6/int.uc @@ -42,13 +42,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 |