From 472613b961affef0c73f1c797993678312e7c666 Mon Sep 17 00:00:00 2001
From: Russ Anderson <rja@sgi.com>
Date: Thu, 24 Apr 2008 13:16:59 -0500
Subject: [IA64] fix bootmem regression on Altix

A recent change prevents SGI Altix from booting.
This patch fixes the problem.

The regresson was introduced in commit 434d53b00d6bb7be0a1d3dcc0d0d5df6c042e164

Signed-off-by: Russ Anderson <rja@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/kernel/sched.c b/kernel/sched.c
index 0014b03..09ca69b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8128,7 +8128,7 @@ void __init sched_init(void)
 	 * we use alloc_bootmem().
 	 */
 	if (alloc_size) {
-		ptr = (unsigned long)alloc_bootmem_low(alloc_size);
+		ptr = (unsigned long)alloc_bootmem(alloc_size);
 
 #ifdef CONFIG_FAIR_GROUP_SCHED
 		init_task_group.se = (struct sched_entity **)ptr;
-- 
cgit v0.10.2


From 03970f065d9b4b156d0e879f82989440f7045396 Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Tue, 22 Apr 2008 10:04:26 -0700
Subject: [PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n

Regression caused by 434d53b00d6bb7be0a1d3dcc0d0d5df6c042e164

Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/kernel/sched.c b/kernel/sched.c
index 09ca69b..781870d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -7991,11 +7991,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 */
-- 
cgit v0.10.2