define and use LOCAL_DISTANCE and REMOTE_DISTANCE From: David Rientjes Export {LOCAL,REMOTE}_DISTANCE to x86_64 ACPI code. Signed-off-by: David Rientjes Signed-off-by: Andi Kleen --- arch/x86_64/mm/srat.c | 6 +++--- include/linux/topology.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) Index: linux/arch/x86_64/mm/srat.c =================================================================== --- linux.orig/arch/x86_64/mm/srat.c +++ linux/arch/x86_64/mm/srat.c @@ -106,9 +106,9 @@ static __init int slit_valid(struct acpi for (j = 0; j < d; j++) { u8 val = slit->entry[d*i + j]; if (i == j) { - if (val != 10) + if (val != LOCAL_DISTANCE) return 0; - } else if (val <= 10) + } else if (val <= LOCAL_DISTANCE) return 0; } } @@ -464,7 +464,7 @@ int __node_distance(int a, int b) int index; if (!acpi_slit) - return a == b ? 10 : 20; + return a == b ? LOCAL_DISTANCE : REMOTE_DISTANCE; index = acpi_slit->locality_count * node_to_pxm(a); return acpi_slit->entry[index + node_to_pxm(b)]; } Index: linux/include/linux/topology.h =================================================================== --- linux.orig/include/linux/topology.h +++ linux/include/linux/topology.h @@ -50,10 +50,10 @@ for_each_online_node(node) \ if (nr_cpus_node(node)) -#ifndef node_distance /* Conform to ACPI 2.0 SLIT distance definitions */ #define LOCAL_DISTANCE 10 #define REMOTE_DISTANCE 20 +#ifndef node_distance #define node_distance(from,to) ((from) == (to) ? LOCAL_DISTANCE : REMOTE_DISTANCE) #endif #ifndef RECLAIM_DISTANCE