korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andi Kleen 2008-08-21 08:46:25 +02:00
commit f54538c3a0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/dispatcher/dsobject.c
View File

@ -496,7 +496,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
arg = arg->common.next; arg = arg->common.next;
} }
ACPI_ERROR((AE_INFO, ACPI_WARNING((AE_INFO,
"Package List length (%X) larger than NumElements count (%X), truncated\n", "Package List length (%X) larger than NumElements count (%X), truncated\n",
i, element_count)); i, element_count));
} else if (i < element_count) { } else if (i < element_count) {

2
drivers/acpi/tables.c
View File

@ -300,6 +300,8 @@ int __init acpi_table_init(void)
static int __init acpi_parse_apic_instance(char *str) static int __init acpi_parse_apic_instance(char *str)
{ {
if (!str)
return -EINVAL;
acpi_apic_instance = simple_strtoul(str, NULL, 0); acpi_apic_instance = simple_strtoul(str, NULL, 0);