diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-15 21:22:24 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-03-15 00:43:16 +0100 |
| commit | 6831c6edc7b272a08dd2a6c71bb183a48fe98ae6 (patch) | |
| tree | fc3ef253f12bd9f2d211271c09a5475ed19b18b0 /kernel | |
| parent | e8665002477f0278f84f898145b1f141ba26ee26 (diff) | |
| download | linux-6831c6edc7b272a08dd2a6c71bb183a48fe98ae6.tar.gz linux-6831c6edc7b272a08dd2a6c71bb183a48fe98ae6.tar.bz2 linux-6831c6edc7b272a08dd2a6c71bb183a48fe98ae6.zip | |
PM: Drop pm_flags that is not necessary
The variable pm_flags is used to prevent APM from being enabled
along with ACPI, which would lead to problems. However, acpi_init()
is always called before apm_init() and after acpi_init() has
returned, it is known whether or not ACPI will be used. Namely, if
acpi_disabled is not set after acpi_init() has returned, this means
that ACPI is enabled. Thus, it is sufficient to check acpi_disabled
in apm_init() to prevent APM from being enabled in parallel with
ACPI.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/main.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index b5405af48ddb..8eaba5f27b10 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -19,19 +19,6 @@ DEFINE_MUTEX(pm_mutex); #ifdef CONFIG_PM_SLEEP -unsigned int pm_flags; -EXPORT_SYMBOL(pm_flags); - -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 */ static BLOCKING_NOTIFIER_HEAD(pm_chain_head); |