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

Commit 3067e02f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPICA: Update version to 20091112.
  ACPICA: Add additional module-level code support
  ACPICA: Deploy new create integer interface where appropriate
  ACPICA: New internal utility function to create Integer objects
  ACPICA: Add repair for predefined methods that must return sorted lists
  ACPICA: Fix possible fault if return Package objects contain NULL elements
  ACPICA: Add post-order callback to acpi_walk_namespace
  ACPICA: Change package length error message to an info message
  ACPICA: Reduce severity of predefined repair messages, Warning to Info
  ACPICA: Update version to 20091013
  ACPICA: Fix possible memory leak for Scope ASL operator
  ACPICA: Remove possibility of executing _REG methods twice
  ACPICA: Add repair for bad _MAT buffers
  ACPICA: Add repair for bad _BIF/_BIX packages
parents f71eaf68 b00eb796

arch/ia64/sn/kernel/io_acpi_init.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, 
	pcidev_match.handle = NULL;



	acpi_walk_namespace(ACPI_TYPE_DEVICE, rootbus_handle, ACPI_UINT32_MAX,

			    find_matching_device, &pcidev_match, NULL);

			    find_matching_device, NULL, &pcidev_match, NULL);



	if (!pcidev_match.handle) {

		printk(KERN_ERR

arch/x86/kernel/cpu/cpufreq/longhaul.c

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy) 


	/* Find ACPI data for processor */

	acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,

				ACPI_UINT32_MAX, &longhaul_walk_callback,

				ACPI_UINT32_MAX, &longhaul_walk_callback, NULL,

				NULL, (void *)&pr);



	/* Check ACPI support for C3 state */

drivers/acpi/acpi_memhotplug.c

+2 −2
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static int __init acpi_memory_device_init(void) 


	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,

				     ACPI_UINT32_MAX,

				     acpi_memory_register_notify_handler,

				     acpi_memory_register_notify_handler, NULL,

				     NULL, NULL);



	if (ACPI_FAILURE(status)) {
@@ -561,7 +561,7 @@ static void __exit acpi_memory_device_exit(void) 
	 */

	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,

				     ACPI_UINT32_MAX,

				     acpi_memory_deregister_notify_handler,

				     acpi_memory_deregister_notify_handler, NULL,

				     NULL, NULL);



	if (ACPI_FAILURE(status))

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o 
acpi-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \

	 nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \

	 nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \

	 nsparse.o   nspredef.o  nsrepair.o

	 nsparse.o   nspredef.o  nsrepair.o  nsrepair2.o



acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o

drivers/acpi/acpica/acmacros.h

+3 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ 
#define ACPI_ERROR_NAMESPACE(s, e)      acpi_ns_report_error (AE_INFO, s, e);

#define ACPI_ERROR_METHOD(s, n, p, e)   acpi_ns_report_method_error (AE_INFO, s, n, p, e);

#define ACPI_WARN_PREDEFINED(plist)     acpi_ut_predefined_warning plist

#define ACPI_INFO_PREDEFINED(plist)     acpi_ut_predefined_info plist



#else
@@ -349,6 +350,8 @@ 
#define ACPI_ERROR_NAMESPACE(s, e)

#define ACPI_ERROR_METHOD(s, n, p, e)

#define ACPI_WARN_PREDEFINED(plist)

#define ACPI_INFO_PREDEFINED(plist)



#endif		/* ACPI_NO_ERROR_MESSAGES */



/*