[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1456212255-23959-12-git-send-email-mcgrof@kernel.org>
Date: Mon, 22 Feb 2016 23:24:15 -0800
From: "Luis R. Rodriguez" <mcgrof@...nel.org>
To: bp@...en8.de, hpa@...or.com, tglx@...utronix.de, mingo@...hat.com,
rusty@...tcorp.com.au
Cc: x86@...nel.org, linux-kernel@...r.kernel.org, luto@...capital.net,
boris.ostrovsky@...cle.com, david.vrabel@...rix.com,
konrad.wilk@...cle.com, xen-devel@...ts.xensource.com,
lguest@...ts.ozlabs.org, "Luis R. Rodriguez" <mcgrof@...nel.org>
Subject: [PATCH v3 11/11] pnpbios: replace paravirt_enabled() check with subarch checks
Since we are removing paravirt_enabled() replace it with a
logical equivalent.
Signed-off-by: Luis R. Rodriguez <mcgrof@...nel.org>
---
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 <asm/page.h>
#include <asm/desc.h>
#include <asm/byteorder.h>
+#include <asm/setup.h>
#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
Powered by blists - more mailing lists