aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuss Anderson <rja@sgi.com>2008-04-24 14:16:59 -0400
committerTony Luck <tony.luck@intel.com>2008-04-24 17:21:21 -0400
commit472613b961affef0c73f1c797993678312e7c666 (patch)
treeb350341d0f10ee150020697b81ebc900332cbba0
parent94bc891b00e40cbec375feb4568780af183fd7f4 (diff)
[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>
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 0014b03adaca..09ca69b2c17d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8128,7 +8128,7 @@ void __init sched_init(void)
8128 * we use alloc_bootmem(). 8128 * we use alloc_bootmem().
8129 */ 8129 */
8130 if (alloc_size) { 8130 if (alloc_size) {
8131 ptr = (unsigned long)alloc_bootmem_low(alloc_size); 8131 ptr = (unsigned long)alloc_bootmem(alloc_size);
8132 8132
8133#ifdef CONFIG_FAIR_GROUP_SCHED 8133#ifdef CONFIG_FAIR_GROUP_SCHED
8134 init_task_group.se = (struct sched_entity **)ptr; 8134 init_task_group.se = (struct sched_entity **)ptr;