diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:42:47 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:42:47 +0200 |
commit | 84b1e36a6aee080ea01256659e2957114a0a52b5 (patch) | |
tree | e105aceb0f5aac46dbed0cb86ec28656cce44f35 /arch/x86/boot/compressed/error.c | |
parent | 11e445e9b499dfd96d7cbc55b2f22057fcf2804d (diff) | |
parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
download | op-kernel-dev-84b1e36a6aee080ea01256659e2957114a0a52b5.zip op-kernel-dev-84b1e36a6aee080ea01256659e2957114a0a52b5.tar.gz |
Merge tag 'v4.11-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/compressed/error.c')
-rw-r--r-- | arch/x86/boot/compressed/error.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/error.c b/arch/x86/boot/compressed/error.c index 6248740..3192202 100644 --- a/arch/x86/boot/compressed/error.c +++ b/arch/x86/boot/compressed/error.c @@ -4,6 +4,7 @@ * memcpy() and memmove() are defined for the compressed boot environment. */ #include "misc.h" +#include "error.h" void warn(char *m) { |