* [PATCH] Disable apm on the olpc
@ 2008-09-24 1:54 Jeremy Katz
2008-09-24 7:34 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Jeremy Katz @ 2008-09-24 1:54 UTC (permalink / raw)
To: mingo; +Cc: dsaxena, linux-kernel, dilinger, 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 <katzj@redhat.com>
---
arch/x86/kernel/apm_32.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 9ee24e6..732d1f4 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -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;
}
--
1.6.0.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Disable apm on the olpc
2008-09-24 1:54 [PATCH] Disable apm on the olpc Jeremy Katz
@ 2008-09-24 7:34 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-09-24 7:34 UTC (permalink / raw)
To: Jeremy Katz
Cc: mingo, dsaxena, linux-kernel, dilinger, Thomas Gleixner, H. Peter Anvin
* Jeremy Katz <katzj@redhat.com> wrote:
> 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 <katzj@redhat.com>
applied to tip/x86/urgent, thanks Jeremy!
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-09-24 7:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-09-24 1:54 [PATCH] Disable apm on the olpc Jeremy Katz
2008-09-24 7:34 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®