From 4879909341d6f057fe0192f7a81fa3488f905f63 Mon Sep 17 00:00:00 2001
From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Date: Mon, 21 Nov 2011 23:32:35 +0100
Subject: [PATCH] --- yaml --- r: 280353 b: refs/heads/master c:
 6a76b7a9cc93dec6ae58d70f1257d234291908e0 h: refs/heads/master i:   280351:
 07083be715cefa516723ed3f34d4d964f3571fcd v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/suspend.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5ce6dffcfd9f..504ba8f0cfa5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 341d4166175e9b7911444f5a33b1c9efb8f15c85
+refs/heads/master: 6a76b7a9cc93dec6ae58d70f1257d234291908e0
diff --git a/trunk/include/linux/suspend.h b/trunk/include/linux/suspend.h
index 57a692432f8a..1f7fff47cfac 100644
--- a/trunk/include/linux/suspend.h
+++ b/trunk/include/linux/suspend.h
@@ -380,12 +380,16 @@ static inline void unlock_system_sleep(void) {}
 
 static inline void lock_system_sleep(void)
 {
+	/* simplified freezer_do_not_count() */
+	current->flags |= PF_FREEZER_SKIP;
 	mutex_lock(&pm_mutex);
 }
 
 static inline void unlock_system_sleep(void)
 {
 	mutex_unlock(&pm_mutex);
+	/* simplified freezer_count() */
+	current->flags &= ~PF_FREEZER_SKIP;
 }
 #endif