diff options
| author | Rusty Russell | 2006-12-07 02:14:08 +0100 |
|---|---|---|
| committer | Andi Kleen | 2006-12-07 02:14:08 +0100 |
| commit | 6020c8f315709a508b027ef6749e85b125190947 (patch) | |
| tree | 52dbfc2c2e0322d0aae87cc76e7a961a4126fd46 /arch/i386/kernel/apm.c | |
| parent | [PATCH] paravirt: Disable vdso by default when CONFIG_PARAVIRT is enabled (diff) | |
| download | kernel-qcow2-linux-6020c8f315709a508b027ef6749e85b125190947.tar.gz kernel-qcow2-linux-6020c8f315709a508b027ef6749e85b125190947.tar.xz kernel-qcow2-linux-6020c8f315709a508b027ef6749e85b125190947.zip | |
[PATCH] paravirt: Allow disable power management under hypervisor
Two legacy power management modes are much easier to just explicitly disable
when running in paravirtualized mode - neither APM nor PnP is still relevant.
The status of ACPI is still debatable, and noacpi is still a common enough
boot parameter that it is not necessary to explicitly disable ACPI.
Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'arch/i386/kernel/apm.c')
| -rw-r--r-- | arch/i386/kernel/apm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index a60358fe9a49..a97847da9ed5 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -231,6 +231,7 @@ #include <asm/uaccess.h> #include <asm/desc.h> #include <asm/i8253.h> +#include <asm/paravirt.h> #include "io_ports.h" @@ -2235,7 +2236,7 @@ static int __init apm_init(void) dmi_check_system(apm_dmi_table); - if (apm_info.bios.version == 0) { + if (apm_info.bios.version == 0 || paravirt_enabled()) { printk(KERN_INFO "apm: BIOS not found.\n"); return -ENODEV; } |