From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752449AbbCWH5I (ORCPT ); Mon, 23 Mar 2015 03:57:08 -0400 Received: from mga11.intel.com ([192.55.52.93]:59190 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105AbbCWHzK (ORCPT ); Mon, 23 Mar 2015 03:55:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,450,1422950400"; d="scan'208";a="544809143" From: Jim Kukunas To: Linux Kernel , tom.zanussi@linux.intel.com Cc: Arjan van de Ven , "H. Peter Anvin" , tglx@linutronix.de, mingo@redhat.com, x86@kernel.org Subject: [PATCH 07/11] x86/xip: make e820_add_kernel_range() a NOP Date: Mon, 23 Mar 2015 00:46:36 -0700 Message-Id: <1427096800-30452-8-git-send-email-james.t.kukunas@linux.intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427096800-30452-1-git-send-email-james.t.kukunas@linux.intel.com> References: <1427096800-30452-1-git-send-email-james.t.kukunas@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org e820_add_kernel_range() checks whether the kernel text is present in the e820 map, and marked as usable RAM. If not, it modifies the e820 map accordingly. For XIP, that is unnecessary since the kernel text won't be loaded in RAM. Signed-off-by: Jim Kukunas --- arch/x86/kernel/setup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d276ebf..74fc6c8 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -787,6 +787,7 @@ static void __init trim_bios_range(void) } /* called before trim_bios_range() to spare extra sanitize */ +#ifndef CONFIG_XIP_KERNEL static void __init e820_add_kernel_range(void) { u64 start = __pa_symbol(_text); @@ -806,6 +807,11 @@ static void __init e820_add_kernel_range(void) e820_remove_range(start, size, E820_RAM, 0); e820_add_region(start, size, E820_RAM); } +#else +static void __init e820_add_kernel_range(void) +{ +} +#endif static unsigned reserve_low = CONFIG_X86_RESERVE_LOW << 10; -- 2.1.0