AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

PM / ACPI: Remove references to pm_flags from bus.c

Browse Source 
If direct references to pm_flags are removed from drivers/acpi/bus.c,
CONFIG_ACPI will not need to depend on CONFIG_PM any more.  Make that
happen.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Rafael J. Wysocki 2011-02-11 00:04:52 +01:00
parent cb8f51bdad
commit cd51e61cf4
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/acpi/Kconfig
View File

@ -7,7 +7,6 @@ menuconfig ACPI
depends on !IA64_HP_SIM
depends on IA64 || X86
depends on PCI
depends on PM
select PNP
default y
help

7
drivers/acpi/bus.c
View File

@ -40,6 +40,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <linux/dmi.h>
#include <linux/suspend.h>
#include "internal.h"
@ -1025,13 +1026,13 @@ static int __init acpi_init(void)
if (!result) {
pci_mmcfg_late_init();
if (!(pm_flags & PM_APM))
pm_flags |= PM_ACPI;
else {
if (pm_apm_enabled()) {
printk(KERN_INFO PREFIX
"APM is already active, exiting\n");
disable_acpi();
result = -ENODEV;
} else {
pm_set_acpi_flag();
}
} else
disable_acpi();

6
include/linux/suspend.h
View File

@ -272,6 +272,9 @@ extern int unregister_pm_notifier(struct notifier_block *nb);
register_pm_notifier(&fn##_nb); \
}
extern bool pm_apm_enabled(void);
extern void pm_set_acpi_flag(void);
/* drivers/base/power/wakeup.c */
extern bool events_check_enabled;
@ -292,6 +295,9 @@ static inline int unregister_pm_notifier(struct notifier_block *nb)
#define pm_notifier(fn, pri) do { (void)(fn); } while (0)
static inline bool pm_apm_enabled(void) { return false; }
static inline void pm_set_acpi_flag(void) {}
static inline bool pm_wakeup_pending(void) { return false; }
#endif /* !CONFIG_PM_SLEEP */

12
kernel/power/main.c
View File

@ -17,10 +17,20 @@
DEFINE_MUTEX(pm_mutex);
#ifdef CONFIG_PM_SLEEP
unsigned int pm_flags;
EXPORT_SYMBOL(pm_flags);
#ifdef CONFIG_PM_SLEEP
bool pm_apm_enabled(void)
{
return !!(pm_flags & PM_APM);
}
void pm_set_acpi_flag(void)
{
pm_flags |= PM_ACPI;
}
/* Routines for PM-transition notifications */