Commit da547d77 authored by Len Brown's avatar Len Brown
Browse files

Merge trivial low-risk suspend hotkey bugzilla-5918 into release

parents ef7d1b24 5b9c9bf6 df6fd319 4e6e6504 5672bde6 16a74744

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -889,6 +889,12 @@ M: rdunlap@xenotime.net 
T:	git http://tali.admingilde.org/git/linux-docbook.git

S:	Maintained



DOCKING STATION DRIVER

P:	Kristen Carlson Accardi

M:	kristen.c.accardi@intel.com

L:	linux-acpi@vger.kernel.org

S:	Maintained



DOUBLETALK DRIVER

P:	James R. Van Zandt

M:	jrv@vanzandt.mv.com

arch/i386/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static inline int gsi_irq_sharing(int gsi) { return gsi; } 


#define BAD_MADT_ENTRY(entry, end) (					    \

		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \

		((acpi_table_entry_header *)entry)->length != sizeof(*entry))

		((acpi_table_entry_header *)entry)->length < sizeof(*entry))



#define PREFIX			"ACPI: "

arch/i386/kernel/acpi/wakeup.S

+4 −1
Original line number Diff line number Diff line
@@ -292,7 +292,10 @@ ENTRY(do_suspend_lowlevel) 
	pushl	$3

	call	acpi_enter_sleep_state

	addl	$4, %esp

	ret



#	In case of S3 failure, we'll emerge here.  Jump

# 	to ret_point to recover

	jmp	ret_point

	.p2align 4,,7

ret_point:

	call	restore_registers

arch/ia64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 


#define BAD_MADT_ENTRY(entry, end) (                                        \

		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \

		((acpi_table_entry_header *)entry)->length != sizeof(*entry))

		((acpi_table_entry_header *)entry)->length < sizeof(*entry))



#define PREFIX			"ACPI: "

drivers/acpi/ac.c

+2 −0
Original line number Diff line number Diff line
@@ -285,6 +285,8 @@ static int __init acpi_ac_init(void) 
{

	int result;



	if (acpi_disabled)

		return -ENODEV;



	acpi_ac_dir = acpi_lock_ac_dir();

	if (!acpi_ac_dir)