diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-01 19:57:13 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-01 19:57:13 -0700 |
| commit | f1a6400876c588497a5477cd642ead33fcbc7e81 (patch) | |
| tree | 587d76fb4bded89975b4d0fe1ce74d2d3b218dec /kernel/sys.c | |
| parent | 308f1c41c58a2a43023ddf54d0df6f35a9674232 (diff) | |
| parent | d5bd8347829ab21cdbce604c904350b42168a81a (diff) | |
Merge bk://kernel.bkbits.net//home/mochel/linux-2.5-power
into osdl.org:/home/mochel/src/kernel/linux-2.5-power
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 02b5a12dfd59..d77453173d29 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -456,7 +456,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user #ifdef CONFIG_SOFTWARE_SUSPEND case LINUX_REBOOT_CMD_SW_SUSPEND: - if (!pm_suspend(PM_SUSPEND_DISK)) + if (!software_suspend()) break; do_exit(0); break; |