Messages in this thread Patch in this message | | | Date | Wed, 29 Apr 2015 18:16:20 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: [PATCH v2 1/2] x86: introduce kaslr_offset() |
| |
On Wed, 29 Apr 2015, Jiri Kosina wrote:
> > Acked-by: Borislav Petkov <bp@suse.de> > > Applied to livepatching.git#for-4.2/kaslr. Thanks,
Fengguang's buildbot reported a randconfig build breakage caused by this patch. The fix below is necessary on top.
From: Jiri Kosina <jkosina@suse.cz> Subject: [PATCH] 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> --- arch/x86/include/asm/setup.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 785ac2f..11af24e 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 -- Jiri Kosina SUSE Labs
| |