diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 02:41:57 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 02:41:57 +0400 |
| commit | e7a38766d2e691e8030b77c9b46b19c9359e0d6c (patch) | |
| tree | 5d67dfd93e3320846324ca2f47c5dc6e8b9eebb7 /arch | |
| parent | 3d1a3bda65d2f48fead6f0727f2f392c15206852 (diff) | |
| parent | a9a17104a112a67a7bf0679b734704c130eb5faa (diff) | |
| download | linux-e7a38766d2e691e8030b77c9b46b19c9359e0d6c.tar.xz | |
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 boot changes from Ingo Molnar:
"Two small cleanups"
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, boot: Remove misc.h inclusion from compressed/string.c
x86, boot: Do not include boot.h in string.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/boot/compressed/string.c | 4 | ||||
| -rw-r--r-- | arch/x86/boot/string.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c index f3c57e341402..00e788be1db9 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 5339040ef86e..493f3fd9f139 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -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 memcmp int memcmp(const void *s1, const void *s2, size_t len) { u8 diff; |