* '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
Showing the changes to kernel (2 of 19 files). Show all
Unified · Split
| @@ -28,6 +28,9 @@ BLOCKING_NOTIFIER_HEAD(pm_chain_head); · 27 unmodified lines | |||
| 28 | 28 | ||
| 29 | DEFINE_MUTEX(pm_mutex); | 29 | DEFINE_MUTEX(pm_mutex); |
| 30 | 30 | ||
| 31 | unsigned int pm_flags; | ||
| 32 | EXPORT_SYMBOL(pm_flags); | ||
| 33 | |||
| 31 | #ifdef CONFIG_SUSPEND | 34 | #ifdef CONFIG_SUSPEND |
| 32 | 35 | ||
| 33 | /* This is just an arbitrary number */ | 36 | /* This is just an arbitrary number */ |
| @@ -27,8 +27,6 @@ · 26 unmodified lines | |||
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
| 29 | 29 | ||
| 30 | int pm_active; | ||
| 31 | |||
| 32 | /* | 30 | /* |
| 33 | * Locking notes: | 31 | * Locking notes: |
| 34 | * pm_devs_lock can be a semaphore providing pm ops are not called | 32 | * 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) · 169 unmodified lines | |||
| 204 | 202 | ||
| 205 | EXPORT_SYMBOL(pm_register); | 203 | EXPORT_SYMBOL(pm_register); |
| 206 | EXPORT_SYMBOL(pm_send_all); | 204 | EXPORT_SYMBOL(pm_send_all); |
| 207 | EXPORT_SYMBOL(pm_active); | ||
| 208 | |||
| 209 | 205 | ||