Skip to contentSkip to conversation

Hibernation: Move function prototypes to header

PATCH In review Rafael J. Wysocki 2 participants 2 messages Nov 3, 2007

Subsystems (2)
Suspend to RAM Hibernation
lore
Share & tools
lore

Rafael J. Wysocki

author
#0 lore raw

PATCH 1/1 Hibernation: Move function prototypes to header

[Len, please add this patch to the suspend branch, thanks.]
---
From: Adrian Bunk <[email protected]>

This patch moves the prototypes of count_highmem_pages() and restore_highmem() to kernel/power/power.h

Signed-off-by Adrian Bunk <[email protected]>
Cc Pavel Machek <[email protected]>
Signed-off-by Rafael J. Wysocki <[email protected]>
---
 kernel/power/power.h    |    8 ++++++++
 kernel/power/snapshot.c |    1 -
 kernel/power/swsusp.c   |    8 --------
 3 files changed, 8 insertions(+), 9 deletions(-)

20af06052a0203d9e60b4937282793900c756182

kernel/power/power.h +8 -0
index 195dc46..3fe1e7f 100644
@@ -211,3 +211,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
kernel/power/snapshot.c +0 -1
index 78039b4..d9ed1ff 100644
@@ -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 */
 
 /**
kernel/power/swsusp.c +0 -8
index e1722d3..605c536 100644
@@ -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.
#1 lore raw

Hi!

Quoted 10 lines

[Len, please add this patch to the suspend branch, thanks.]
---
From: Adrian Bunk <[email protected]>

This patch moves the prototypes of count_highmem_pages() and restore_highmem() to kernel/power/power.h

Signed-off-by Adrian Bunk <[email protected]>
Cc Pavel Machek <[email protected]>
Signed-off-by Rafael J. Wysocki <[email protected]>

ACK.

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html