diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-11 18:27:13 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-01-11 18:27:13 +0100 |
| commit | 02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04 (patch) | |
| tree | 33402107adad8ebca51ea843291e09afc11a67d7 /arch | |
| parent | Pull bugzilla-8973 into release branch (diff) | |
| parent | PM: ACPI and APM must not be enabled at the same time (diff) | |
| download | linux-02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04.tar.xz linux-02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04.zip | |
Pull bugzilla-9194 into release branch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apm_32.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 17089a041028..af045ca0f653 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); |