Drop Itanium support from the RAID6 code, and along with it, the 16x and 32x unrolled versions, which were only used by IA64.
Unified · Split
| @@ -84,8 +84,6 @@ extern const struct raid6_calls raid6_intx1; · 83 unmodified lines | |||
| 84 | extern const struct raid6_calls raid6_intx2; | 84 | extern const struct raid6_calls raid6_intx2; |
| 85 | extern const struct raid6_calls raid6_intx4; | 85 | extern const struct raid6_calls raid6_intx4; |
| 86 | extern const struct raid6_calls raid6_intx8; | 86 | extern const struct raid6_calls raid6_intx8; |
| 87 | extern const struct raid6_calls raid6_intx16; | ||
| 88 | extern const struct raid6_calls raid6_intx32; | ||
| 89 | extern const struct raid6_calls raid6_mmxx1; | 87 | extern const struct raid6_calls raid6_mmxx1; |
| 90 | extern const struct raid6_calls raid6_mmxx2; | 88 | extern const struct raid6_calls raid6_mmxx2; |
| 91 | extern const struct raid6_calls raid6_sse1x1; | 89 | extern const struct raid6_calls raid6_sse1x1; |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | obj-$(CONFIG_RAID6_PQ) += raid6_pq.o | 2 | obj-$(CONFIG_RAID6_PQ) += raid6_pq.o |
| 3 | 3 | ||
| 4 | raid6_pq-y += algos.o recov.o tables.o int1.o int2.o int4.o \ | 4 | 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 |
| 6 | 6 | ||
| 7 | raid6_pq-$(CONFIG_X86) += recov_ssse3.o recov_avx2.o mmx.o sse1.o sse2.o avx2.o avx512.o recov_avx512.o | 7 | raid6_pq-$(CONFIG_X86) += recov_ssse3.o recov_avx2.o mmx.o sse1.o sse2.o avx2.o avx512.o recov_avx512.o |
| 8 | raid6_pq-$(CONFIG_ALTIVEC) += altivec1.o altivec2.o altivec4.o altivec8.o \ | 8 | raid6_pq-$(CONFIG_ALTIVEC) += altivec1.o altivec2.o altivec4.o altivec8.o \ |
| @@ -55,7 +55,7 @@ endif · 46 unmodified lines | |||
| 55 | quiet_cmd_unroll = UNROLL $@ | 55 | quiet_cmd_unroll = UNROLL $@ |
| 56 | cmd_unroll = $(AWK) -v N=$* -f $(srctree)/$(src)/unroll.awk < $< > $@ | 56 | cmd_unroll = $(AWK) -v N=$* -f $(srctree)/$(src)/unroll.awk < $< > $@ |
| 57 | 57 | ||
| 58 | targets += int1.c int2.c int4.c int8.c int16.c int32.c | 58 | targets += int1.c int2.c int4.c int8.c |
| 59 | $(obj)/int%.c: $(src)/int.uc $(src)/unroll.awk FORCE | 59 | $(obj)/int%.c: $(src)/int.uc $(src)/unroll.awk FORCE |
| 60 | $(call if_changed,unroll) | 60 | $(call if_changed,unroll) |
| 61 | 61 | ||
| @@ -80,10 +80,6 @@ const struct raid6_calls * const raid6_algos[] = { · 79 unmodified lines | |||
| 80 | #ifdef CONFIG_CPU_HAS_LSX | 80 | #ifdef CONFIG_CPU_HAS_LSX |
| 81 | &raid6_lsx, | 81 | &raid6_lsx, |
| 82 | #endif | 82 | #endif |
| 83 | #endif | ||
| 84 | #if defined(__ia64__) | ||
| 85 | &raid6_intx32, | ||
| 86 | &raid6_intx16, | ||
| 87 | #endif | 83 | #endif |
| 88 | &raid6_intx8, | 84 | &raid6_intx8, |
| 89 | &raid6_intx4, | 85 | &raid6_intx4, |
| @@ -41,13 +41,6 @@ typedef u32 unative_t; · 40 unmodified lines | |||
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | 43 | ||
| 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 | |||
| 51 | /* | 44 | /* |
| 52 | * These sub-operations are separate inlines since they can sometimes be | 45 | * These sub-operations are separate inlines since they can sometimes be |
| 53 | * specially optimized using architecture-specific hacks. | 46 | * specially optimized using architecture-specific hacks. |
| @@ -152,5 +145,3 @@ const struct raid6_calls raid6_intx$# = { · 98 unmodified lines | |||
| 152 | "int" NSTRING "x$#", | 145 | "int" NSTRING "x$#", |
| 153 | 0 | 146 | 0 |
| 154 | }; | 147 | }; |
| 155 | |||
| 156 | #endif | ||