diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/numa.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 5eb25eb3ea48..3b5c3189fd99 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
@@ -274,7 +274,7 @@ acpi_table_parse_srat(enum acpi_srat_type id, | |||
274 | 274 | ||
275 | int __init acpi_numa_init(void) | 275 | int __init acpi_numa_init(void) |
276 | { | 276 | { |
277 | int ret = 0; | 277 | int cnt = 0; |
278 | 278 | ||
279 | /* | 279 | /* |
280 | * Should not limit number with cpu num that is from NR_CPUS or nr_cpus= | 280 | * Should not limit number with cpu num that is from NR_CPUS or nr_cpus= |
@@ -288,7 +288,7 @@ int __init acpi_numa_init(void) | |||
288 | acpi_parse_x2apic_affinity, 0); | 288 | acpi_parse_x2apic_affinity, 0); |
289 | acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY, | 289 | acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY, |
290 | acpi_parse_processor_affinity, 0); | 290 | acpi_parse_processor_affinity, 0); |
291 | ret = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, | 291 | cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, |
292 | acpi_parse_memory_affinity, | 292 | acpi_parse_memory_affinity, |
293 | NR_NODE_MEMBLKS); | 293 | NR_NODE_MEMBLKS); |
294 | } | 294 | } |
@@ -297,7 +297,10 @@ int __init acpi_numa_init(void) | |||
297 | acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit); | 297 | acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit); |
298 | 298 | ||
299 | acpi_numa_arch_fixup(); | 299 | acpi_numa_arch_fixup(); |
300 | return ret; | 300 | |
301 | if (cnt <= 0) | ||
302 | return cnt ?: -ENOENT; | ||
303 | return 0; | ||
301 | } | 304 | } |
302 | 305 | ||
303 | int acpi_get_pxm(acpi_handle h) | 306 | int acpi_get_pxm(acpi_handle h) |