diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-01-14 03:27:12 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-01-14 03:27:12 +0300 |
| commit | 7454049eb7e426a3bc9cc7b3fd5857c2d6ceeaee (patch) | |
| tree | 685b048c60c1bb7d88873645ebe3a46f0207eed7 /include | |
| parent | 8e42d239cb027143915cae13eb2ecf1360ee24de (diff) | |
| parent | d0d2d8ba0494655a01b97542c083e51b29cf8637 (diff) | |
| download | linux-7454049eb7e426a3bc9cc7b3fd5857c2d6ceeaee.tar.xz | |
Merge branch 'md-next' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.6/drivers
Pull MD changes from Song.
* 'md-next' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md:
md/raid1: introduce wait_for_serialization
md/raid1: use bucket based mechanism for IO serialization
md: introduce a new struct for IO serialization
md: don't destroy serial_info_pool if serialize_policy is true
raid1: serialize the overlap write
md: reorgnize mddev_create/destroy_serial_pool
md: add serialize_policy sysfs node for raid1
md: prepare for enable raid1 io serialization
md: fix a typo s/creat/create
md: rename wb stuffs
raid5: remove worker_cnt_per_group argument from alloc_thread_groups
md/raid6: fix algorithm choice under larger PAGE_SIZE
raid6/test: fix a compilation warning
raid6/test: fix a compilation error
md-bitmap: small cleanups
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/raid/pq.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h index 0832c9b66852..154e954b711d 100644 --- a/include/linux/raid/pq.h +++ b/include/linux/raid/pq.h @@ -27,8 +27,8 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; #include <errno.h> #include <inttypes.h> -#include <limits.h> #include <stddef.h> +#include <string.h> #include <sys/mman.h> #include <sys/time.h> #include <sys/types.h> @@ -44,6 +44,9 @@ typedef uint64_t u64; #ifndef PAGE_SIZE # define PAGE_SIZE 4096 #endif +#ifndef PAGE_SHIFT +# define PAGE_SHIFT 12 +#endif extern const char raid6_empty_zero_page[PAGE_SIZE]; #define __init @@ -59,7 +62,9 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; #define enable_kernel_altivec() #define disable_kernel_altivec() +#undef EXPORT_SYMBOL #define EXPORT_SYMBOL(sym) +#undef EXPORT_SYMBOL_GPL #define EXPORT_SYMBOL_GPL(sym) #define MODULE_LICENSE(licence) #define MODULE_DESCRIPTION(desc) |