aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2007-11-19 17:36:20 -0500
committerLen Brown <len.brown@intel.com>2008-02-01 18:30:53 -0500
commit2f8ed1c60b06b797bf79a1dc540f0bed8c9d75a0 (patch)
treebf9157cf84a53b0ee74ba1e2b5bd9417589b9226 /kernel/power
parent964756a52f4cf0417d515b7f01eec69db8cb0fe2 (diff)
Hibernation: Move function prototypes to header
This patch moves the prototypes of count_highmem_pages() and restore_highmem() to kernel/power/power.h Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/power.h8
-rw-r--r--kernel/power/snapshot.c1
-rw-r--r--kernel/power/swsusp.c8
3 files changed, 8 insertions, 9 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h
index ef9060576a40..c5321eb1f7c8 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -180,3 +180,11 @@ static inline int pm_notifier_call_chain(unsigned long val)
180 return (blocking_notifier_call_chain(&pm_chain_head, val, NULL) 180 return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
181 == NOTIFY_BAD) ? -EINVAL : 0; 181 == NOTIFY_BAD) ? -EINVAL : 0;
182} 182}
183
184#ifdef CONFIG_HIGHMEM
185unsigned int count_highmem_pages(void);
186int restore_highmem(void);
187#else
188static inline unsigned int count_highmem_pages(void) { return 0; }
189static inline int restore_highmem(void) { return 0; }
190#endif
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index c5ce0f34a5d4..1ec3eccb1a34 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -872,7 +872,6 @@ unsigned int count_highmem_pages(void)
872} 872}
873#else 873#else
874static inline void *saveable_highmem_page(unsigned long pfn) { return NULL; } 874static inline void *saveable_highmem_page(unsigned long pfn) { return NULL; }
875static inline unsigned int count_highmem_pages(void) { return 0; }
876#endif /* CONFIG_HIGHMEM */ 875#endif /* CONFIG_HIGHMEM */
877 876
878/** 877/**
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index e1722d3155f1..605c536795ba 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -64,14 +64,6 @@ unsigned long image_size = 500 * 1024 * 1024;
64 64
65int in_suspend __nosavedata = 0; 65int in_suspend __nosavedata = 0;
66 66
67#ifdef CONFIG_HIGHMEM
68unsigned int count_highmem_pages(void);
69int restore_highmem(void);
70#else
71static inline int restore_highmem(void) { return 0; }
72static inline unsigned int count_highmem_pages(void) { return 0; }
73#endif
74
75/** 67/**
76 * The following functions are used for tracing the allocated 68 * The following functions are used for tracing the allocated
77 * swap pages, so that they can be freed in case of an error. 69 * swap pages, so that they can be freed in case of an error.