From: "Luis R. Rodriguez" <mcgrof@kernel.org>
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" <mcgrof@kernel.org>
Subject: [PATCH 9/9] pnpbios: replace paravirt_enabled() check with subarch checks
Date: Fri, 19 Feb 2016 05:08:36 -0800 [thread overview]
Message-ID: <1455887316-9223-10-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1455887316-9223-1-git-send-email-mcgrof@kernel.org>
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
next prev parent reply other threads:[~2016-02-19 13:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 13:08 [PATCH 0/9] x86/init: replace paravirt_enabled() were possible Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 1/9] x86/boot: enumerate documentation for the x86 hardware_subarch Luis R. Rodriguez
2016-02-19 13:19 ` [Xen-devel] " Juergen Gross
2016-02-19 13:40 ` David Vrabel
2016-02-19 14:40 ` Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 2/9] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 3/9] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 4/9] x86/init: make ebda depend on PC subarch Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 5/9] apm32: remove paravirt_enabled() use Luis R. Rodriguez
2016-02-19 15:08 ` Boris Ostrovsky
2016-02-19 20:58 ` Luis R. Rodriguez
2016-02-19 22:17 ` Boris Ostrovsky
2016-02-20 0:42 ` Luis R. Rodriguez
2016-02-22 14:15 ` Boris Ostrovsky
2016-02-19 13:08 ` [PATCH 6/9] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 7/9] x86/cpu/intel: replace paravirt_enabled() for f00f work around Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 8/9] x86/rtc: replace paravirt_enabled() check with subarch check Luis R. Rodriguez
2016-02-19 13:22 ` [Xen-devel] " Juergen Gross
2016-02-19 14:48 ` Luis R. Rodriguez
2016-02-22 6:07 ` Luis R. Rodriguez
2016-02-22 10:27 ` Borislav Petkov
2016-02-22 14:34 ` Boris Ostrovsky
2016-02-22 23:12 ` Luis R. Rodriguez
2016-02-19 13:27 ` David Vrabel
2016-02-19 13:08 ` Luis R. Rodriguez [this message]
2016-02-19 13:34 ` [Xen-devel] [PATCH 0/9] x86/init: replace paravirt_enabled() were possible David Vrabel
2016-02-19 14:36 ` Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455887316-9223-10-git-send-email-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=david.vrabel@citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=rusty@rustcorp.com.au \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).