From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1948201AbcBSNI5 (ORCPT ); Fri, 19 Feb 2016 08:08:57 -0500 Received: from mail.kernel.org ([198.145.29.136]:48428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947253AbcBSNIz (ORCPT ); Fri, 19 Feb 2016 08:08:55 -0500 From: "Luis R. Rodriguez" To: bp@alien8.de Cc: x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, boris.ostrovsky@oracle.com, rusty@rustcorp.com.au, david.vrabel@citrix.com, konrad.wilk@oracle.com, xen-devel@lists.xensource.com, "Luis R. Rodriguez" Subject: [PATCH 9/9] pnpbios: replace paravirt_enabled() check with subarch checks Date: Fri, 19 Feb 2016 05:08:36 -0800 Message-Id: <1455887316-9223-10-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455887316-9223-1-git-send-email-mcgrof@kernel.org> References: <1455887316-9223-1-git-send-email-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since we are removing paravirt_enabled() replace it with a logical equivalent. Signed-off-by: Luis R. Rodriguez --- drivers/pnp/pnpbios/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c index facd43b8516c..96dc1f905dba 100644 --- a/drivers/pnp/pnpbios/core.c +++ b/drivers/pnp/pnpbios/core.c @@ -66,6 +66,7 @@ #include #include #include +#include #include "../base.h" #include "pnpbios.h" @@ -521,7 +522,8 @@ static int __init pnpbios_init(void) int ret; if (pnpbios_disabled || dmi_check_system(pnpbios_dmi_table) || - paravirt_enabled()) { + boot_params.hdr.hardware_subarch == X86_SUBARCH_LGUEST || + boot_params.hdr.hardware_subarch == X86_SUBARCH_XEN) { printk(KERN_INFO "PnPBIOS: Disabled\n"); return -ENODEV; } -- 2.7.0