diff options
| author | Vivek Goyal <vgoyal@redhat.com> | 2014-04-25 13:46:12 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-05-08 08:00:06 -0700 |
| commit | a9a17104a112a67a7bf0679b734704c130eb5faa (patch) | |
| tree | 90a20cd767f21b0526e4b151206c04e8c04d36c3 /arch/x86/boot | |
| parent | 3d379225c458097d41d104b4f78f40ee97719333 (diff) | |
| download | op-kernel-dev-a9a17104a112a67a7bf0679b734704c130eb5faa.zip op-kernel-dev-a9a17104a112a67a7bf0679b734704c130eb5faa.tar.gz | |
x86, boot: Remove misc.h inclusion from compressed/string.c
Given the fact that we removed inclusion of boot.h from boot/string.c
does not look like we need misc.h inclusion in compressed/string.c. So
remove it.
misc.h was also pulling in string_32.h which in turn had macros for
memcmp and memcpy. So we don't need to #undef memcmp and memcpy anymore.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Link: http://lkml.kernel.org/r/1398447972-27896-3-git-send-email-vgoyal@redhat.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/string.c | 4 | ||||
| -rw-r--r-- | arch/x86/boot/string.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c index f3c57e3..00e788b 100644 --- a/arch/x86/boot/compressed/string.c +++ b/arch/x86/boot/compressed/string.c @@ -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) { diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index aca52b8..493f3fd 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -15,12 +15,6 @@ #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 memcmp int memcmp(const void *s1, const void *s2, size_t len) { u8 diff; |
