aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-25 15:25:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-25 15:25:03 -0400
commit5421d059068341b3f21df1a21c2ba9175e55ebef (patch)
tree944684bdea39b9a3d219ceae5b9053dc8ecafb51
parent5f3b28781cbc030351e2fa0712602afbea592aae (diff)
parent5a9d3225a0d7060bdf3a18018992dc8cef958425 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes2: sched: use alloc_bootmem() instead of alloc_bootmem_low()
-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;