From 485171a10fad83416c7154fc8d7d0c66488cbbaf Mon Sep 17 00:00:00 2001
From: Srivatsa Vaddagiri <vatsa@in.ibm.com>
Date: Tue, 27 Jun 2006 02:54:39 -0700
Subject: [PATCH] --- yaml --- r: 30798 b: refs/heads/master c:
 d3a5aa9858cc9cecc3aadac7311d376c7c9e101a h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 02133bd6df70..ed7e74ffbb61 100644
--- 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
index 77a2ec55ef7d..e93c75ffdc88 100644
--- 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;