From 61e92dc3a770ee5f335f8b5bd2f4e7d8c5724669 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 23 Mar 2006 03:00:01 -0800 Subject: [PATCH] --- yaml --- r: 23016 b: refs/heads/master c: 74c7e2efbe37378026f00ad9e7253796d7b2fc99 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/pm.h | 3 ++- trunk/kernel/power/disk.c | 11 ----------- trunk/kernel/power/power.h | 6 +++++- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index d660076195e1..35a66ae10427 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61159a314bca6408320c3173c1282c64f5cdaa76 +refs/heads/master: 74c7e2efbe37378026f00ad9e7253796d7b2fc99 diff --git a/trunk/include/linux/pm.h b/trunk/include/linux/pm.h index 5be87ba3b7ac..6df2585c0169 100644 --- a/trunk/include/linux/pm.h +++ b/trunk/include/linux/pm.h @@ -188,6 +188,8 @@ extern void device_power_up(void); extern void device_resume(void); #ifdef CONFIG_PM +extern suspend_disk_method_t pm_disk_mode; + extern int device_suspend(pm_message_t state); #define device_set_wakeup_enable(dev,val) \ @@ -215,7 +217,6 @@ static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state) static inline void dpm_runtime_resume(struct device * dev) { - } #endif diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c index 4eb464b71347..4bd68f482f2b 100644 --- a/trunk/kernel/power/disk.c +++ b/trunk/kernel/power/disk.c @@ -22,17 +22,6 @@ #include "power.h" -extern suspend_disk_method_t pm_disk_mode; - -extern int swsusp_shrink_memory(void); -extern int swsusp_suspend(void); -extern int swsusp_write(void); -extern int swsusp_check(void); -extern int swsusp_read(void); -extern void swsusp_close(void); -extern int swsusp_resume(void); - - static int noresume = 0; char resume_file[256] = CONFIG_PM_STD_PARTITION; dev_t swsusp_resume_device; diff --git a/trunk/kernel/power/power.h b/trunk/kernel/power/power.h index 089c84bed895..5d1abffbb9ce 100644 --- a/trunk/kernel/power/power.h +++ b/trunk/kernel/power/power.h @@ -48,7 +48,6 @@ extern asmlinkage int swsusp_arch_suspend(void); extern asmlinkage int swsusp_arch_resume(void); extern unsigned int count_data_pages(void); -extern void swsusp_free(void); struct snapshot_handle { loff_t offset; @@ -91,6 +90,11 @@ extern struct bitmap_page *alloc_bitmap(unsigned int nr_bits); extern unsigned long alloc_swap_page(int swap, struct bitmap_page *bitmap); extern void free_all_swap_pages(int swap, struct bitmap_page *bitmap); +extern int swsusp_check(void); extern int swsusp_shrink_memory(void); +extern void swsusp_free(void); extern int swsusp_suspend(void); extern int swsusp_resume(void); +extern int swsusp_read(void); +extern int swsusp_write(void); +extern void swsusp_close(void);