mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
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'
This commit is contained in:
commit
dc629c211c
6 changed files with 94 additions and 96 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue