On Mon, 5 Oct 2009, Lee Schermerhorn wrote: > Index: linux-2.6.31-mmotm-090925-1435/arch/ia64/include/asm/numa.h > =================================================================== > --- linux-2.6.31-mmotm-090925-1435.orig/arch/ia64/include/asm/numa.h 2009-09-30 15:04:40.000000000 -0400 > +++ linux-2.6.31-mmotm-090925-1435/arch/ia64/include/asm/numa.h 2009-09-30 15:05:19.000000000 -0400 > @@ -22,8 +22,6 @@ > > #include <asm/mmzone.h> > > -#define NUMA_NO_NODE -1 > - > extern u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned; > extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; > extern pg_data_t *pgdat_list[MAX_NUMNODES]; > Index: linux-2.6.31-mmotm-090925-1435/arch/x86/include/asm/topology.h > =================================================================== > --- linux-2.6.31-mmotm-090925-1435.orig/arch/x86/include/asm/topology.h 2009-09-30 15:04:40.000000000 -0400 > +++ linux-2.6.31-mmotm-090925-1435/arch/x86/include/asm/topology.h 2009-09-30 15:05:19.000000000 -0400 > @@ -35,11 +35,10 @@ > # endif > #endif > > -/* Node not present */ > -#define NUMA_NO_NODE (-1) > - > #ifdef CONFIG_NUMA > #include <linux/cpumask.h> > +#include <linux/numa.h> > + > #include <asm/mpspec.h> > > #ifdef CONFIG_X86_32 This could get nasty later because this is now only defining NUMA_NO_NODE for CONFIG_NUMA yet it's used in generic hugetlb code that you add in patch 7 that isn't dependent on that configuration. It doesn't cause a compile error at this time, probably because some other header in mm/hugetlb.c is including linux/numa.h indirectly. I'd err on the side of caution, however, and move the #include here out from under #ifdef CONFIG_NUMA to avoid that header file dependency. -- To unsubscribe from this list: send the line "unsubscribe linux-numa" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
