diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-19 01:47:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 10:04:42 -0700 |
| commit | 6c961dfb7c903cfd1cd71b506863894038fd704f (patch) | |
| tree | 32890d6ef2cf735243d804778a5b62951aed4ef5 /kernel/power/power.h | |
| parent | ccd4b65aef4be2278543fde5b999e55a4d694fd8 (diff) | |
| download | kernel_samsung_aries-6c961dfb7c903cfd1cd71b506863894038fd704f.zip kernel_samsung_aries-6c961dfb7c903cfd1cd71b506863894038fd704f.tar.gz kernel_samsung_aries-6c961dfb7c903cfd1cd71b506863894038fd704f.tar.bz2 | |
PM: Reduce code duplication between main.c and user.c
The SNAPSHOT_S2RAM ioctl code is outdated and it should not duplicate the
suspend code in kernel/power/main.c. Fix that.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power/power.h')
| -rw-r--r-- | kernel/power/power.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index 01c2275..5f24c78 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -170,7 +170,6 @@ extern int swsusp_resume(void); extern int swsusp_read(unsigned int *flags_p); extern int swsusp_write(unsigned int flags); extern void swsusp_close(void); -extern int suspend_enter(suspend_state_t state); struct timeval; /* kernel/power/swsusp.c */ @@ -178,6 +177,8 @@ extern void swsusp_show_speed(struct timeval *, struct timeval *, unsigned int, char *); /* kernel/power/main.c */ +extern int suspend_enter(suspend_state_t state); +extern int suspend_devices_and_enter(suspend_state_t state); extern struct blocking_notifier_head pm_chain_head; static inline int pm_notifier_call_chain(unsigned long val) |