diff options
author | Ingo Molnar | 2017-01-28 09:30:11 +0100 |
---|---|---|
committer | Ingo Molnar | 2017-01-28 09:30:11 +0100 |
commit | 9a1f4150fe932fb892c05084029b3718b8ed1baf (patch) | |
tree | b8f18ea5f0bdc842e3cf8da4700c1d577a3b1c66 /arch/x86/boot/string.c | |
parent | x86/boot: Fix KASLR and memmap= collision (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | kernel-qcow2-linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.tar.gz kernel-qcow2-linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.tar.xz kernel-qcow2-linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.zip |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/string.c')
-rw-r--r-- | arch/x86/boot/string.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index 93d9b991e6b1..5457b02fc050 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -14,6 +14,7 @@ #include <linux/types.h> #include "ctype.h" +#include "string.h" int memcmp(const void *s1, const void *s2, size_t len) { |