From: Andrew Morton <akpm@linux-foundation.org>

arch/x86_64/kernel/e820.c: In function 'e820_mark_nosave_regions':
arch/x86_64/kernel/e820.c:248: warning: implicit declaration of function 'register_nosave_region'

these patches were pretty screwed up.

Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/suspend.h |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff -puN include/linux/suspend.h~pm-introduce-hibernation-and-suspend-notifiers-fix include/linux/suspend.h
--- a/include/linux/suspend.h~pm-introduce-hibernation-and-suspend-notifiers-fix
+++ a/include/linux/suspend.h
@@ -74,8 +74,6 @@ extern unsigned long get_safe_page(gfp_t
 extern void hibernation_set_ops(struct hibernation_ops *ops);
 extern int hibernate(void);
 #else /* CONFIG_SOFTWARE_SUSPEND */
-static inline void register_nosave_region(unsigned long b, unsigned long e) {}
-static inline void register_nosave_region_late(unsigned long b, unsigned long e) {}
 static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
 static inline void swsusp_set_page_free(struct page *p) {}
 static inline void swsusp_unset_page_free(struct page *p) {}
@@ -109,6 +107,15 @@ static inline int unregister_pm_notifier
 	register_pm_notifier(&fn##_nb);			\
 }
 #else /* CONFIG_PM */
+
+static inline void register_nosave_region(unsigned long b, unsigned long e)
+{
+}
+
+static inline void register_nosave_region_late(unsigned long b, unsigned long e)
+{
+}
+
 static inline int register_pm_notifier(struct notifier_block *nb) {
 	return 0;
 }
_