Re: 2.6.8-rc2-mm1

[Jesse Barnes <jbarnes@engr.sgi.com>]

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

On Wednesday, July 28, 2004 2:04 am, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc2/2.6
>.8-rc2-mm1/

sd->groups isn't initialized this early (I know because I ran into this when I 
first tried to merge Suresh's patch too).  You've already got the real fix in 
your tree, you just need this little bit torn out.

Thanks,
Jesse

[-- Attachment #2: sched-merge-fix.patch --]
[-- Type: text/plain, Size: 559 bytes --]

diff -Napur -X /home/jbarnes/dontdiff linux-2.6.8-rc2-mm1.orig/kernel/sched.c linux-2.6.8-rc2-mm1/kernel/sched.c
--- linux-2.6.8-rc2-mm1.orig/kernel/sched.c	2004-07-28 09:36:36.000000000 -0700
+++ linux-2.6.8-rc2-mm1/kernel/sched.c	2004-07-28 09:34:45.000000000 -0700
@@ -3770,8 +3770,6 @@ __init static void arch_init_sched_domai
 		cpumask_t nodemask = node_to_cpumask(cpu_to_node(i));
 
 #ifdef CONFIG_NUMA
-		if (i != first_cpu(sd->groups->cpumask))
-			continue;
 		sd = &per_cpu(node_domains, i);
 		group = cpu_to_node_group(i);
 		*sd = SD_NODE_INIT;