diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-09-15 17:21:12 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-09-15 17:22:24 +0200 |
| commit | 43ff221426d33db909f7159fdf620c3b052e2d1c (patch) | |
| tree | 8cd100abd4dc18af28663e8afde45dadf62faf24 /lib/raid6 | |
| parent | 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (diff) | |
| parent | 944834901adc94b3a44d1dd153eb739a937e52d2 (diff) | |
Merge tag 'tag-remove-ia64' of git://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux into asm-generic
Remove IA-64 architecture support
Fix the IA-64 build before removing the architecture support completely.
This makes v6.6 LTS the final Linux release with IA-64/Itanium support.
* tag 'tag-remove-ia64' of git://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux:
Documentation: Drop or replace remaining mentions of IA64
lib/raid6: Drop IA64 support
Documentation: Drop IA64 from feature descriptions
kernel: Drop IA64 support from sig_fault handlers
arch: Remove Itanium (IA-64) architecture
acpi: Provide ia64 dummy implementation of acpi_proc_quirk_mwait_check()
Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'lib/raid6')
| -rw-r--r-- | lib/raid6/Makefile | 4 | ||||
| -rw-r--r-- | lib/raid6/algos.c | 4 | ||||
| -rw-r--r-- | lib/raid6/int.uc | 9 |
3 files changed, 2 insertions, 15 deletions
diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile index 035b0a4db476a..1c5420ff254e8 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 0ec534faf019b..cd2e88ee1f148 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 558aeac9342aa..1ba56c3fa4825 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 |