Skip to content

Commit b089ea3

Browse files
committed
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 <[email protected]>
1 parent af1f459 commit b089ea3

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

include/linux/raid/pq.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ extern const struct raid6_calls raid6_intx1;
8484
extern const struct raid6_calls raid6_intx2;
8585
extern const struct raid6_calls raid6_intx4;
8686
extern const struct raid6_calls raid6_intx8;
87-
extern const struct raid6_calls raid6_intx16;
88-
extern const struct raid6_calls raid6_intx32;
8987
extern const struct raid6_calls raid6_mmxx1;
9088
extern const struct raid6_calls raid6_mmxx2;
9189
extern const struct raid6_calls raid6_sse1x1;

lib/raid6/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
obj-$(CONFIG_RAID6_PQ) += raid6_pq.o
33

44
raid6_pq-y += algos.o recov.o tables.o int1.o int2.o int4.o \
5-
int8.o int16.o int32.o
5+
int8.o
66

77
raid6_pq-$(CONFIG_X86) += recov_ssse3.o recov_avx2.o mmx.o sse1.o sse2.o avx2.o avx512.o recov_avx512.o
88
raid6_pq-$(CONFIG_ALTIVEC) += altivec1.o altivec2.o altivec4.o altivec8.o \
@@ -55,7 +55,7 @@ endif
5555
quiet_cmd_unroll = UNROLL $@
5656
cmd_unroll = $(AWK) -v N=$* -f $(srctree)/$(src)/unroll.awk < $< > $@
5757

58-
targets += int1.c int2.c int4.c int8.c int16.c int32.c
58+
targets += int1.c int2.c int4.c int8.c
5959
$(obj)/int%.c: $(src)/int.uc $(src)/unroll.awk FORCE
6060
$(call if_changed,unroll)
6161

lib/raid6/algos.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ const struct raid6_calls * const raid6_algos[] = {
8080
#ifdef CONFIG_CPU_HAS_LSX
8181
&raid6_lsx,
8282
#endif
83-
#endif
84-
#if defined(__ia64__)
85-
&raid6_intx32,
86-
&raid6_intx16,
8783
#endif
8884
&raid6_intx8,
8985
&raid6_intx4,

lib/raid6/int.uc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ typedef u32 unative_t;
4141

4242

4343

44-
/*
45-
* IA-64 wants insane amounts of unrolling. On other architectures that
46-
* is just a waste of space.
47-
*/
48-
#if ($# <= 8) || defined(__ia64__)
49-
50-
5144
/*
5245
* These sub-operations are separate inlines since they can sometimes be
5346
* specially optimized using architecture-specific hacks.
@@ -152,5 +145,3 @@ const struct raid6_calls raid6_intx$# = {
152145
"int" NSTRING "x$#",
153146
0
154147
};
155-
156-
#endif

0 commit comments

Comments
 (0)