diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 23:23:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 23:23:49 +0400 |
| commit | 9447dc43941cd1c006cae934984524b7c957b803 (patch) | |
| tree | 89bb2c8415a2b338ec95bd6db9c832002a4cf415 /arch/x86/boot/edd.c | |
| parent | bb1775c9c43d9272235264377ffada1be2cfb401 (diff) | |
| parent | 04999550f93234bf05597a9b7d26e2bfe27ba883 (diff) | |
| download | linux-9447dc43941cd1c006cae934984524b7c957b803.tar.xz | |
Merge branch 'x86/boot' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot changes from Peter Anvin:
"This patchset is a set of cleanups aiming at librarize some of the
common code from the boot environments. We currently have three
different "little environments" (boot, boot/compressed, and
realmode/rm) in x86, and we are likely to soon get a fourth one
(kexec/purgatory, which will have to be integrated in the kernel to
support secure kexec). This is primarily a cleanup in the
anticipation of the latter.
While Vivek implemented this, he ran into some bugs, in particular the
memcmp implementation for when gcc punts from using the builtin would
have a misnamed symbol, causing compilation errors if we were ever
unlucky enough that gcc didn't want to inline the test"
* 'x86/boot' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, boot: Move memset() definition in compressed/string.c
x86, boot: Move memcmp() into string.h and string.c
x86, boot: Move optimized memcpy() 32/64 bit versions to compressed/string.c
x86, boot: Create a separate string.h file to provide standard string functions
x86, boot: Undef memcmp before providing a new definition
Diffstat (limited to 'arch/x86/boot/edd.c')
| -rw-r--r-- | arch/x86/boot/edd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/edd.c b/arch/x86/boot/edd.c index c501a5b466f8..223e42527077 100644 --- a/arch/x86/boot/edd.c +++ b/arch/x86/boot/edd.c @@ -15,6 +15,7 @@ #include "boot.h" #include <linux/edd.h> +#include "string.h" #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) |