x86/boot changes for v3.16
Linus,
Please pull the latest x86-boot-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-for-linus
# HEAD: a9a17104a112a67a7bf0679b734704c130eb5faa x86, boot: Remove misc.h inclusion from compressed/string.c
Two small cleanups.
Thanks,
Ingo
------------------>
Vivek Goyal (2):
x86, boot: Do not include boot.h in string.c
x86, boot: Remove misc.h inclusion from compressed/string.c
arch/x86/boot/compressed/string.c | 4 ---- arch/x86/boot/string.c | 9 ++------- 2 files changed, 2 insertions(+), 11 deletions(-)
arch/x86/boot/compressed/string.c +0 -4
@@ -1,9 +1,5 @@ -#include "misc.h" #include "../string.c" -/* misc.h might pull in string_32.h which has a macro for memcpy. undef that */ -#undef memcpy -#ifdef CONFIG_X86_32 void *memcpy (void *dest,const void *src,size_t n) {
arch/x86/boot/string.c +2 -7
@@ -12,14 +12,9 @@* Very basic string functions */ -#include "boot.h" +#include <linux/types.h> +#include "ctype.h" -/* -* This file gets included in compressed/string.c which might pull in -* string_32.h and which in turn maps memcmp to __builtin_memcmp(). Undo -* that first. -*/ -#undef memcmpint memcmp (const void *s1,const void *s2,size_t len) {u8 diff;