From 413e64bdd8f79f72398863abdbe4a56e9aa03806 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 19 Nov 2007 23:36:20 +0100
Subject: [PATCH] --- yaml --- r: 82369 b: refs/heads/master c:
 2f8ed1c60b06b797bf79a1dc540f0bed8c9d75a0 h: refs/heads/master i:   82367:
 681bc993b4d2e9e7807a2b89e199910b3c0760e2 v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/power/power.h    | 8 ++++++++
 trunk/kernel/power/snapshot.c | 1 -
 trunk/kernel/power/swsusp.c   | 8 --------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 38fab01683ab..96366c68aad2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 964756a52f4cf0417d515b7f01eec69db8cb0fe2
+refs/heads/master: 2f8ed1c60b06b797bf79a1dc540f0bed8c9d75a0
diff --git a/trunk/kernel/power/power.h b/trunk/kernel/power/power.h
index ef9060576a40..c5321eb1f7c8 100644
--- a/trunk/kernel/power/power.h
+++ b/trunk/kernel/power/power.h
@@ -180,3 +180,11 @@ static inline int pm_notifier_call_chain(unsigned long val)
 	return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
 			== NOTIFY_BAD) ? -EINVAL : 0;
 }
+
+#ifdef CONFIG_HIGHMEM
+unsigned int count_highmem_pages(void);
+int restore_highmem(void);
+#else
+static inline unsigned int count_highmem_pages(void) { return 0; }
+static inline int restore_highmem(void) { return 0; }
+#endif
diff --git a/trunk/kernel/power/snapshot.c b/trunk/kernel/power/snapshot.c
index c5ce0f34a5d4..1ec3eccb1a34 100644
--- a/trunk/kernel/power/snapshot.c
+++ b/trunk/kernel/power/snapshot.c
@@ -872,7 +872,6 @@ unsigned int count_highmem_pages(void)
 }
 #else
 static inline void *saveable_highmem_page(unsigned long pfn) { return NULL; }
-static inline unsigned int count_highmem_pages(void) { return 0; }
 #endif /* CONFIG_HIGHMEM */
 
 /**
diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
index e1722d3155f1..605c536795ba 100644
--- a/trunk/kernel/power/swsusp.c
+++ b/trunk/kernel/power/swsusp.c
@@ -64,14 +64,6 @@ unsigned long image_size = 500 * 1024 * 1024;
 
 int in_suspend __nosavedata = 0;
 
-#ifdef CONFIG_HIGHMEM
-unsigned int count_highmem_pages(void);
-int restore_highmem(void);
-#else
-static inline int restore_highmem(void) { return 0; }
-static inline unsigned int count_highmem_pages(void) { return 0; }
-#endif
-
 /**
  *	The following functions are used for tracing the allocated
  *	swap pages, so that they can be freed in case of an error.