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

Commit a4fb2122 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: Kconfig: remove CONFIG_ACPI_SLEEP from source
  ACPI: quiet ACPI Exceptions due to no _PTC or _TSS
  ACPI: Remove references to ACPI_STATE_S2 from acpi_pm_enter
  ACPI: Kconfig: always enable CONFIG_ACPI_SLEEP on X86
  ACPI: Kconfig: fold /proc/acpi/sleep under CONFIG_ACPI_PROCFS
  ACPI: Kconfig: CONFIG_ACPI_PROCFS now defaults to N
  ACPI: autoload modules - Create __mod_acpi_device_table symbol for all ACPI drivers
  ACPI: autoload modules - Create ACPI alias interface
  ACPI: autoload modules - ACPICA modifications
  ACPI: asus-laptop: Fix failure exits
  ACPI: fix oops due to typo in new throttling code
  ACPI: ignore _PSx method for hotplugable PCI devices
  ACPI: Use ACPI methods to select PCI device suspend state
  ACPI, PNP: hook ACPI D-state to PNP suspend/resume
  ACPI: Add acpi_pm_device_sleep_state helper routine
  ACPI: Implement the set_target() callback from pm_ops
parents bc72450a 323ef30a

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)	+= sleep.o wakeup.o

obj-$(CONFIG_ACPI)		+= 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_SLEEP

#ifdef CONFIG_ACPI

	/*

	 * Reserve low memory region for sleep support.

	 */

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_SLEEP)

#if defined(CONFIG_SOFTWARE_SUSPEND) || 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/ia64/kernel/acpi.c

+19 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ EXPORT_SYMBOL(pm_power_off); 
unsigned int acpi_cpei_override;

unsigned int acpi_cpei_phys_cpuid;



unsigned long acpi_wakeup_address = 0;



const char __init *

acpi_get_sysname(void)

{
@@ -986,4 +988,21 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base) 


EXPORT_SYMBOL(acpi_unregister_ioapic);



/*

 * acpi_save_state_mem() - save kernel state

 *

 * TBD when when IA64 starts to support suspend...

 */

int acpi_save_state_mem(void) { return 0; } 



/*

 * acpi_restore_state()

 */

void acpi_restore_state_mem(void) {}



/*

 * do_suspend_lowlevel()

 */

void do_suspend_lowlevel(void) {}



#endif				/* CONFIG_ACPI */

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-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup.o

obj-y			+= sleep.o wakeup.o



ifneq ($(CONFIG_ACPI_PROCESSOR),)

obj-y			+= processor.o