Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933331AbbD2QQ0 (ORCPT ); Wed, 29 Apr 2015 12:16:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46316 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753823AbbD2QQW (ORCPT ); Wed, 29 Apr 2015 12:16:22 -0400 Date: Wed, 29 Apr 2015 18:16:20 +0200 (CEST) From: Jiri Kosina To: Borislav Petkov cc: x86@kernel.org, Josh Poimboeuf , Kees Cook , Seth Jennings , Vojtech Pavlik , linux-kernel@vger.kernel.org, live-patching@vger.kernel.org Subject: Re: [PATCH v2 1/2] x86: introduce kaslr_offset() In-Reply-To: Message-ID: References: <20150428120838.GA16487@treble.redhat.com> <20150428155958.GG19025@pd.tnic> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1733 Lines: 54 On Wed, 29 Apr 2015, Jiri Kosina wrote: > > Acked-by: Borislav Petkov > > 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 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 --- 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 +#include /* * This is set up by the setup-routine at boot-time -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/