From: William Lee Irwin III Signed-off-by: Andrew Morton --- 25-akpm/include/asm-i386/topology.h | 2 +- 25-akpm/include/asm-ia64/numa.h | 2 +- 25-akpm/include/linux/topology.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN include/asm-i386/topology.h~topology-macro-safeness include/asm-i386/topology.h --- 25/include/asm-i386/topology.h~topology-macro-safeness 2004-08-30 00:07:41.737638936 -0700 +++ 25-akpm/include/asm-i386/topology.h 2004-08-30 00:07:41.744637872 -0700 @@ -67,7 +67,7 @@ static inline cpumask_t pcibus_to_cpumas } /* Node-to-Node distance */ -#define node_distance(from, to) (from != to) +#define node_distance(from, to) ((from) != (to)) /* Cross-node load balancing interval. */ #define NODE_BALANCE_RATE 100 diff -puN include/asm-ia64/numa.h~topology-macro-safeness include/asm-ia64/numa.h --- 25/include/asm-ia64/numa.h~topology-macro-safeness 2004-08-30 00:07:41.738638784 -0700 +++ 25-akpm/include/asm-ia64/numa.h 2004-08-30 00:07:41.744637872 -0700 @@ -59,7 +59,7 @@ extern struct node_cpuid_s node_cpuid[NR */ extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES]; -#define node_distance(from,to) (numa_slit[from * numnodes + to]) +#define node_distance(from,to) (numa_slit[(from) * numnodes + (to)]) extern int paddr_to_nid(unsigned long paddr); diff -puN include/linux/topology.h~topology-macro-safeness include/linux/topology.h --- 25/include/linux/topology.h~topology-macro-safeness 2004-08-30 00:07:41.740638480 -0700 +++ 25-akpm/include/linux/topology.h 2004-08-30 00:07:41.743638024 -0700 @@ -55,7 +55,7 @@ static inline int __next_node_with_cpus( for (node = 0; node < numnodes; node = __next_node_with_cpus(node)) #ifndef node_distance -#define node_distance(from,to) (from != to) +#define node_distance(from,to) ((from) != (to)) #endif #ifndef PENALTY_FOR_NODE_WITH_CPUS #define PENALTY_FOR_NODE_WITH_CPUS (1) _