[PATCH 9/9] pnpbios: replace paravirt_enabled() check with subarch checks

From: Luis R. Rodriguez
Date: Fri Feb 19 2016 - 08:09:38 EST


Since we are removing paravirt_enabled() replace it with a
logical equivalent.

Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxx>
---
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