Commit 5421d059 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of...

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()
parents 5f3b2878 5a9d3225
...@@ -8128,7 +8128,7 @@ void __init sched_init(void) ...@@ -8128,7 +8128,7 @@ void __init sched_init(void)
* we use alloc_bootmem(). * we use alloc_bootmem().
*/ */
if (alloc_size) { if (alloc_size) {
ptr = (unsigned long)alloc_bootmem_low(alloc_size); ptr = (unsigned long)alloc_bootmem(alloc_size);
#ifdef CONFIG_FAIR_GROUP_SCHED #ifdef CONFIG_FAIR_GROUP_SCHED
init_task_group.se = (struct sched_entity **)ptr; init_task_group.se = (struct sched_entity **)ptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment