Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
  [IA64] fix bootmem regression on Altix

1 files changed, 0 insertions, 5 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 9e19287f3359..740fb409e5bb 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -7948,11 +7948,6 @@ void __init sched_init_smp(void)
 #else
 void __init sched_init_smp(void)
 {
-#if defined(CONFIG_NUMA)
-        sched_group_nodes_bycpu = kzalloc(nr_cpu_ids * sizeof(void **),
-                                                                GFP_KERNEL);
-        BUG_ON(sched_group_nodes_bycpu == NULL);
-#endif
         sched_init_granularity();
 }
 #endif /* CONFIG_SMP */