Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77a9a768 authored by Jeremy Katz's avatar Jeremy Katz Committed by Ingo Molnar
Browse files

x86: 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: default avatarJeremy Katz <katzj@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fb478da5

arch/x86/kernel/apm_32.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}