From patchwork Fri Feb 19 13:08:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8360911 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4D62AC0553 for ; Fri, 19 Feb 2016 13:11:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B3FA20494 for ; Fri, 19 Feb 2016 13:11:36 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B799220412 for ; Fri, 19 Feb 2016 13:11:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWknr-0006jw-3a; Fri, 19 Feb 2016 13:08:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWknp-0006iN-9o for xen-devel@lists.xensource.com; Fri, 19 Feb 2016 13:08:57 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id B4/6F-03883-8E317C65; Fri, 19 Feb 2016 13:08:56 +0000 X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-3.tower-206.messagelabs.com!1455887335!23566196!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23754 invoked from network); 19 Feb 2016 13:08:56 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-3.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Feb 2016 13:08:56 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51A7F204EA; Fri, 19 Feb 2016 13:08:54 +0000 (UTC) Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5673E204D3; Fri, 19 Feb 2016 13:08:53 +0000 (UTC) From: "Luis R. Rodriguez" To: bp@alien8.de 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> X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: rusty@rustcorp.com.au, x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, "Luis R. Rodriguez" , xen-devel@lists.xensource.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com Subject: [Xen-devel] [PATCH 9/9] pnpbios: replace paravirt_enabled() check with subarch checks X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }