From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
To: rjw@sisk.pl
Cc: pavel@ucw.cz, len.brown@intel.com, tj@kernel.org,
oleg@redhat.com, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org
Subject: [PATCH 2/2] PM: Use the freezer_count() functions in [un]lock_system_sleep() APIs
Date: Tue, 06 Dec 2011 21:34:02 +0530 [thread overview]
Message-ID: <20111206160353.16729.91096.stgit@srivatsabhat.in.ibm.com> (raw)
In-Reply-To: <20111206160251.16729.62719.stgit@srivatsabhat.in.ibm.com>
Now that freezer_count() and freezer_do_not_count() don't have the restriction
that they are effective only when called by userspace processes, use
them in lock_system_sleep() and unlock_system_sleep() instead of open-coding
their parts.
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
---
include/linux/suspend.h | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 1f7fff4..906d62c 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -6,6 +6,7 @@
#include <linux/init.h>
#include <linux/pm.h>
#include <linux/mm.h>
+#include <linux/freezer.h>
#include <asm/errno.h>
#ifdef CONFIG_VT
@@ -380,16 +381,14 @@ static inline void unlock_system_sleep(void) {}
static inline void lock_system_sleep(void)
{
- /* simplified freezer_do_not_count() */
- current->flags |= PF_FREEZER_SKIP;
+ freezer_do_not_count();
mutex_lock(&pm_mutex);
}
static inline void unlock_system_sleep(void)
{
mutex_unlock(&pm_mutex);
- /* simplified freezer_count() */
- current->flags &= ~PF_FREEZER_SKIP;
+ freezer_count();
}
#endif
next prev parent reply other threads:[~2011-12-06 16:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 16:03 [PATCH 1/2] PM / Freezer: Remove the "userspace only" constraint from freezer[_do_not]_count() Srivatsa S. Bhat
2011-12-06 16:04 ` Srivatsa S. Bhat [this message]
2011-12-06 16:35 ` [PATCH 2/2] PM: Use the freezer_count() functions in [un]lock_system_sleep() APIs Tejun Heo
2011-12-06 16:35 ` [PATCH 1/2] PM / Freezer: Remove the "userspace only" constraint from freezer[_do_not]_count() Tejun Heo
2011-12-06 17:20 ` Oleg Nesterov
2011-12-06 18:11 ` Srivatsa S. Bhat
2011-12-06 22:36 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111206160353.16729.91096.stgit@srivatsabhat.in.ibm.com \
--to=srivatsa.bhat@linux.vnet.ibm.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=pavel@ucw.cz \
--cc=rjw@sisk.pl \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®