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

Commit 673d5b43 authored by Len Brown's avatar Len Brown Committed by Linus Torvalds
Browse files

ACPI: restore CONFIG_ACPI_SLEEP 



Restore the 2.6.22 CONFIG_ACPI_SLEEP build option, but now shadowing the
new CONFIG_PM_SLEEP option.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
[ Modified to work with the PM config setup changes. ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 296699de

arch/i386/kernel/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ obj-$(CONFIG_ACPI) += boot.o 
ifneq ($(CONFIG_PCI),)

obj-$(CONFIG_X86_IO_APIC)	+= earlyquirk.o

endif

obj-$(CONFIG_ACPI)		+= sleep.o wakeup.o

obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup.o



ifneq ($(CONFIG_ACPI_PROCESSOR),)

obj-y				+= cstate.o processor.o

arch/i386/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ void __init setup_bootmem_allocator(void) 
	 */

	reserve_bootmem(PAGE_SIZE, PAGE_SIZE);

#endif

#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI_SLEEP

	/*

	 * Reserve low memory region for sleep support.

	 */

arch/x86_64/kernel/acpi/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y			:= boot.o

boot-y			:= ../../../i386/kernel/acpi/boot.o

obj-y			+= sleep.o wakeup.o

obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup.o



ifneq ($(CONFIG_ACPI_PROCESSOR),)

obj-y			+= processor.o

arch/x86_64/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ ident_complete: 
	addq	%rbp, trampoline_level4_pgt + 0(%rip)

	addq	%rbp, trampoline_level4_pgt + (511*8)(%rip)

#endif

#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI_SLEEP

	addq	%rbp, wakeup_level4_pgt + 0(%rip)

	addq	%rbp, wakeup_level4_pgt + (511*8)(%rip)

#endif

arch/x86_64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ void __init setup_arch(char **cmdline_p) 
	reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, 2*PAGE_SIZE);

#endif



#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI_SLEEP

       /*

        * Reserve low memory region for sleep support.

        */