diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-07 20:13:39 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-07 20:13:39 -0700 |
| commit | b3b199111fbe794e72d1bd88208e10d3b39d6851 (patch) | |
| tree | 8f69f5602fe89b54fd4a7cfef61c2acb7bb54dd0 /kernel/sys.c | |
| parent | 345741308f680bf496ef90c77687aff1c235dfb7 (diff) | |
| parent | 73fb7306b1630cbc548363973127560c371930a7 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
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; |