From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH 4/9] x86/init: make ebda depend on PC subarch Date: Fri, 19 Feb 2016 05:08:31 -0800 Message-ID: <1455887316-9223-5-git-send-email-mcgrof@kernel.org> References: <1455887316-9223-1-git-send-email-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1455887316-9223-1-git-send-email-mcgrof@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: bp@alien8.de Cc: rusty@rustcorp.com.au, x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, "Luis R. Rodriguez" , xen-devel@lists.xensource.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org This lets us remove its use of paravirt_enabled(). The other subarchs are not needed here given that on 32-bit there is a switch already that negates access to this code on X86_SUBARCH_INTEL_MID, and X86_SUBARCH_CE4100. Both lguest and Xen had paravirt_enabled so that excludes them. Signed-off-by: Luis R. Rodriguez --- arch/x86/kernel/head.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/head.c b/arch/x86/kernel/head.c index 992f442ca155..4e3be58a1a77 100644 --- a/arch/x86/kernel/head.c +++ b/arch/x86/kernel/head.c @@ -38,7 +38,7 @@ void __init reserve_ebda_region(void) * that the paravirt case can handle memory setup * correctly, without our help. */ - if (paravirt_enabled()) + if (boot_params.hdr.hardware_subarch != X86_SUBARCH_PC) return; /* end of low (conventional) memory */ -- 2.7.0