From patchwork Thu Apr 7 00:06:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8767541 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 D763FC0553 for ; Thu, 7 Apr 2016 00:09:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 152C7201E4 for ; Thu, 7 Apr 2016 00:09:02 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 40BCD201CD for ; Thu, 7 Apr 2016 00:09:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1anxTY-0002kh-Nz; Thu, 07 Apr 2016 00:07:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1anxTY-0002jY-1k for xen-devel@lists.xensource.com; Thu, 07 Apr 2016 00:07:08 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 46/ED-03606-BA4A5075; Thu, 07 Apr 2016 00:07:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsVybKJsh+6qJaz hBu1PdC3uTXnP7sDosb1vF3sAYxRrZl5SfkUCa8at+bOYC/6yV+x/vZ2pgfEpWxcjF4eQwFRG ieevF0I5M5gkvt7bzNLFyMHBJqArcfO2RBcjJ4eIQILE3affmEFqmAW+MUnsPv2MGSQhLGAn0 bJ2MVg9i4CqxKVf5iBhXgEHiUVHHjGB2BICchItP3azgticAo4Sy09NBbOFgGoaly5hhKjJkJ jXM4cVwvaSWHTjEpStJnH13CbmCYx8CxgZVjGqF6cWlaUW6ZrrJRVlpmeU5CZm5ugaGhjr5aY WFyemp+YkJhXrJefnbmIEBgkDEOxgbPzudIhRkoNJSZTXtZI1XIgvKT+lMiOxOCO+qDQntfgQ owwHh5IEb99ioJxgUWp6akVaZg4wXGHSEhw8SiK8K0DSvMUFibnFmekQqVOMilLivBNBEgIgi YzSPLg2WIxcYpSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjDvUpApPJl5JXDTXwEtZgJaXC/MBL K4JBEhJdXAuFY9lD3vx3zNSPMnMsJiTeXvgnpd+7sNt02Z4xo3pSz0VHvh75AVmefXbWGZyXi 9Je/A8SvCC2XkTO9rPmgT2ZjsKviIT1eCq+r5mu0fnu07Knj+2KQl3O2tMR4TrGdPeWPbyvJD tkwi2Um6YHbyjem/KpP5Pr949t3R+/fZ5Q8LTt5acSh1mxJLcUaioRZzUXEiAATu4OaMAgAA X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-16.tower-31.messagelabs.com!1459987625!25915215!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46870 invoked from network); 7 Apr 2016 00:07:06 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-16.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Apr 2016 00:07:06 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C2472025A; Thu, 7 Apr 2016 00:07:04 +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 07D872026D; Thu, 7 Apr 2016 00:07:03 +0000 (UTC) From: "Luis R. Rodriguez" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Date: Wed, 6 Apr 2016 17:06:28 -0700 Message-Id: <1459987594-5434-9-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> References: <1459987594-5434-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: xen-devel@lists.xensource.com, matt@codeblueprint.co.uk, andrew.cooper3@citrix.com, x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, jlee@suse.com, "Luis R. Rodriguez" , lguest@lists.ozlabs.org, glin@suse.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com Subject: [Xen-devel] [PATCH v4 08/14] apm32: remove paravirt_enabled() use X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP There is already a check for apm_info.bios == 0, the apm_info.bios is set from the boot_params.apm_bios_info. Both Xen and lguest, which are also the only ones that set paravirt_enabled to true, never set the apm_bios.info. The Xen folks are sure force disable to 0 is not needed, we recently forced disabled this on lguest. With this in place the paravirt_enabled() check is simply not needed anymore. Signed-off-by: Luis R. Rodriguez --- arch/x86/kernel/apm_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 9307f182fe30..c7364bd633e1 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -2267,7 +2267,7 @@ static int __init apm_init(void) dmi_check_system(apm_dmi_table); - if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) { + if (apm_info.bios.version == 0 || machine_is_olpc()) { printk(KERN_INFO "apm: BIOS not found.\n"); return -ENODEV; }