powerpc/pseries: rename numa_dist_table to form2_distances

BugLink: https://bugs.launchpad.net/bugs/1952579
[ Upstream commit 0bd81274e3f1195ee7c820ef02d62f31077c42c3 ]

The name of the local variable holding the "form2" property address
conflicts with the numa_distance_table global.

This patch does 's/numa_dist_table/form2_distances/g' over the function,
which also renames numa_dist_table_length to form2_distances_length.

Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211109064900.2041386-1-npiggin@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 6f14c8fb6359d519f14f4de822fe5f772c0ba7c3..53e9901409163b03b01fac93d6bb2837027502a0 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -376,9 +376,9 @@ static void initialize_form2_numa_distance_lookup_table(void)
 {
        int i, j;
        struct device_node *root;
-       const __u8 *numa_dist_table;
+       const __u8 *form2_distances;
        const __be32 *numa_lookup_index;
-       int numa_dist_table_length;
+       int form2_distances_length;
        int max_numa_index, distance_index;
 
        if (firmware_has_feature(FW_FEATURE_OPAL))
@@ -392,20 +392,20 @@ static void initialize_form2_numa_distance_lookup_table(void)
        max_numa_index = of_read_number(&numa_lookup_index[0], 1);
 
        /* first element of the array is the size and is encode-int */
-       numa_dist_table = of_get_property(root, "ibm,numa-distance-table", NULL);
-       numa_dist_table_length = of_read_number((const __be32 *)&numa_dist_table[0], 1);
+       form2_distances = of_get_property(root, "ibm,numa-distance-table", NULL);
+       form2_distances_length = of_read_number((const __be32 *)&form2_distances[0], 1);
        /* Skip the size which is encoded int */
-       numa_dist_table += sizeof(__be32);
+       form2_distances += sizeof(__be32);
 
-       pr_debug("numa_dist_table_len = %d, numa_dist_indexes_len = %d\n",
-                numa_dist_table_length, max_numa_index);
+       pr_debug("form2_distances_len = %d, numa_dist_indexes_len = %d\n",
+                form2_distances_length, max_numa_index);
 
        for (i = 0; i < max_numa_index; i++)
                /* +1 skip the max_numa_index in the property */
                numa_id_index_table[i] = of_read_number(&numa_lookup_index[i + 1], 1);
 
 
-       if (numa_dist_table_length != max_numa_index * max_numa_index) {
+       if (form2_distances_length != max_numa_index * max_numa_index) {
                WARN(1, "Wrong NUMA distance information\n");
                /* consider everybody else just remote. */
                for (i = 0;  i < max_numa_index; i++) {
@@ -427,7 +427,7 @@ static void initialize_form2_numa_distance_lookup_table(void)
                        int nodeA = numa_id_index_table[i];
                        int nodeB = numa_id_index_table[j];
 
-                       numa_distance_table[nodeA][nodeB] = numa_dist_table[distance_index++];
+                       numa_distance_table[nodeA][nodeB] = form2_distances[distance_index++];
                        pr_debug("dist[%d][%d]=%d ", nodeA, nodeB, numa_distance_table[nodeA][nodeB]);
                }
        }