---

yaml --- r: 30798 b: refs/heads/master c: d3a5aa9 h: refs/heads/master v: v3
git-mirror · Jun 28, 2006 · 485171a · 485171a
1 parent be811a5
commit 485171a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51888ca25a03125e742ef84d4ddfd74e139707a0
+refs/heads/master: d3a5aa9858cc9cecc3aadac7311d376c7c9e101a
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -5880,7 +5880,7 @@ static int build_sched_domains(const cpumask_t *cpu_map)
 	 * Allocate the per-node list of sched groups
 	 */
 	sched_group_nodes = kzalloc(sizeof(struct sched_group*)*MAX_NUMNODES,
-					   GFP_ATOMIC);
+					   GFP_KERNEL);
 	if (!sched_group_nodes) {
 		printk(KERN_WARNING "Can not alloc sched group node list\n");
 		return -ENOMEM;