ACPI / NUMA: ia64: Parse all entries of SRAT memory affinity table

In current implementation, SRAT Memory Affinity Structure table
parsing is restricted to number of maximum memblocks allowed
(NR_NODE_MEMBLKS). However NR_NODE_MEMBLKS is defined individually
as per architecture requirements. Hence removing the restriction of
SRAT Memory Affinity Structure parsing in ACPI driver code and
let architecture code check for allowed memblocks count.

This check is already there in the x86 code, so do the same on ia64.

Signed-off-by: Ganapatrao Kulkarni <[email protected]>
Acked-by: Tony Luck <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 1d29b2f8726bbaadc24c91f825661f45d68b4c57..1dacbf5e9e09a5a71f9e21bd5fd88eed8199e823 100644 (file)
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -504,6 +504,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
        if (!(ma->flags & ACPI_SRAT_MEM_ENABLED))
                return -1;
 
+       if (num_node_memblks >= NR_NODE_MEMBLKS) {
+               pr_err("NUMA: too many memblk ranges\n");
+               return -EINVAL;
+       }
+
        /* record this node in proximity bitmap */
        pxm_bit_set(pxm);
 

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 917f1cc0fda4c2f6c8cc64f7b90dc252a264ac7a..8ccaae3550d284be2070f7e06dd6794c5bc8c5b3 100644 (file)
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -460,8 +460,7 @@ int __init acpi_numa_init(void)
                                        srat_proc, ARRAY_SIZE(srat_proc), 0);
 
                cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
-                                           acpi_parse_memory_affinity,
-                                           NR_NODE_MEMBLKS);
+                                           acpi_parse_memory_affinity, 0);
        }
 
        /* SLIT: System Locality Information Table */