From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754593AbdKALzN (ORCPT ); Wed, 1 Nov 2017 07:55:13 -0400 Received: from mga07.intel.com ([134.134.136.100]:1642 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752401AbdKALzL (ORCPT ); Wed, 1 Nov 2017 07:55:11 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,327,1505804400"; d="scan'208";a="1238149777" From: "Kirill A. Shutemov" To: Ingo Molnar , Linus Torvalds , x86@kernel.org, Thomas Gleixner , "H. Peter Anvin" Cc: Andy Lutomirski , Cyrill Gorcunov , Borislav Petkov , Andi Kleen , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 1/4] x86/boot/compressed/64: Compile pagetable.c unconditionally Date: Wed, 1 Nov 2017 14:55:00 +0300 Message-Id: <20171101115503.18358-2-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171101115503.18358-1-kirill.shutemov@linux.intel.com> References: <20171101115503.18358-1-kirill.shutemov@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We are going to put few helpers into pagetable.c that are not specific to KASLR. Let's make compilation of the file independent of KASLR and wrap KASLR-depended code into ifdef. Signed-off-by: Kirill A. Shutemov --- arch/x86/boot/compressed/Makefile | 2 +- arch/x86/boot/compressed/pagetable.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 65a150a7f15c..f7b64ecd09b3 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -77,7 +77,7 @@ vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o ifdef CONFIG_X86_64 - vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/pagetable.o + vmlinux-objs-y += $(obj)/pagetable.o endif $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone diff --git a/arch/x86/boot/compressed/pagetable.c b/arch/x86/boot/compressed/pagetable.c index f1aa43854bed..a15bbfcb3413 100644 --- a/arch/x86/boot/compressed/pagetable.c +++ b/arch/x86/boot/compressed/pagetable.c @@ -27,6 +27,9 @@ /* These actually do the work of building the kernel identity maps. */ #include #include + +#ifdef CONFIG_RANDOMIZE_BASE + /* Use the static base for this part of the boot process */ #undef __PAGE_OFFSET #define __PAGE_OFFSET __PAGE_OFFSET_BASE @@ -149,3 +152,5 @@ void finalize_identity_maps(void) { write_cr3(top_level_pgt); } + +#endif /* CONFIG_RANDOMIZE_BASE */ -- 2.14.2