Messages in this thread Patch in this message | | | Date | Mon, 13 Sep 2004 06:12:54 -0700 (PDT) | From | Paul Jackson <> | Subject | [Patch] Fix sched make domain setup overridable |
| |
Builds of 2.6.9-rc1-mm5 ia64 NUMA configs fail, with many complaints that SD_NODE_INIT is defined twice, in asm/processor.h and linux/sched.h.
I guess that the preprocessor conditionals were wrong when Nick added the per-arch override ability again of SD_NODE_INIT were wrong. At least this change lets me rebuild ia64 again.
Someone with more clues in this than I should check this.
Signed-off-by: Paul Jackson <pj@sgi.com>
Index: 2.6.9-rc1-mm5/include/linux/sched.h =================================================================== --- 2.6.9-rc1-mm5.orig/include/linux/sched.h 2004-09-13 04:20:41.000000000 -0700 +++ 2.6.9-rc1-mm5/include/linux/sched.h 2004-09-13 04:51:49.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, \ -- I won't rest till it's the best ... Programmer, Linux Scalability Paul Jackson <pj@sgi.com> 1.650.933.1373 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |