diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 09:58:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 09:58:22 -0800 |
| commit | 417009f64f17d76322d148a2cda40dfec37bcf0b (patch) | |
| tree | 5c02e4888a083e276a49ec1f58cd492ca5532e1b /kernel | |
| parent | ba67a39efde8312e386c6f603054f8945433d91f (diff) | |
| parent | 55d1bb9a3b0f7f791ce597086791ebe54ea4c46a (diff) | |
| download | kernel_samsung_aries-417009f64f17d76322d148a2cda40dfec37bcf0b.zip kernel_samsung_aries-417009f64f17d76322d148a2cda40dfec37bcf0b.tar.gz kernel_samsung_aries-417009f64f17d76322d148a2cda40dfec37bcf0b.tar.bz2 | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
pnpacpi: print resource shortage message only once
PM: ACPI and APM must not be enabled at the same time
ACPI: apply quirk_ich6_lpc_acpi to more ICH8 and ICH9
ACPICA: fix acpi_serialize hang regression
ACPI : Not register gsi for PCI IDE controller in legacy mode
ACPI: Reintroduce run time configurable max_cstate for !CPU_IDLE case
ACPI: Make sysfs interface in ACPI power optional.
ACPI: EC: Enable boot EC before bus_scan
increase PNP_MAX_PORT to 40 from 24
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/main.c | 3 | ||||
| -rw-r--r-- | kernel/power/pm.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 3cdf95b..f71c950 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -28,6 +28,9 @@ BLOCKING_NOTIFIER_HEAD(pm_chain_head); DEFINE_MUTEX(pm_mutex); +unsigned int pm_flags; +EXPORT_SYMBOL(pm_flags); + #ifdef CONFIG_SUSPEND /* This is just an arbitrary number */ diff --git a/kernel/power/pm.c b/kernel/power/pm.c index c50d152..60c73fa 100644 --- a/kernel/power/pm.c +++ b/kernel/power/pm.c @@ -27,8 +27,6 @@ #include <linux/interrupt.h> #include <linux/mutex.h> -int pm_active; - /* * Locking notes: * pm_devs_lock can be a semaphore providing pm ops are not called @@ -204,6 +202,4 @@ int pm_send_all(pm_request_t rqst, void *data) EXPORT_SYMBOL(pm_register); EXPORT_SYMBOL(pm_send_all); -EXPORT_SYMBOL(pm_active); - |