diff options
| author | Rafael J. Wysocki | 2007-07-29 23:24:36 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-07-30 01:45:38 +0200 |
| commit | b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch) | |
| tree | 895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /kernel/sys.c | |
| parent | Provide timespec to guests rather than jiffies clock. (diff) | |
| download | kernel-qcow2-linux-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.tar.gz kernel-qcow2-linux-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.tar.xz kernel-qcow2-linux-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.zip | |
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION to avoid
confusion (among other things, with CONFIG_SUSPEND introduced in the
next patch).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
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 14f8adcfffd9..449b81b98b3d 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -954,7 +954,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user unlock_kernel(); return -EINVAL; -#ifdef CONFIG_SOFTWARE_SUSPEND +#ifdef CONFIG_HIBERNATION case LINUX_REBOOT_CMD_SW_SUSPEND: { int ret = hibernate(); |