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

Commit 70ec75c5 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'release', 'misc' and 'misc-2.6.25' into release

parents 4f4ae0d4 2fdf0741 23b168d4

Documentation/kernel-parameters.txt

+4 −2
Original line number Diff line number Diff line
@@ -147,8 +147,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			default: 0



	acpi_sleep=	[HW,ACPI] Sleep options

			Format: { s3_bios, s3_mode }

			See Documentation/power/video.txt

			Format: { s3_bios, s3_mode, s3_beep }

			See Documentation/power/video.txt for s3_bios and s3_mode.

			s3_beep is for debugging; it makes the PC's speaker beep

			as soon as the kernel's real-mode entry point is called.



	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode

			Format: { level | edge | high | low }

Documentation/power/swsusp.txt

+5 −0
Original line number Diff line number Diff line
@@ -386,6 +386,11 @@ before suspending; then remount them after resuming. 
There is a work-around for this problem.  For more information, see

Documentation/usb/persist.txt.



Q: Can I suspend-to-disk using a swap partition under LVM?



A: No. You can suspend successfully, but you'll not be able to

resume. uswsusp should be able to work with LVM. See suspend.sf.net.



Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were

compiled with the similar configuration files. Anyway I found that

suspend to disk (and resume) is much slower on 2.6.16 compared to

arch/ia64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int acpi_request_vector(u32 int_type) 
	return vector;

}



char *__acpi_map_table(unsigned long phys_addr, unsigned long size)

char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)

{

	return __va(phys_addr);

}

arch/x86/kernel/acpi/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; 
#ifdef	CONFIG_X86_64



/* rely on all ACPI tables being in the direct mapping */

char *__acpi_map_table(unsigned long phys_addr, unsigned long size)

char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)

{

	if (!phys_addr || !size)

		return NULL;
@@ -131,7 +131,7 @@ char *__acpi_map_table(unsigned long phys_addr, unsigned long size) 
 * from the fixed base.  That's why we start at FIX_IO_APIC_BASE_END and

 * count idx down while incrementing the phys address.

 */

char *__acpi_map_table(unsigned long phys, unsigned long size)

char *__init __acpi_map_table(unsigned long phys, unsigned long size)

{

	unsigned long base, offset, mapped_size;

	int idx;

drivers/acpi/hardware/hwsleep.c

+1 −1
Original line number Diff line number Diff line
@@ -286,13 +286,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) 
	}



	/*

	 * 1) Disable/Clear all GPEs

	 * 2) Enable all wakeup GPEs

	 */

	status = acpi_hw_disable_all_gpes();

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	acpi_gbl_system_awake_and_running = FALSE;



	status = acpi_hw_enable_all_wakeup_gpes();