forked from luck/tmp_suning_uos_patched
Merge branch 'acpica-release-fixes' into release-2.6.27
This commit is contained in:
commit
f54538c3a0
@ -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) {
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user