summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-01-11 12:27:13 -0500
committerLen Brown <len.brown@intel.com>2008-01-11 12:27:13 -0500
commit02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04 (patch)
tree33402107adad8ebca51ea843291e09afc11a67d7 /arch
parenteba6860ac5f9578e3ba6d0f9900cfc72599c5d66 (diff)
parent9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a (diff)
Pull bugzilla-9194 into release branch
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/apm_32.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 17089a04102..af045ca0f65 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -2256,14 +2256,12 @@ static int __init apm_init(void)
apm_info.disabled = 1;
return -ENODEV;
}
- if (PM_IS_ACTIVE()) {
+ if (pm_flags & PM_ACPI) {
printk(KERN_NOTICE "apm: overridden by ACPI.\n");
apm_info.disabled = 1;
return -ENODEV;
}
-#ifdef CONFIG_PM_LEGACY
- pm_active = 1;
-#endif
+ pm_flags |= PM_APM;
/*
* Set up a segment that references the real mode segment 0x40
@@ -2366,9 +2364,7 @@ static void __exit apm_exit(void)
kthread_stop(kapmd_task);
kapmd_task = NULL;
}
-#ifdef CONFIG_PM_LEGACY
- pm_active = 0;
-#endif
+ pm_flags &= ~PM_APM;
}
module_init(apm_init);