diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-03-08 16:40:12 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-08 16:40:12 -0700 |
| commit | a2daeab5cffa4d81a8c9bfedf8e5576cbca00190 (patch) | |
| tree | 45f5b97cc0b29f1fbc8c7930e34e4099454a98ee /lib | |
| parent | a76370690c3b382ee1c91a93a447c8e25865c8e2 (diff) | |
| parent | 7d959f6e978cbbca90e26a192cc39480e977182f (diff) | |
Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.18/drivers
Pull MD fixes from Song:
"Most of these changes are minor fixes and clean-ups."
* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
md: use msleep() in md_notify_reboot()
lib/raid6: Include <asm/ppc-opcode.h> for VPERMXOR
lib/raid6/test/Makefile: Use $(pound) instead of \# for Make 4.3
lib/raid6/test: fix multiple definition linking error
md: raid1/raid10: drop pending_cnt
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/raid6/test/Makefile | 4 | ||||
| -rw-r--r-- | lib/raid6/test/test.c | 1 | ||||
| -rw-r--r-- | lib/raid6/vpermxor.uc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile index a4c7cd74cff5..4fb7700a741b 100644 --- a/lib/raid6/test/Makefile +++ b/lib/raid6/test/Makefile @@ -4,6 +4,8 @@ # from userspace. # +pound := \# + CC = gcc OPTFLAGS = -O2 # Adjust as desired CFLAGS = -I.. -I ../../../include -g $(OPTFLAGS) @@ -42,7 +44,7 @@ else ifeq ($(HAS_NEON),yes) OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1 else - HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\ + HAS_ALTIVEC := $(shell printf '$(pound)include <altivec.h>\nvector int a;\n' |\ gcc -c -x c - >/dev/null && rm ./-.o && echo yes) ifeq ($(HAS_ALTIVEC),yes) CFLAGS += -I../../../arch/powerpc/include diff --git a/lib/raid6/test/test.c b/lib/raid6/test/test.c index a3cf071941ab..841a55242aba 100644 --- a/lib/raid6/test/test.c +++ b/lib/raid6/test/test.c @@ -19,7 +19,6 @@ #define NDISKS 16 /* Including P and Q */ const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); -struct raid6_calls raid6_call; char *dataptrs[NDISKS]; char data[NDISKS][PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); diff --git a/lib/raid6/vpermxor.uc b/lib/raid6/vpermxor.uc index 10475dc423c1..1bfb127fbfe8 100644 --- a/lib/raid6/vpermxor.uc +++ b/lib/raid6/vpermxor.uc @@ -24,9 +24,9 @@ #ifdef CONFIG_ALTIVEC #include <altivec.h> +#include <asm/ppc-opcode.h> #ifdef __KERNEL__ #include <asm/cputable.h> -#include <asm/ppc-opcode.h> #include <asm/switch_to.h> #endif |