Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 mm change from Ingo Molnar:
 "A micro-optimization for acpi_numa_slit_init()"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Avoid duplicated pxm_to_node() calls

diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index 1953e9c..66338a6 100644 (file)
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -52,12 +52,18 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
        int i, j;
 
        for (i = 0; i < slit->locality_count; i++) {
-               if (pxm_to_node(i) == NUMA_NO_NODE)
+               const int from_node = pxm_to_node(i);
+
+               if (from_node == NUMA_NO_NODE)
                        continue;
+
                for (j = 0; j < slit->locality_count; j++) {
-                       if (pxm_to_node(j) == NUMA_NO_NODE)
+                       const int to_node = pxm_to_node(j);
+
+                       if (to_node == NUMA_NO_NODE)
                                continue;
-                       numa_set_distance(pxm_to_node(i), pxm_to_node(j),
+
+                       numa_set_distance(from_node, to_node,
                                slit->entry[slit->locality_count * i + j]);
                }
        }