diff options
| author | Matt Brown <matthew.brown.dev@gmail.com> | 2017-08-04 13:42:33 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-20 16:47:52 +1100 |
| commit | aa9532d4899ff14e50de10d261b761d157cd2ae3 (patch) | |
| tree | 373ef653ad6ea18f7aae0ca9973a5ad17a7b53da /lib/raid6 | |
| parent | 751ba79cc552c146595cd439b21c4ff8998c3b69 (diff) | |
| download | linux-0-day-aa9532d4899ff14e50de10d261b761d157cd2ae3.tar.gz linux-0-day-aa9532d4899ff14e50de10d261b761d157cd2ae3.tar.xz | |
lib/raid6: Build proper raid6test files on powerpc
Previously the raid6 test Makefile did not build the POWER specific files
(altivec and vpermxor).
This patch fixes the bug, so that all appropriate files for powerpc are built.
This patch also fixes the missing and mismatched ifdef statements to allow the
altivec.uc file to be built correctly.
Signed-off-by: Matt Brown <matthew.brown.dev@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'lib/raid6')
| -rw-r--r-- | lib/raid6/altivec.uc | 3 | ||||
| -rw-r--r-- | lib/raid6/test/Makefile | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/raid6/altivec.uc b/lib/raid6/altivec.uc index 682aae8a1fef2..d20ed0d114111 100644 --- a/lib/raid6/altivec.uc +++ b/lib/raid6/altivec.uc @@ -24,10 +24,13 @@ #include <linux/raid/pq.h> +#ifdef CONFIG_ALTIVEC + #include <altivec.h> #ifdef __KERNEL__ # include <asm/cputable.h> # include <asm/switch_to.h> +#endif /* __KERNEL__ */ /* * This is the C data type to use. We use a vector of diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile index ef6d0e00f1895..5050e270c06b3 100644 --- a/lib/raid6/test/Makefile +++ b/lib/raid6/test/Makefile @@ -45,9 +45,10 @@ else ifeq ($(HAS_NEON),yes) CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1 else HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\ - gcc -c -x c - >&/dev/null && \ - rm ./-.o && echo yes) + gcc -c -x c - >/dev/null && rm ./-.o && echo yes) ifeq ($(HAS_ALTIVEC),yes) + CFLAGS += -I../../../arch/powerpc/include + CFLAGS += -DCONFIG_ALTIVEC OBJS += altivec1.o altivec2.o altivec4.o altivec8.o \ vpermxor1.o vpermxor2.o vpermxor4.o vpermxor8.o endif |