diff options
| author | Len Brown | 2008-01-11 12:27:13 -0500 |
|---|---|---|
| committer | Len Brown | 2008-01-11 12:27:13 -0500 |
| commit | 02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04 (patch) | |
| tree | 33402107adad8ebca51ea843291e09afc11a67d7 /kernel | |
| parent | eba6860ac5f9578e3ba6d0f9900cfc72599c5d66 (diff) | |
| parent | 9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a (diff) | |
Pull bugzilla-9194 into release branch
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 3cdf95b1dc92..f71c9504a5c5 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 c50d15266c10..60c73fa670d5 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); - |