aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-23 05:04:47 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:42:59 -0400
commit7bff24e255ee11ecbc304315a252fcbd84f9ffce (patch)
tree23397d27bad855d8b46da23ffc3d9ae5cc0c596c /kernel/power
parenta938c356d5b007fe6d28251c0ddbf6c11d0d92b5 (diff)
[PATCH] kernel/power/snapshot.c: cleanups
- make needlessly global functions static - make dummy functions static inline Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/snapshot.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 7f511d89c667..513eef3391a0 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -122,7 +122,7 @@ static int restore_arch_mem(void)
122} 122}
123 123
124#ifdef CONFIG_HIGHMEM 124#ifdef CONFIG_HIGHMEM
125unsigned int count_highmem_pages(void) 125static unsigned int count_highmem_pages(void)
126{ 126{
127 struct zone *zone; 127 struct zone *zone;
128 unsigned long zone_pfn; 128 unsigned long zone_pfn;
@@ -199,7 +199,7 @@ static int save_highmem_zone(struct zone *zone)
199 return 0; 199 return 0;
200} 200}
201 201
202int save_highmem(void) 202static int save_highmem(void)
203{ 203{
204 struct zone *zone; 204 struct zone *zone;
205 int res = 0; 205 int res = 0;
@@ -216,7 +216,7 @@ int save_highmem(void)
216 return 0; 216 return 0;
217} 217}
218 218
219int restore_highmem(void) 219static int restore_highmem(void)
220{ 220{
221 printk("swsusp: Restoring Highmem\n"); 221 printk("swsusp: Restoring Highmem\n");
222 while (highmem_copy) { 222 while (highmem_copy) {
@@ -233,9 +233,9 @@ int restore_highmem(void)
233 return 0; 233 return 0;
234} 234}
235#else 235#else
236static unsigned int count_highmem_pages(void) {return 0;} 236static inline unsigned int count_highmem_pages(void) {return 0;}
237static int save_highmem(void) {return 0;} 237static inline int save_highmem(void) {return 0;}
238static int restore_highmem(void) {return 0;} 238static inline int restore_highmem(void) {return 0;}
239#endif 239#endif
240 240
241unsigned int count_special_pages(void) 241unsigned int count_special_pages(void)
@@ -482,7 +482,8 @@ unsigned long get_safe_page(gfp_t gfp_mask)
482 * On each page we set up a list of struct_pbe elements. 482 * On each page we set up a list of struct_pbe elements.
483 */ 483 */
484 484
485struct pbe *alloc_pagedir(unsigned int nr_pages, gfp_t gfp_mask, int safe_needed) 485static struct pbe *alloc_pagedir(unsigned int nr_pages, gfp_t gfp_mask,
486 int safe_needed)
486{ 487{
487 unsigned int num; 488 unsigned int num;
488 struct pbe *pblist, *pbe; 489 struct pbe *pblist, *pbe;