Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753189AbcDVJxM (ORCPT ); Fri, 22 Apr 2016 05:53:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37284 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752071AbcDVJxJ (ORCPT ); Fri, 22 Apr 2016 05:53:09 -0400 Date: Fri, 22 Apr 2016 02:51:52 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: brgerst@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, dvlasenk@redhat.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, bp@alien8.de, luto@amacapital.net, mcgrof@kernel.org Reply-To: brgerst@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, peterz@infradead.org, mcgrof@kernel.org, hpa@zytor.com, luto@amacapital.net, bp@alien8.de In-Reply-To: <1460592286-300-9-git-send-email-mcgrof@kernel.org> References: <1460592286-300-9-git-send-email-mcgrof@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/apm32: Remove paravirt_enabled() use Git-Commit-ID: 8bc55f805697ec2a69c6a576fac8ee36ea9772bb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2685 Lines: 76 Commit-ID: 8bc55f805697ec2a69c6a576fac8ee36ea9772bb Gitweb: http://git.kernel.org/tip/8bc55f805697ec2a69c6a576fac8ee36ea9772bb Author: Luis R. Rodriguez AuthorDate: Wed, 13 Apr 2016 17:04:38 -0700 Committer: Ingo Molnar CommitDate: Fri, 22 Apr 2016 10:29:03 +0200 x86/apm32: Remove paravirt_enabled() use 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 because apm_info lives in .bss, we recently forced disabled this on lguest, and on the Xen side just to be sure Boris zeroed out the .bss for PV guests through commit 04b6b4a56884327c1648 ("xen/x86: Zero out .bss for PV guests"). With this care taken into consideration the paravirt_enabled() check is simply not needed anymore. Signed-off-by: Luis R. Rodriguez Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: andrew.cooper3@citrix.com Cc: andriy.shevchenko@linux.intel.com Cc: bigeasy@linutronix.de Cc: boris.ostrovsky@oracle.com Cc: david.vrabel@citrix.com Cc: ffainelli@freebox.fr Cc: george.dunlap@citrix.com Cc: glin@suse.com Cc: jgross@suse.com Cc: jlee@suse.com Cc: josh@joshtriplett.org Cc: julien.grall@linaro.org Cc: konrad.wilk@oracle.com Cc: kozerkov@parallels.com Cc: lenb@kernel.org Cc: lguest@lists.ozlabs.org Cc: linux-acpi@vger.kernel.org Cc: lv.zheng@intel.com Cc: matt@codeblueprint.co.uk Cc: mbizon@freebox.fr Cc: rjw@rjwysocki.net Cc: robert.moore@intel.com Cc: rusty@rustcorp.com.au Cc: tiwai@suse.de Cc: toshi.kani@hp.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/1460592286-300-9-git-send-email-mcgrof@kernel.org Signed-off-by: Ingo Molnar --- 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 9307f18..c7364bd 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; }