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

Commit 37c70d0d 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: IA64: fix %ll build warnings
  ACPI: IA64: fix allnoconfig build
  ACPI: Only use IPI on known broken machines (AMD, Dothan/BaniasPentium M)
  ACPI: ibm-acpi: allow module to load when acpi notifiers can't be set (v2)
  ACPI: parse 2nd MADT by default
  ACPICA: revert "acpi_serialize" changes
  sony-laptop: MAINTAINERS fix entry, add L: and W:
  ACPI: resolve HP nx6125 S3 immediate wakeup regression
  ACPI: Add support to parse 2nd MADT
parents 7f52a3af cddece4b

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -138,6 +138,12 @@ and is between 256 and 4096 characters. It is defined in the file 


			See also Documentation/pm.txt, pci=noacpi



	acpi_apic_instance=	[ACPI, IOAPIC]

			Format: <int>

			2: use 2nd APIC table, if available

			1,0: use 1st APIC table

			default: 2



	acpi_sleep=	[HW,ACPI] Sleep options

			Format: { s3_bios, s3_mode }

			See Documentation/power/video.txt

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -3066,11 +3066,10 @@ L: netdev@vger.kernel.org 
S:	Maintained



SONY VAIO CONTROL DEVICE DRIVER

P:	Stelian Pop

M:	stelian@popies.net

P:	Mattia Dongili

M:	malattia@linux.it

W:	http://popies.net/sonypi/

L:	linux-acpi@vger.kernel.org

W:	http://www.linux.it/~malattia/wiki/index.php/Sony_drivers

S:	Maintained



SOUND

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config IA64 
	bool

	select PCI if (!IA64_HP_SIM)

	select ACPI if (!IA64_HP_SIM)

	select PM if (!IA64_HP_SIM)

	default y

	help

	  The Itanium Processor Family is Intel's 64-bit successor to

drivers/acpi/events/evmisc.c

+6 −2
Original line number Diff line number Diff line
@@ -196,11 +196,15 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node, 
		notify_info->notify.value = (u16) notify_value;

		notify_info->notify.handler_obj = handler_obj;



		acpi_ex_relinquish_interpreter();

		acpi_ex_exit_interpreter();



		acpi_ev_notify_dispatch(notify_info);



		acpi_ex_reacquire_interpreter();

		status = acpi_ex_enter_interpreter();

		if (ACPI_FAILURE(status)) {

			return_ACPI_STATUS(status);

		}



	}



	if (!handler_obj) {

drivers/acpi/events/evregion.c

+11 −4
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, 
			       u32 bit_width, acpi_integer * value)

{

	acpi_status status;

	acpi_status status2;

	acpi_adr_space_handler handler;

	acpi_adr_space_setup region_setup;

	union acpi_operand_object *handler_desc;
@@ -344,7 +345,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, 
		 * setup will potentially execute control methods

		 * (e.g., _REG method for this region)

		 */

		acpi_ex_relinquish_interpreter();

		acpi_ex_exit_interpreter();



		status = region_setup(region_obj, ACPI_REGION_ACTIVATE,

				      handler_desc->address_space.context,
@@ -352,7 +353,10 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, 


		/* Re-enter the interpreter */



		acpi_ex_reacquire_interpreter();

		status2 = acpi_ex_enter_interpreter();

		if (ACPI_FAILURE(status2)) {

			return_ACPI_STATUS(status2);

		}



		/* Check for failure of the Region Setup */
@@ -405,7 +409,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, 
		 * exit the interpreter because the handler *might* block -- we don't

		 * know what it will do, so we can't hold the lock on the intepreter.

		 */

		acpi_ex_relinquish_interpreter();

		acpi_ex_exit_interpreter();

	}



	/* Call the handler */
@@ -426,7 +430,10 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, 
		 * We just returned from a non-default handler, we must re-enter the

		 * interpreter

		 */

		acpi_ex_reacquire_interpreter();

		status2 = acpi_ex_enter_interpreter();

		if (ACPI_FAILURE(status2)) {

			return_ACPI_STATUS(status2);

		}

	}



	return_ACPI_STATUS(status);