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

Commit f54538c3 authored by Andi Kleen's avatar Andi Kleen
Browse files

Merge branch 'acpica-release-fixes' into release-2.6.27

parents f3853863 f0df2d6b

drivers/acpi/dispatcher/dsobject.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state, 
			arg = arg->common.next;

		}



		ACPI_ERROR((AE_INFO,

		ACPI_WARNING((AE_INFO,

			    "Package List length (%X) larger than NumElements count (%X), truncated\n",

			    i, element_count));

	} else if (i < element_count) {

drivers/acpi/tables.c

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ int __init acpi_table_init(void) 


static int __init acpi_parse_apic_instance(char *str)

{

	if (!str)

		return -EINVAL;



	acpi_apic_instance = simple_strtoul(str, NULL, 0);