aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/Kconfig.debug4
-rw-r--r--arch/i386/kernel/e820.c2
-rw-r--r--arch/i386/mm/init.c2
-rw-r--r--arch/i386/power/Makefile2
-rw-r--r--arch/powerpc/Kconfig.debug2
-rw-r--r--arch/powerpc/configs/lite5200_defconfig2
-rw-r--r--arch/powerpc/configs/pmac32_defconfig2
-rw-r--r--arch/powerpc/kernel/Makefile6
-rw-r--r--arch/ppc/configs/TQM8540_defconfig2
-rw-r--r--arch/ppc/configs/TQM8541_defconfig2
-rw-r--r--arch/ppc/configs/TQM8555_defconfig2
-rw-r--r--arch/ppc/configs/TQM8560_defconfig2
-rw-r--r--arch/ppc/configs/ev64360_defconfig2
-rw-r--r--arch/ppc/configs/ml300_defconfig2
-rw-r--r--arch/ppc/configs/ml403_defconfig2
-rw-r--r--arch/ppc/configs/mpc834x_sys_defconfig2
-rw-r--r--arch/ppc/configs/prep_defconfig2
-rw-r--r--arch/sparc64/Kconfig.debug2
-rw-r--r--arch/x86_64/defconfig2
-rw-r--r--arch/x86_64/kernel/Makefile2
-rw-r--r--arch/x86_64/kernel/suspend.c4
-rw-r--r--drivers/acpi/sleep/main.c6
-rw-r--r--drivers/acpi/sleep/proc.c2
-rw-r--r--drivers/i2c/chips/tps65010.c2
-rw-r--r--include/asm-i386/e820.h2
-rw-r--r--include/linux/suspend.h8
-rw-r--r--kernel/power/Kconfig6
-rw-r--r--kernel/power/Makefile2
-rw-r--r--kernel/power/main.c2
-rw-r--r--kernel/power/power.h2
-rw-r--r--kernel/sys.c2
-rw-r--r--mm/Kconfig4
-rw-r--r--mm/swapfile.c6
33 files changed, 47 insertions, 47 deletions
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug
index b31c0802e1cc..f03531eacdfb 100644
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
@@ -36,11 +36,11 @@ config DEBUG_STACK_USAGE
36 This option will slow down process creation somewhat. 36 This option will slow down process creation somewhat.
37 37
38comment "Page alloc debug is incompatible with Software Suspend on i386" 38comment "Page alloc debug is incompatible with Software Suspend on i386"
39 depends on DEBUG_KERNEL && SOFTWARE_SUSPEND 39 depends on DEBUG_KERNEL && HIBERNATION
40 40
41config DEBUG_PAGEALLOC 41config DEBUG_PAGEALLOC
42 bool "Debug page memory allocations" 42 bool "Debug page memory allocations"
43 depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND && !HUGETLBFS 43 depends on DEBUG_KERNEL && !HIBERNATION && !HUGETLBFS
44 help 44 help
45 Unmap pages from the kernel linear mapping after free_pages(). 45 Unmap pages from the kernel linear mapping after free_pages().
46 This results in a large slowdown, but helps to find certain types 46 This results in a large slowdown, but helps to find certain types
diff --git a/arch/i386/kernel/e820.c b/arch/i386/kernel/e820.c
index e60cddbc4cfb..3c86b979a40a 100644
--- a/arch/i386/kernel/e820.c
+++ b/arch/i386/kernel/e820.c
@@ -321,7 +321,7 @@ static int __init request_standard_resources(void)
321 321
322subsys_initcall(request_standard_resources); 322subsys_initcall(request_standard_resources);
323 323
324#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND) 324#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)
325/** 325/**
326 * e820_mark_nosave_regions - Find the ranges of physical addresses that do not 326 * e820_mark_nosave_regions - Find the ranges of physical addresses that do not
327 * correspond to e820 RAM areas and mark the corresponding pages as nosave for 327 * correspond to e820 RAM areas and mark the corresponding pages as nosave for
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 4c4809f13cb1..730a5b177b1f 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -432,7 +432,7 @@ static void __init pagetable_init (void)
432 paravirt_pagetable_setup_done(pgd_base); 432 paravirt_pagetable_setup_done(pgd_base);
433} 433}
434 434
435#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI) 435#if defined(CONFIG_HIBERNATION) || defined(CONFIG_ACPI)
436/* 436/*
437 * Swap suspend & friends need this for resume because things like the intel-agp 437 * Swap suspend & friends need this for resume because things like the intel-agp
438 * driver might have split up a kernel 4MB mapping. 438 * driver might have split up a kernel 4MB mapping.
diff --git a/arch/i386/power/Makefile b/arch/i386/power/Makefile
index 2de7bbf03cd7..d764ec950065 100644
--- a/arch/i386/power/Makefile
+++ b/arch/i386/power/Makefile
@@ -1,2 +1,2 @@
1obj-$(CONFIG_PM) += cpu.o 1obj-$(CONFIG_PM) += cpu.o
2obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o 2obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 5c71624ee38d..22acece95b11 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -20,7 +20,7 @@ config DEBUG_STACK_USAGE
20 20
21config DEBUG_PAGEALLOC 21config DEBUG_PAGEALLOC
22 bool "Debug page memory allocations" 22 bool "Debug page memory allocations"
23 depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND 23 depends on DEBUG_KERNEL && !HIBERNATION
24 help 24 help
25 Unmap pages from the kernel linear mapping after free_pages(). 25 Unmap pages from the kernel linear mapping after free_pages().
26 This results in a large slowdown, but helps to find certain types 26 This results in a large slowdown, but helps to find certain types
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index d12a981398b8..9c30ca451617 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_defconfig
@@ -196,7 +196,7 @@ CONFIG_PM=y
196# CONFIG_PM_LEGACY is not set 196# CONFIG_PM_LEGACY is not set
197# CONFIG_PM_DEBUG is not set 197# CONFIG_PM_DEBUG is not set
198# CONFIG_PM_SYSFS_DEPRECATED is not set 198# CONFIG_PM_SYSFS_DEPRECATED is not set
199# CONFIG_SOFTWARE_SUSPEND is not set 199# CONFIG_HIBERNATION is not set
200CONFIG_SECCOMP=y 200CONFIG_SECCOMP=y
201# CONFIG_WANT_DEVICE_TREE is not set 201# CONFIG_WANT_DEVICE_TREE is not set
202CONFIG_ISA_DMA_API=y 202CONFIG_ISA_DMA_API=y
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 0d8ba623e29a..08525d6fb1f1 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -218,7 +218,7 @@ CONFIG_PM=y
218CONFIG_PM_DEBUG=y 218CONFIG_PM_DEBUG=y
219# CONFIG_DISABLE_CONSOLE_SUSPEND is not set 219# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
220CONFIG_PM_SYSFS_DEPRECATED=y 220CONFIG_PM_SYSFS_DEPRECATED=y
221CONFIG_SOFTWARE_SUSPEND=y 221CONFIG_HIBERNATION=y
222CONFIG_PM_STD_PARTITION="" 222CONFIG_PM_STD_PARTITION=""
223CONFIG_APM_EMULATION=y 223CONFIG_APM_EMULATION=y
224CONFIG_SECCOMP=y 224CONFIG_SECCOMP=y
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 42c42ecad00c..f39a72f30aad 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -37,9 +37,9 @@ obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o
37obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 37obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
38obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o 38obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
39obj-$(CONFIG_TAU) += tau_6xx.o 39obj-$(CONFIG_TAU) += tau_6xx.o
40obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o 40obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o
41obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o 41obj32-$(CONFIG_HIBERNATION) += swsusp_32.o
42obj64-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_64.o swsusp_asm64.o 42obj64-$(CONFIG_HIBERNATION) += swsusp_64.o swsusp_asm64.o
43obj32-$(CONFIG_MODULES) += module_32.o 43obj32-$(CONFIG_MODULES) += module_32.o
44 44
45ifeq ($(CONFIG_PPC_MERGE),y) 45ifeq ($(CONFIG_PPC_MERGE),y)
diff --git a/arch/ppc/configs/TQM8540_defconfig b/arch/ppc/configs/TQM8540_defconfig
index 99bf3b7a2762..f33f0e772dcb 100644
--- a/arch/ppc/configs/TQM8540_defconfig
+++ b/arch/ppc/configs/TQM8540_defconfig
@@ -136,7 +136,7 @@ CONFIG_BINFMT_ELF=y
136# CONFIG_BINFMT_MISC is not set 136# CONFIG_BINFMT_MISC is not set
137# CONFIG_CMDLINE_BOOL is not set 137# CONFIG_CMDLINE_BOOL is not set
138# CONFIG_PM is not set 138# CONFIG_PM is not set
139# CONFIG_SOFTWARE_SUSPEND is not set 139# CONFIG_HIBERNATION is not set
140CONFIG_SECCOMP=y 140CONFIG_SECCOMP=y
141CONFIG_ISA_DMA_API=y 141CONFIG_ISA_DMA_API=y
142 142
diff --git a/arch/ppc/configs/TQM8541_defconfig b/arch/ppc/configs/TQM8541_defconfig
index 0ff56695d349..e00cd62daa3f 100644
--- a/arch/ppc/configs/TQM8541_defconfig
+++ b/arch/ppc/configs/TQM8541_defconfig
@@ -138,7 +138,7 @@ CONFIG_BINFMT_ELF=y
138# CONFIG_BINFMT_MISC is not set 138# CONFIG_BINFMT_MISC is not set
139# CONFIG_CMDLINE_BOOL is not set 139# CONFIG_CMDLINE_BOOL is not set
140# CONFIG_PM is not set 140# CONFIG_PM is not set
141# CONFIG_SOFTWARE_SUSPEND is not set 141# CONFIG_HIBERNATION is not set
142CONFIG_SECCOMP=y 142CONFIG_SECCOMP=y
143CONFIG_ISA_DMA_API=y 143CONFIG_ISA_DMA_API=y
144 144
diff --git a/arch/ppc/configs/TQM8555_defconfig b/arch/ppc/configs/TQM8555_defconfig
index 730b3db2e47a..43a0d9df1e23 100644
--- a/arch/ppc/configs/TQM8555_defconfig
+++ b/arch/ppc/configs/TQM8555_defconfig
@@ -138,7 +138,7 @@ CONFIG_BINFMT_ELF=y
138# CONFIG_BINFMT_MISC is not set 138# CONFIG_BINFMT_MISC is not set
139# CONFIG_CMDLINE_BOOL is not set 139# CONFIG_CMDLINE_BOOL is not set
140# CONFIG_PM is not set 140# CONFIG_PM is not set
141# CONFIG_SOFTWARE_SUSPEND is not set 141# CONFIG_HIBERNATION is not set
142CONFIG_SECCOMP=y 142CONFIG_SECCOMP=y
143CONFIG_ISA_DMA_API=y 143CONFIG_ISA_DMA_API=y
144 144
diff --git a/arch/ppc/configs/TQM8560_defconfig b/arch/ppc/configs/TQM8560_defconfig
index 1d902072825e..a814d17a2be9 100644
--- a/arch/ppc/configs/TQM8560_defconfig
+++ b/arch/ppc/configs/TQM8560_defconfig
@@ -137,7 +137,7 @@ CONFIG_BINFMT_ELF=y
137# CONFIG_BINFMT_MISC is not set 137# CONFIG_BINFMT_MISC is not set
138# CONFIG_CMDLINE_BOOL is not set 138# CONFIG_CMDLINE_BOOL is not set
139# CONFIG_PM is not set 139# CONFIG_PM is not set
140# CONFIG_SOFTWARE_SUSPEND is not set 140# CONFIG_HIBERNATION is not set
141CONFIG_SECCOMP=y 141CONFIG_SECCOMP=y
142CONFIG_ISA_DMA_API=y 142CONFIG_ISA_DMA_API=y
143 143
diff --git a/arch/ppc/configs/ev64360_defconfig b/arch/ppc/configs/ev64360_defconfig
index d471e578dcb5..f297c4bb632b 100644
--- a/arch/ppc/configs/ev64360_defconfig
+++ b/arch/ppc/configs/ev64360_defconfig
@@ -142,7 +142,7 @@ CONFIG_BINFMT_MISC=y
142CONFIG_CMDLINE_BOOL=y 142CONFIG_CMDLINE_BOOL=y
143CONFIG_CMDLINE="console=ttyMM0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2" 143CONFIG_CMDLINE="console=ttyMM0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"
144# CONFIG_PM is not set 144# CONFIG_PM is not set
145# CONFIG_SOFTWARE_SUSPEND is not set 145# CONFIG_HIBERNATION is not set
146CONFIG_SECCOMP=y 146CONFIG_SECCOMP=y
147CONFIG_ISA_DMA_API=y 147CONFIG_ISA_DMA_API=y
148 148
diff --git a/arch/ppc/configs/ml300_defconfig b/arch/ppc/configs/ml300_defconfig
index 4a33aca948cc..69bad91a6b65 100644
--- a/arch/ppc/configs/ml300_defconfig
+++ b/arch/ppc/configs/ml300_defconfig
@@ -148,7 +148,7 @@ CONFIG_BINFMT_ELF=y
148CONFIG_CMDLINE_BOOL=y 148CONFIG_CMDLINE_BOOL=y
149CONFIG_CMDLINE="console=ttyS0,9600" 149CONFIG_CMDLINE="console=ttyS0,9600"
150# CONFIG_PM is not set 150# CONFIG_PM is not set
151# CONFIG_SOFTWARE_SUSPEND is not set 151# CONFIG_HIBERNATION is not set
152CONFIG_SECCOMP=y 152CONFIG_SECCOMP=y
153CONFIG_ISA_DMA_API=y 153CONFIG_ISA_DMA_API=y
154 154
diff --git a/arch/ppc/configs/ml403_defconfig b/arch/ppc/configs/ml403_defconfig
index fafd2516fa51..a78896ea4560 100644
--- a/arch/ppc/configs/ml403_defconfig
+++ b/arch/ppc/configs/ml403_defconfig
@@ -149,7 +149,7 @@ CONFIG_BINFMT_ELF=y
149CONFIG_CMDLINE_BOOL=y 149CONFIG_CMDLINE_BOOL=y
150CONFIG_CMDLINE="console=ttyS0,9600" 150CONFIG_CMDLINE="console=ttyS0,9600"
151# CONFIG_PM is not set 151# CONFIG_PM is not set
152# CONFIG_SOFTWARE_SUSPEND is not set 152# CONFIG_HIBERNATION is not set
153CONFIG_SECCOMP=y 153CONFIG_SECCOMP=y
154CONFIG_ISA_DMA_API=y 154CONFIG_ISA_DMA_API=y
155 155
diff --git a/arch/ppc/configs/mpc834x_sys_defconfig b/arch/ppc/configs/mpc834x_sys_defconfig
index b96a6d6dad0e..d90c8a7e060c 100644
--- a/arch/ppc/configs/mpc834x_sys_defconfig
+++ b/arch/ppc/configs/mpc834x_sys_defconfig
@@ -130,7 +130,7 @@ CONFIG_BINFMT_ELF=y
130# CONFIG_BINFMT_MISC is not set 130# CONFIG_BINFMT_MISC is not set
131# CONFIG_CMDLINE_BOOL is not set 131# CONFIG_CMDLINE_BOOL is not set
132# CONFIG_PM is not set 132# CONFIG_PM is not set
133# CONFIG_SOFTWARE_SUSPEND is not set 133# CONFIG_HIBERNATION is not set
134CONFIG_SECCOMP=y 134CONFIG_SECCOMP=y
135CONFIG_ISA_DMA_API=y 135CONFIG_ISA_DMA_API=y
136 136
diff --git a/arch/ppc/configs/prep_defconfig b/arch/ppc/configs/prep_defconfig
index 0aa333178b2a..b7cee2d71405 100644
--- a/arch/ppc/configs/prep_defconfig
+++ b/arch/ppc/configs/prep_defconfig
@@ -166,7 +166,7 @@ CONFIG_PROC_PREPRESIDUAL=y
166CONFIG_PM=y 166CONFIG_PM=y
167# CONFIG_PM_LEGACY is not set 167# CONFIG_PM_LEGACY is not set
168# CONFIG_PM_DEBUG is not set 168# CONFIG_PM_DEBUG is not set
169CONFIG_SOFTWARE_SUSPEND=y 169CONFIG_HIBERNATION=y
170CONFIG_PM_STD_PARTITION="" 170CONFIG_PM_STD_PARTITION=""
171# CONFIG_SECCOMP is not set 171# CONFIG_SECCOMP is not set
172CONFIG_ISA_DMA_API=y 172CONFIG_ISA_DMA_API=y
diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug
index 1f130f3b6c24..a5faa3683bd6 100644
--- a/arch/sparc64/Kconfig.debug
+++ b/arch/sparc64/Kconfig.debug
@@ -29,7 +29,7 @@ config DEBUG_BOOTMEM
29 29
30config DEBUG_PAGEALLOC 30config DEBUG_PAGEALLOC
31 bool "Debug page memory allocations" 31 bool "Debug page memory allocations"
32 depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND 32 depends on DEBUG_KERNEL && !HIBERNATION
33 help 33 help
34 Unmap pages from the kernel linear mapping after free_pages(). 34 Unmap pages from the kernel linear mapping after free_pages().
35 This results in a large slowdown, but helps to find certain types 35 This results in a large slowdown, but helps to find certain types
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b7c4cd04bfc3..e64f65c9d901 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -199,7 +199,7 @@ CONFIG_GENERIC_PENDING_IRQ=y
199CONFIG_PM=y 199CONFIG_PM=y
200# CONFIG_PM_LEGACY is not set 200# CONFIG_PM_LEGACY is not set
201# CONFIG_PM_DEBUG is not set 201# CONFIG_PM_DEBUG is not set
202CONFIG_SOFTWARE_SUSPEND=y 202CONFIG_HIBERNATION=y
203CONFIG_PM_STD_PARTITION="" 203CONFIG_PM_STD_PARTITION=""
204CONFIG_SUSPEND_SMP=y 204CONFIG_SUSPEND_SMP=y
205 205
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 47f1dc30bf56..d1d18c1ea0f4 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -26,7 +26,7 @@ obj-y += io_apic.o mpparse.o genapic.o genapic_flat.o
26obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o 26obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o
27obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 27obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
28obj-$(CONFIG_PM) += suspend.o 28obj-$(CONFIG_PM) += suspend.o
29obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o 29obj-$(CONFIG_HIBERNATION) += suspend_asm.o
30obj-$(CONFIG_CPU_FREQ) += cpufreq/ 30obj-$(CONFIG_CPU_FREQ) += cpufreq/
31obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 31obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
32obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o 32obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o
diff --git a/arch/x86_64/kernel/suspend.c b/arch/x86_64/kernel/suspend.c
index ea83a9f91965..573c0a6e0ac6 100644
--- a/arch/x86_64/kernel/suspend.c
+++ b/arch/x86_64/kernel/suspend.c
@@ -146,7 +146,7 @@ void fix_processor_context(void)
146 146
147} 147}
148 148
149#ifdef CONFIG_SOFTWARE_SUSPEND 149#ifdef CONFIG_HIBERNATION
150/* Defined in arch/x86_64/kernel/suspend_asm.S */ 150/* Defined in arch/x86_64/kernel/suspend_asm.S */
151extern int restore_image(void); 151extern int restore_image(void);
152 152
@@ -236,4 +236,4 @@ int pfn_is_nosave(unsigned long pfn)
236 unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT; 236 unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT;
237 return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn); 237 return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn);
238} 238}
239#endif /* CONFIG_SOFTWARE_SUSPEND */ 239#endif /* CONFIG_HIBERNATION */
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index ab21357c5c7b..b4e94c893c81 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -202,7 +202,7 @@ static struct pm_ops acpi_pm_ops = {
202 .finish = acpi_pm_finish, 202 .finish = acpi_pm_finish,
203}; 203};
204 204
205#ifdef CONFIG_SOFTWARE_SUSPEND 205#ifdef CONFIG_HIBERNATION
206static int acpi_hibernation_prepare(void) 206static int acpi_hibernation_prepare(void)
207{ 207{
208 return acpi_sleep_prepare(ACPI_STATE_S4); 208 return acpi_sleep_prepare(ACPI_STATE_S4);
@@ -254,7 +254,7 @@ static struct hibernation_ops acpi_hibernation_ops = {
254 .pre_restore = acpi_hibernation_pre_restore, 254 .pre_restore = acpi_hibernation_pre_restore,
255 .restore_cleanup = acpi_hibernation_restore_cleanup, 255 .restore_cleanup = acpi_hibernation_restore_cleanup,
256}; 256};
257#endif /* CONFIG_SOFTWARE_SUSPEND */ 257#endif /* CONFIG_HIBERNATION */
258 258
259/** 259/**
260 * acpi_pm_device_sleep_state - return preferred power state of ACPI device 260 * acpi_pm_device_sleep_state - return preferred power state of ACPI device
@@ -374,7 +374,7 @@ int __init acpi_sleep_init(void)
374 374
375 pm_set_ops(&acpi_pm_ops); 375 pm_set_ops(&acpi_pm_ops);
376 376
377#ifdef CONFIG_SOFTWARE_SUSPEND 377#ifdef CONFIG_HIBERNATION
378 if (sleep_states[ACPI_STATE_S4]) 378 if (sleep_states[ACPI_STATE_S4])
379 hibernation_set_ops(&acpi_hibernation_ops); 379 hibernation_set_ops(&acpi_hibernation_ops);
380#else 380#else
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index ed58e1168aed..1b7bbb5ba623 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -66,7 +66,7 @@ acpi_system_write_sleep(struct file *file,
66 goto Done; 66 goto Done;
67 } 67 }
68 state = simple_strtoul(str, NULL, 0); 68 state = simple_strtoul(str, NULL, 0);
69#ifdef CONFIG_SOFTWARE_SUSPEND 69#ifdef CONFIG_HIBERNATION
70 if (state == 4) { 70 if (state == 4) {
71 error = hibernate(); 71 error = hibernate();
72 goto Done; 72 goto Done;
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 3c3f2ebf3fc9..503ffec2ce07 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -352,7 +352,7 @@ static void tps65010_interrupt(struct tps65010 *tps)
352 /* REVISIT: this might need its own workqueue 352 /* REVISIT: this might need its own workqueue
353 * plus tweaks including deadlock avoidance ... 353 * plus tweaks including deadlock avoidance ...
354 * also needs to get error handling and probably 354 * also needs to get error handling and probably
355 * an #ifdef CONFIG_SOFTWARE_SUSPEND 355 * an #ifdef CONFIG_HIBERNATION
356 */ 356 */
357 hibernate(); 357 hibernate();
358#endif 358#endif
diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index 43114c824608..cf67dbb1db79 100644
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -47,7 +47,7 @@ extern void e820_register_memory(void);
47extern void limit_regions(unsigned long long size); 47extern void limit_regions(unsigned long long size);
48extern void print_memory_map(char *who); 48extern void print_memory_map(char *who);
49 49
50#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND) 50#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)
51extern void e820_mark_nosave_regions(void); 51extern void e820_mark_nosave_regions(void);
52#else 52#else
53static inline void e820_mark_nosave_regions(void) 53static inline void e820_mark_nosave_regions(void)
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 618f93c32b7f..d16c1b85d512 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -55,7 +55,7 @@ struct hibernation_ops {
55}; 55};
56 56
57#ifdef CONFIG_PM 57#ifdef CONFIG_PM
58#ifdef CONFIG_SOFTWARE_SUSPEND 58#ifdef CONFIG_HIBERNATION
59/* kernel/power/snapshot.c */ 59/* kernel/power/snapshot.c */
60extern void __register_nosave_region(unsigned long b, unsigned long e, int km); 60extern void __register_nosave_region(unsigned long b, unsigned long e, int km);
61static inline void register_nosave_region(unsigned long b, unsigned long e) 61static inline void register_nosave_region(unsigned long b, unsigned long e)
@@ -73,14 +73,14 @@ extern unsigned long get_safe_page(gfp_t gfp_mask);
73 73
74extern void hibernation_set_ops(struct hibernation_ops *ops); 74extern void hibernation_set_ops(struct hibernation_ops *ops);
75extern int hibernate(void); 75extern int hibernate(void);
76#else /* CONFIG_SOFTWARE_SUSPEND */ 76#else /* CONFIG_HIBERNATION */
77static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } 77static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
78static inline void swsusp_set_page_free(struct page *p) {} 78static inline void swsusp_set_page_free(struct page *p) {}
79static inline void swsusp_unset_page_free(struct page *p) {} 79static inline void swsusp_unset_page_free(struct page *p) {}
80 80
81static inline void hibernation_set_ops(struct hibernation_ops *ops) {} 81static inline void hibernation_set_ops(struct hibernation_ops *ops) {}
82static inline int hibernate(void) { return -ENOSYS; } 82static inline int hibernate(void) { return -ENOSYS; }
83#endif /* CONFIG_SOFTWARE_SUSPEND */ 83#endif /* CONFIG_HIBERNATION */
84 84
85void save_processor_state(void); 85void save_processor_state(void);
86void restore_processor_state(void); 86void restore_processor_state(void);
@@ -121,7 +121,7 @@ static inline int unregister_pm_notifier(struct notifier_block *nb)
121#define pm_notifier(fn, pri) do { (void)(fn); } while (0) 121#define pm_notifier(fn, pri) do { (void)(fn); } while (0)
122#endif /* CONFIG_PM */ 122#endif /* CONFIG_PM */
123 123
124#if !defined CONFIG_SOFTWARE_SUSPEND || !defined(CONFIG_PM) 124#if !defined CONFIG_HIBERNATION || !defined(CONFIG_PM)
125static inline void register_nosave_region(unsigned long b, unsigned long e) 125static inline void register_nosave_region(unsigned long b, unsigned long e)
126{ 126{
127} 127}
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
72 CAUTION: this option will cause your machine's real-time clock to be 72 CAUTION: this option will cause your machine's real-time clock to be
73 set to an invalid time after a resume. 73 set to an invalid time after a resume.
74 74
75config SOFTWARE_SUSPEND 75config HIBERNATION
76 bool "Software Suspend (Hibernation)" 76 bool "Hibernation"
77 depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)) 77 depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))
78 ---help--- 78 ---help---
79 Enable the suspend to disk (STD) functionality, which is usually 79 Enable the suspend to disk (STD) functionality, which is usually
@@ -112,7 +112,7 @@ config SOFTWARE_SUSPEND
112 112
113config PM_STD_PARTITION 113config PM_STD_PARTITION
114 string "Default resume partition" 114 string "Default resume partition"
115 depends on SOFTWARE_SUSPEND 115 depends on HIBERNATION
116 default "" 116 default ""
117 ---help--- 117 ---help---
118 The default resume partition is the partition that the suspend- 118 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
5 5
6obj-y := main.o process.o console.o 6obj-y := main.o process.o console.o
7obj-$(CONFIG_PM_LEGACY) += pm.o 7obj-$(CONFIG_PM_LEGACY) += pm.o
8obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o snapshot.o swap.o user.o 8obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o
9 9
10obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o 10obj-$(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)
292 if (pm_states[i] && valid_state(i)) 292 if (pm_states[i] && valid_state(i))
293 s += sprintf(s,"%s ", pm_states[i]); 293 s += sprintf(s,"%s ", pm_states[i]);
294 } 294 }
295#ifdef CONFIG_SOFTWARE_SUSPEND 295#ifdef CONFIG_HIBERNATION
296 s += sprintf(s, "%s\n", "disk"); 296 s += sprintf(s, "%s\n", "disk");
297#else 297#else
298 if (s != buf) 298 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 {
13 13
14 14
15 15
16#ifdef CONFIG_SOFTWARE_SUSPEND 16#ifdef CONFIG_HIBERNATION
17/* 17/*
18 * Keep some memory free so that I/O operations can succeed without paging 18 * Keep some memory free so that I/O operations can succeed without paging
19 * [Might this be more than 4 MB?] 19 * [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
954 unlock_kernel(); 954 unlock_kernel();
955 return -EINVAL; 955 return -EINVAL;
956 956
957#ifdef CONFIG_SOFTWARE_SUSPEND 957#ifdef CONFIG_HIBERNATION
958 case LINUX_REBOOT_CMD_SW_SUSPEND: 958 case LINUX_REBOOT_CMD_SW_SUSPEND:
959 { 959 {
960 int ret = hibernate(); 960 int ret = hibernate();
diff --git a/mm/Kconfig b/mm/Kconfig
index 86187221e78f..e24d348083c3 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -116,11 +116,11 @@ config SPARSEMEM_EXTREME
116config MEMORY_HOTPLUG 116config MEMORY_HOTPLUG
117 bool "Allow for memory hot-add" 117 bool "Allow for memory hot-add"
118 depends on SPARSEMEM || X86_64_ACPI_NUMA 118 depends on SPARSEMEM || X86_64_ACPI_NUMA
119 depends on HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG 119 depends on HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG
120 depends on (IA64 || X86 || PPC64 || SUPERH) 120 depends on (IA64 || X86 || PPC64 || SUPERH)
121 121
122comment "Memory hotplug is currently incompatible with Software Suspend" 122comment "Memory hotplug is currently incompatible with Software Suspend"
123 depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND 123 depends on SPARSEMEM && HOTPLUG && HIBERNATION
124 124
125config MEMORY_HOTPLUG_SPARSE 125config MEMORY_HOTPLUG_SPARSE
126 def_bool y 126 def_bool y
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 7ff0a81c7b01..f071648e1360 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -425,7 +425,7 @@ void free_swap_and_cache(swp_entry_t entry)
425 } 425 }
426} 426}
427 427
428#ifdef CONFIG_SOFTWARE_SUSPEND 428#ifdef CONFIG_HIBERNATION
429/* 429/*
430 * Find the swap type that corresponds to given device (if any). 430 * Find the swap type that corresponds to given device (if any).
431 * 431 *
@@ -951,7 +951,7 @@ sector_t map_swap_page(struct swap_info_struct *sis, pgoff_t offset)
951 } 951 }
952} 952}
953 953
954#ifdef CONFIG_SOFTWARE_SUSPEND 954#ifdef CONFIG_HIBERNATION
955/* 955/*
956 * Get the (PAGE_SIZE) block corresponding to given offset on the swapdev 956 * Get the (PAGE_SIZE) block corresponding to given offset on the swapdev
957 * corresponding to given index in swap_info (swap type). 957 * corresponding to given index in swap_info (swap type).
@@ -966,7 +966,7 @@ sector_t swapdev_block(int swap_type, pgoff_t offset)
966 sis = swap_info + swap_type; 966 sis = swap_info + swap_type;
967 return (sis->flags & SWP_WRITEOK) ? map_swap_page(sis, offset) : 0; 967 return (sis->flags & SWP_WRITEOK) ? map_swap_page(sis, offset) : 0;
968} 968}
969#endif /* CONFIG_SOFTWARE_SUSPEND */ 969#endif /* CONFIG_HIBERNATION */
970 970
971/* 971/*
972 * Free all of a swapdev's extent information 972 * Free all of a swapdev's extent information