diff options
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 6f38b6120d9..440578850ae 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -497,7 +497,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) | |||
497 | srat_num_cpus++; | 497 | srat_num_cpus++; |
498 | } | 498 | } |
499 | 499 | ||
500 | void __init | 500 | int __init |
501 | acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) | 501 | acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) |
502 | { | 502 | { |
503 | unsigned long paddr, size; | 503 | unsigned long paddr, size; |
@@ -512,7 +512,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) | |||
512 | 512 | ||
513 | /* Ignore disabled entries */ | 513 | /* Ignore disabled entries */ |
514 | if (!(ma->flags & ACPI_SRAT_MEM_ENABLED)) | 514 | if (!(ma->flags & ACPI_SRAT_MEM_ENABLED)) |
515 | return; | 515 | return -1; |
516 | 516 | ||
517 | /* record this node in proximity bitmap */ | 517 | /* record this node in proximity bitmap */ |
518 | pxm_bit_set(pxm); | 518 | pxm_bit_set(pxm); |
@@ -531,6 +531,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) | |||
531 | p->size = size; | 531 | p->size = size; |
532 | p->nid = pxm; | 532 | p->nid = pxm; |
533 | num_node_memblks++; | 533 | num_node_memblks++; |
534 | return 0; | ||
534 | } | 535 | } |
535 | 536 | ||
536 | void __init acpi_numa_arch_fixup(void) | 537 | void __init acpi_numa_arch_fixup(void) |