diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 09:50:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 09:50:01 -0700 |
| commit | 1694f0bb8f04837f5232f35051f40eefc4ad5402 (patch) | |
| tree | c4c67df4ba0bbacc514530c3385a4a9a8f2701db | |
| parent | f27a15d24670d143f2271a199202d72b6c4fe107 (diff) | |
| parent | ba6a328f7dfc95b20df5e0eb33c698187e997190 (diff) | |
| download | linux-1694f0bb8f04837f5232f35051f40eefc4ad5402.tar.gz | |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
| -rw-r--r-- | arch/x86/mm/srat.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index 1953e9c9391aec..66338a60aa6ef9 100644 --- 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]); } } |