diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:41:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:41:54 +0200 |
| commit | 98d350cf7ae077eb8083ccc7c1bfc838344ac590 (patch) | |
| tree | dfee7af0eff981b941db6bdbd1d5f039f9f85407 /drivers/acpi/tables.c | |
| parent | a10d60c08cc3bbea9195e2b36440f557373623eb (diff) | |
| parent | 0bdb3ccd02509a4380d54efd85effc6a9902d4fd (diff) | |
| download | talos-obmc-linux-98d350cf7ae077eb8083ccc7c1bfc838344ac590.tar.gz talos-obmc-linux-98d350cf7ae077eb8083ccc7c1bfc838344ac590.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/tables.c')
| -rw-r--r-- | drivers/acpi/tables.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 05550ba44d32..6d5a6cda0734 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -360,7 +360,8 @@ static int __init acpi_parse_apic_instance(char *str) if (!str) return -EINVAL; - acpi_apic_instance = simple_strtoul(str, NULL, 0); + if (kstrtoint(str, 0, &acpi_apic_instance)) + return -EINVAL; pr_notice("Shall use APIC/MADT table %d\n", acpi_apic_instance); |
