]> git.baikalelectronics.ru Git - kernel.git/commit
x86: kaslr: fix build due to missing ALIGN definition
authorJiri Kosina <jkosina@suse.cz>
Wed, 29 Apr 2015 16:09:53 +0000 (18:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 29 Apr 2015 19:54:54 +0000 (21:54 +0200)
commit61fdeb68f9f1b945ef44dacecf0ae5c71d44d3a8
treeac8e416fce445072feef48a117d12768f262792a
parentef592f092eb7e64b01e81429eaa3d6b0a39a66be
x86: kaslr: fix build due to missing ALIGN definition

Fengguang's bot reported that df67f4bb ("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