diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-01-03 08:21:02 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-01-03 08:21:02 -0700 |
| commit | dc629c211c65ee5c8f1c4976886d4a5f33f50674 (patch) | |
| tree | 814343b7f638a942794f8aece71132eae8aded3a /include | |
| parent | 645ff1e8e704c4f33ab1fcd3c87f95cb9b6d7144 (diff) | |
| parent | e820d55cb99dd93ac2dc949cf486bb187e5cd70d (diff) | |
| download | linux-dc629c211c65ee5c8f1c4976886d4a5f33f50674.tar.gz linux-dc629c211c65ee5c8f1c4976886d4a5f33f50674.tar.bz2 linux-dc629c211c65ee5c8f1c4976886d4a5f33f50674.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md into for-linus
Pull the pending 4.21 changes for md from Shaohua.
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
md: fix raid10 hang issue caused by barrier
raid10: refactor common wait code from regular read/write request
md: remvoe redundant condition check
lib/raid6: add option to skip algo benchmarking
lib/raid6: sort algos in rough performance order
lib/raid6: check for assembler SSSE3 support
lib/raid6: avoid __attribute_const__ redefinition
lib/raid6: add missing include for raid6test
md: remove set but not used variable 'bi_rdev'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/raid/pq.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h index ea8505204fdf..605cf46c17bd 100644 --- a/include/linux/raid/pq.h +++ b/include/linux/raid/pq.h @@ -35,6 +35,7 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; #include <limits.h> #include <stddef.h> #include <sys/mman.h> +#include <sys/time.h> #include <sys/types.h> /* Not standard, but glibc defines it */ @@ -52,7 +53,9 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; #define __init #define __exit -#define __attribute_const__ __attribute__((const)) +#ifndef __attribute_const__ +# define __attribute_const__ __attribute__((const)) +#endif #define noinline __attribute__((noinline)) #define preempt_enable() @@ -67,6 +70,9 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; #define MODULE_DESCRIPTION(desc) #define subsys_initcall(x) #define module_exit(x) + +#define IS_ENABLED(x) (x) +#define CONFIG_RAID6_PQ_BENCHMARK 1 #endif /* __KERNEL__ */ /* Routine choices */ |