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>

5 files changed, 7 insertions, 7 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index c1a106d87d90..c2582a4a5373 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -72,8 +72,8 @@ config PM_TRACE
         CAUTION: this option will cause your machine's real-time clock to be
         set to an invalid time after a resume.
 
-config SOFTWARE_SUSPEND
-        bool "Software Suspend (Hibernation)"
+config HIBERNATION
+        bool "Hibernation"
         depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))
         ---help---
           Enable the suspend to disk (STD) functionality, which is usually
@@ -112,7 +112,7 @@ config SOFTWARE_SUSPEND
 
 config PM_STD_PARTITION
         string "Default resume partition"
-        depends on SOFTWARE_SUSPEND
+        depends on HIBERNATION
         default ""
         ---help---
           The default resume partition is the partition that the suspend-
diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 38725f526afc..c6b03764512f 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -5,6 +5,6 @@ endif
 
 obj-y                           := main.o process.o console.o
 obj-$(CONFIG_PM_LEGACY)         += pm.o
-obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o disk.o snapshot.o swap.o user.o
+obj-$(CONFIG_HIBERNATION)       += swsusp.o disk.o snapshot.o swap.o user.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)       += poweroff.o
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 32147b57c3bf..cfba6987ae7d 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -292,7 +292,7 @@ static ssize_t state_show(struct kset *kset, char *buf)
                 if (pm_states[i] && valid_state(i))
                         s += sprintf(s,"%s ", pm_states[i]);
         }
-#ifdef CONFIG_SOFTWARE_SUSPEND
+#ifdef CONFIG_HIBERNATION
         s += sprintf(s, "%s\n", "disk");
 #else
         if (s != buf)
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 5f24c786f8ec..9080914796f5 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -13,7 +13,7 @@ struct swsusp_info {
 
 
 
-#ifdef CONFIG_SOFTWARE_SUSPEND
+#ifdef CONFIG_HIBERNATION
 /*
  * Keep some memory free so that I/O operations can succeed without paging
  * [Might this be more than 4 MB?]
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();