diff options
author | 2007-05-06 14:50:49 -0700 | |
---|---|---|
committer | 2007-05-07 12:12:59 -0700 | |
commit | ab3bfca7abf3fd0fe41d26d839610a787aa7e587 (patch) | |
tree | e62e58beaf9d22d4156b27d4523c3728bf5769bc /kernel/sys.c | |
parent | freezer: fix racy usage of try_to_freeze in kswapd (diff) | |
download | linux-ab3bfca7abf3fd0fe41d26d839610a787aa7e587.tar.gz linux-ab3bfca7abf3fd0fe41d26d839610a787aa7e587.tar.bz2 linux-ab3bfca7abf3fd0fe41d26d839610a787aa7e587.zip |
remove software_suspend()
Remove software_suspend() and all its users since
pm_suspend(PM_SUSPEND_DISK) should be equivalent and there's no point in
having two interfaces for the same thing.
The patch also changes the valid_state function to return 0 (false) for
PM_SUSPEND_DISK when SOFTWARE_SUSPEND is not configured instead of
accepting it and having the whole thing fail later.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sys.c')
-rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 123b165080e6..fe1f3ab20477 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -881,7 +881,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user #ifdef CONFIG_SOFTWARE_SUSPEND case LINUX_REBOOT_CMD_SW_SUSPEND: { - int ret = software_suspend(); + int ret = pm_suspend(PM_SUSPEND_DISK); unlock_kernel(); return ret; } |