aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-03-23 06:00:01 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 10:38:07 -0500
commit74c7e2efbe37378026f00ad9e7253796d7b2fc99 (patch)
treeddea6072e727fb37b55a3b45122e023a3951decf
parent61159a314bca6408320c3173c1282c64f5cdaa76 (diff)
[PATCH] kernel/power: move externs to header files
Move externs from C source files to header files. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/pm.h3
-rw-r--r--kernel/power/disk.c11
-rw-r--r--kernel/power/power.h6
3 files changed, 7 insertions, 13 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 5be87ba3b7ac..6df2585c0169 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -188,6 +188,8 @@ extern void device_power_up(void);
188extern void device_resume(void); 188extern void device_resume(void);
189 189
190#ifdef CONFIG_PM 190#ifdef CONFIG_PM
191extern suspend_disk_method_t pm_disk_mode;
192
191extern int device_suspend(pm_message_t state); 193extern int device_suspend(pm_message_t state);
192 194
193#define device_set_wakeup_enable(dev,val) \ 195#define device_set_wakeup_enable(dev,val) \
@@ -215,7 +217,6 @@ static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)
215 217
216static inline void dpm_runtime_resume(struct device * dev) 218static inline void dpm_runtime_resume(struct device * dev)
217{ 219{
218
219} 220}
220 221
221#endif 222#endif
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 4eb464b71347..4bd68f482f2b 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -22,17 +22,6 @@
22#include "power.h" 22#include "power.h"
23 23
24 24
25extern suspend_disk_method_t pm_disk_mode;
26
27extern int swsusp_shrink_memory(void);
28extern int swsusp_suspend(void);
29extern int swsusp_write(void);
30extern int swsusp_check(void);
31extern int swsusp_read(void);
32extern void swsusp_close(void);
33extern int swsusp_resume(void);
34
35
36static int noresume = 0; 25static int noresume = 0;
37char resume_file[256] = CONFIG_PM_STD_PARTITION; 26char resume_file[256] = CONFIG_PM_STD_PARTITION;
38dev_t swsusp_resume_device; 27dev_t swsusp_resume_device;
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 089c84bed895..5d1abffbb9ce 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -48,7 +48,6 @@ extern asmlinkage int swsusp_arch_suspend(void);
48extern asmlinkage int swsusp_arch_resume(void); 48extern asmlinkage int swsusp_arch_resume(void);
49 49
50extern unsigned int count_data_pages(void); 50extern unsigned int count_data_pages(void);
51extern void swsusp_free(void);
52 51
53struct snapshot_handle { 52struct snapshot_handle {
54 loff_t offset; 53 loff_t offset;
@@ -91,6 +90,11 @@ extern struct bitmap_page *alloc_bitmap(unsigned int nr_bits);
91extern unsigned long alloc_swap_page(int swap, struct bitmap_page *bitmap); 90extern unsigned long alloc_swap_page(int swap, struct bitmap_page *bitmap);
92extern void free_all_swap_pages(int swap, struct bitmap_page *bitmap); 91extern void free_all_swap_pages(int swap, struct bitmap_page *bitmap);
93 92
93extern int swsusp_check(void);
94extern int swsusp_shrink_memory(void); 94extern int swsusp_shrink_memory(void);
95extern void swsusp_free(void);
95extern int swsusp_suspend(void); 96extern int swsusp_suspend(void);
96extern int swsusp_resume(void); 97extern int swsusp_resume(void);
98extern int swsusp_read(void);
99extern int swsusp_write(void);
100extern void swsusp_close(void);