From bf0609dd7c6bc4ff775b19a7bc5347c7b45808d9 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 21 Sep 2009 17:03:09 -0700
Subject: [PATCH] --- yaml --- r: 164456 b: refs/heads/master c:
 1a8670a29b5277cbe601f74ab63d2c5211fb3005 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/gfp.h    | 12 ------------
 trunk/include/linux/oom.h    | 11 +++++++++++
 trunk/kernel/power/process.c |  1 +
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 9284399b7d61..5fdd58478c43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b21767637c3c99890a248fe47ac414e51cf5eb7
+refs/heads/master: 1a8670a29b5277cbe601f74ab63d2c5211fb3005
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index c32bfa8e7f1e..f53e9b868c26 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -335,18 +335,6 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp);
 void drain_all_pages(void);
 void drain_local_pages(void *dummy);
 
-extern bool oom_killer_disabled;
-
-static inline void oom_killer_disable(void)
-{
-	oom_killer_disabled = true;
-}
-
-static inline void oom_killer_enable(void)
-{
-	oom_killer_disabled = false;
-}
-
 extern gfp_t gfp_allowed_mask;
 
 static inline void set_gfp_allowed_mask(gfp_t mask)
diff --git a/trunk/include/linux/oom.h b/trunk/include/linux/oom.h
index a7979baf1e39..6aac5fe4f6f1 100644
--- a/trunk/include/linux/oom.h
+++ b/trunk/include/linux/oom.h
@@ -30,5 +30,16 @@ extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order);
 extern int register_oom_notifier(struct notifier_block *nb);
 extern int unregister_oom_notifier(struct notifier_block *nb);
 
+extern bool oom_killer_disabled;
+
+static inline void oom_killer_disable(void)
+{
+	oom_killer_disabled = true;
+}
+
+static inline void oom_killer_enable(void)
+{
+	oom_killer_disabled = false;
+}
 #endif /* __KERNEL__*/
 #endif /* _INCLUDE_LINUX_OOM_H */
diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c
index da2072d73811..cc2e55373b68 100644
--- a/trunk/kernel/power/process.c
+++ b/trunk/kernel/power/process.c
@@ -9,6 +9,7 @@
 #undef DEBUG
 
 #include <linux/interrupt.h>
+#include <linux/oom.h>
 #include <linux/suspend.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>