diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/topology.h | 3 | ||||
| -rw-r--r-- | include/linux/topology.h | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h index d2c836023a07..efd38639e12d 100644 --- a/include/asm-i386/topology.h +++ b/include/asm-i386/topology.h @@ -66,9 +66,6 @@ static inline cpumask_t pcibus_to_cpumask(int bus) return node_to_cpumask(mp_bus_id_to_node[bus]); } -/* Node-to-Node distance */ -#define node_distance(from, to) ((from) != (to)) - /* sched_domains SD_NODE_INIT for NUMAQ machines */ #define SD_NODE_INIT (struct sched_domain) { \ .span = CPU_MASK_NONE, \ diff --git a/include/linux/topology.h b/include/linux/topology.h index 10df2542653b..1206d5a983a9 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -55,7 +55,10 @@ static inline int __next_node_with_cpus(int node) for (node = 0; node < numnodes; node = __next_node_with_cpus(node)) #ifndef node_distance -#define node_distance(from,to) ((from) != (to)) +/* Conform to ACPI 2.0 SLIT distance definitions */ +#define LOCAL_DISTANCE 10 +#define REMOTE_DISTANCE 20 +#define node_distance(from,to) ((from) == (to) ? LOCAL_DISTANCE : REMOTE_DISTANCE) #endif #ifndef PENALTY_FOR_NODE_WITH_CPUS #define PENALTY_FOR_NODE_WITH_CPUS (1) |