Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0cb1a19 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c8dca5d

arch/i386/Kconfig.debug

+2 −2
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ config DEBUG_STACK_USAGE 
	  This option will slow down process creation somewhat.



comment "Page alloc debug is incompatible with Software Suspend on i386"

	depends on DEBUG_KERNEL && SOFTWARE_SUSPEND

	depends on DEBUG_KERNEL && HIBERNATION



config DEBUG_PAGEALLOC

	bool "Debug page memory allocations"

	depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND && !HUGETLBFS

	depends on DEBUG_KERNEL && !HIBERNATION && !HUGETLBFS

	help

	  Unmap pages from the kernel linear mapping after free_pages().

	  This results in a large slowdown, but helps to find certain types

arch/i386/kernel/e820.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int __init request_standard_resources(void) 


subsys_initcall(request_standard_resources);



#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND)

#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)

/**

 * e820_mark_nosave_regions - Find the ranges of physical addresses that do not

 * correspond to e820 RAM areas and mark the corresponding pages as nosave for

arch/i386/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static void __init pagetable_init (void) 
	paravirt_pagetable_setup_done(pgd_base);

}



#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI)

#if defined(CONFIG_HIBERNATION) || defined(CONFIG_ACPI)

/*

 * Swap suspend & friends need this for resume because things like the intel-agp

 * driver might have split up a kernel 4MB mapping.

arch/i386/power/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_PM)		+= cpu.o

obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o suspend.o
 
obj-$(CONFIG_HIBERNATION)	+= swsusp.o suspend.o

arch/powerpc/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ config DEBUG_STACK_USAGE 


config DEBUG_PAGEALLOC

        bool "Debug page memory allocations"

        depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND

        depends on DEBUG_KERNEL && !HIBERNATION

        help

          Unmap pages from the kernel linear mapping after free_pages().

          This results in a large slowdown, but helps to find certain types