Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: disable apm on the olpc
+2
-1
+2
-1
arch/x86/kernel/apm_32.c
+2
-1
arch/x86/kernel/apm_32.c
···
234
234
#include <asm/uaccess.h>
235
235
#include <asm/desc.h>
236
236
#include <asm/i8253.h>
237
+
#include <asm/olpc.h>
237
238
#include <asm/paravirt.h>
238
239
#include <asm/reboot.h>
239
240
···
2218
2217
2219
2218
dmi_check_system(apm_dmi_table);
2220
2219
2221
-
if (apm_info.bios.version == 0 || paravirt_enabled()) {
2220
+
if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) {
2222
2221
printk(KERN_INFO "apm: BIOS not found.\n");
2223
2222
return -ENODEV;
2224
2223
}