diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-29 18:09:53 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-29 21:54:54 +0200 |
| commit | 535b3ddc285825c058cef3436a9aa207edffa6cd (patch) | |
| tree | ac8e416fce445072feef48a117d12768f262792a /arch | |
| parent | livepatch: x86: make kASLR logic more accurate (diff) | |
| download | linux-535b3ddc285825c058cef3436a9aa207edffa6cd.tar.xz linux-535b3ddc285825c058cef3436a9aa207edffa6cd.zip | |
x86: kaslr: fix build due to missing ALIGN definition
Fengguang's bot reported that 4545c898 ("x86: introduce kaslr_offset()") broke
randconfig build
In file included from arch/x86/xen/vga.c:5:0:
arch/x86/include/asm/setup.h: In function 'kaslr_offset':
>> arch/x86/include/asm/setup.h:77:2: error: implicit declaration of function 'ALIGN' [-Werror=implicit-function-declaration]
return (unsigned long)&_text - __START_KERNEL;
^
Fix that by making setup.h self-sufficient by explicitly including
linux/kernel.h, which is needed for ALIGN() (which is what __START_KERNEL
contains in its expansion).
Reported-by: fengguang.wu@intel.com
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/setup.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 785ac2f27271..11af24e09c8a 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -60,6 +60,7 @@ static inline void x86_ce4100_early_setup(void) { } #ifndef _SETUP #include <asm/espfix.h> +#include <linux/kernel.h> /* * This is set up by the setup-routine at boot-time |