Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1378350

[PATCH v6 08/16] apm32: remove paravirt_enabled() use

Show all headers | View raw

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 <mcgrof@kernel.org>
---
 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;
 	}
-- 
2.7.2

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

Thread

[PATCH v6 00/16] x86: remove paravirt_enabled() "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 06/16] x86/init: use a platform legacy quirk for ebda "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 11/16] pnpbios: replace paravirt_enabled() check with legacy device check "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 08/16] apm32: remove paravirt_enabled() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 07/16] tools/lguest: force disable tboot and apm "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 03/16] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 01/16] x86/boot: enumerate documentation for the x86 hardware_subarch "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 16/16] x86/init: disable pnpbios and rtc for X86_SUBARCH_CE4100 "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 10/16] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 14/16] x86/paravirt: remove paravirt_enabled() "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 15/16] x86/init: disable pnpbios for X86_SUBARCH_INTEL_MID "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 13/16] x86/init: rename ebda code file "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
  [PATCH v6 04/16] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:10 +0200
    Re: [PATCH v6 04/16] x86/rtc: replace paravirt rtc check with  platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-14 06:30 +0200
  [PATCH v6 07/16] tools/lguest: force disable tboot and apm "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:20 +0200
  [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:20 +0200
  [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 02:20 +0200

csiph-web