diff -Napur -X /home/jbarnes/dontdiff linux-2.6.9-rc1/include/linux/sched.h linux-2.6.9-rc1-mm5/include/linux/sched.h
--- linux-2.6.9-rc1/include/linux/sched.h	2004-09-15 17:06:40.000000000 -0700
+++ linux-2.6.9-rc1-mm5/include/linux/sched.h	2004-09-13 09:50:57.000000000 -0700
@@ -528,7 +528,7 @@ extern void cpu_attach_domain(struct sch
 	.nr_balance_failed	= 0,			\
 }
 
-#ifdef CONFIG_NUMA
+#if defined(CONFIG_NUMA) && !defined(SD_NODE_INIT)
 #define SD_NODE_INIT (struct sched_domain) {		\
 	.span			= CPU_MASK_NONE,	\
 	.parent			= NULL,			\