Disable apm on the olpc
Subsystems (2)
PATCH 1/1 Disable apm on the olpc
The OLPC doesn't support APM but also doesn't have DMI, so we can't detect and disable it based on DMI data. So, just disable based on machine_is_olpc()
Signed-off-by Jeremy Katz <[email protected]>
--- arch/x86/kernel/apm_32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/kernel/apm_32.c +2 -1
@@ -234,6 +234,7 @@#include <asm/uaccess.h> #include <asm/desc.h> #include <asm/i8253.h> +#include <asm/olpc.h> #include <asm/paravirt.h> #include <asm/reboot.h>
@@ -2217,7 +2218,7 @@ static int __init apm_init(void)dmi_check_system (apm_dmi_table); -if (apm_info.bios.version ==0 ||paravirt_enabled ()) { +if (apm_info.bios.version ==0 ||paravirt_enabled () ||machine_is_olpc ()) {printk (KERN_INFO "apm: BIOS not found.\n" );return -ENODEV ; }
Signature · 1 line
1.6.0.1
Ingo Molnar
AppliedQuoted 5 lines · Jeremy Katz
The OLPC doesn't support APM but also doesn't have DMI, so we can't detect and disable it based on DMI data. So, just disable based on
machine_is_olpc()Signed-off-by Jeremy Katz <[email protected]>
applied to tip/x86/urgent, thanks Jeremy!
Ingo