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

From	"Luis R. Rodriguez" <mcgrof@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH 9/9] pnpbios: replace paravirt_enabled() check with subarch checks
Date	2016-02-19 14:10 +0100
Message-ID	<r3SYO-5z8-15@gated-at.bofh.it> (permalink)
References	<r3SYO-5z8-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 9/9] pnpbios: replace paravirt_enabled() check with subarch checks "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-02-19 14:10 +0100

csiph-web