diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:29:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:29:23 +1100 |
| commit | 6a8e61547bdabc871e25b78e7423579d7c12172d (patch) | |
| tree | fa8f29b448868c141333b0cefd95fbd2ba0c035c /arch | |
| parent | 9f72a3a19c1ca629d80c5ddc7eae2e1cb4bd1dcb (diff) | |
| parent | 697310dde9d87e60d2e7a8af2fc3a906438eee23 (diff) | |
Merge remote-tracking branch 'suspend/linux-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apm_32.c | 5 | ||||
| -rw-r--r-- | arch/x86/xen/Kconfig | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 0e4f24c2a746..15f47f741983 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -227,6 +227,7 @@ #include <linux/suspend.h> #include <linux/kthread.h> #include <linux/jiffies.h> +#include <linux/acpi.h> #include <asm/system.h> #include <asm/uaccess.h> @@ -2331,12 +2332,11 @@ static int __init apm_init(void) apm_info.disabled = 1; return -ENODEV; } - if (pm_flags & PM_ACPI) { + if (!acpi_disabled) { printk(KERN_NOTICE "apm: overridden by ACPI.\n"); apm_info.disabled = 1; return -ENODEV; } - pm_flags |= PM_APM; /* * Set up the long jump entry point to the APM BIOS, which is called @@ -2428,7 +2428,6 @@ static void __exit apm_exit(void) kthread_stop(kapmd_task); kapmd_task = NULL; } - pm_flags &= ~PM_APM; } module_init(apm_init); diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 5b54892e4bc3..2c876ed723d0 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -38,7 +38,7 @@ config XEN_MAX_DOMAIN_MEMORY config XEN_SAVE_RESTORE bool - depends on XEN && PM + depends on XEN default y config XEN_DEBUG_FS |