Messages in this thread Patch in this message | | | From | Con Kolivas <> | Subject | [PATCH][plugsched additions 2/2] Miscellanous fixes | Date | Mon, 01 Nov 2004 17:03:13 +1100 |
| |
Miscellanous fixes
Miscellanous build fixes.
Because swapper becomes the idle task we have to do some magic only on SMP to make it boot.
Signed-off-by: Con Kolivas <kernel@kolivas.org>
Index: linux-2.6.10-rc1-mm2-plugsched/kernel/sched.c =================================================================== --- linux-2.6.10-rc1-mm2-plugsched.orig/kernel/sched.c 2004-11-01 13:03:18.000000000 +1100 +++ linux-2.6.10-rc1-mm2-plugsched/kernel/sched.c 2004-11-01 13:03:20.000000000 +1100 @@ -4076,10 +4076,10 @@ static void ingo_destroy_sched_domain_sy kfree(root); } #else -static void ingo_init_sched_domain_sysctl() +static void ingo_init_sched_domain_sysctl(void) { } -static void ingo_destroy_sched_domain_sysctl() +static void ingo_destroy_sched_domain_sysctl(void) { } #endif Index: linux-2.6.10-rc1-mm2-plugsched/kernel/staircase.c =================================================================== --- linux-2.6.10-rc1-mm2-plugsched.orig/kernel/staircase.c 2004-11-01 13:03:18.000000000 +1100 +++ linux-2.6.10-rc1-mm2-plugsched/kernel/staircase.c 2004-11-01 14:47:06.724113368 +1100 @@ -3676,7 +3676,14 @@ static void __init sc_sched_init(void) * when this runqueue becomes "idle". */ init_idle(current, smp_processor_id()); + +#ifdef CONFIG_SMP + /* + * SMP needs a little extra magic to work since we are now the idle + * task. + */ current->u.scsched.prio = MAX_PRIO - 1; +#endif } #if defined(CONFIG_DEBUG_KERNEL)&&defined(CONFIG_SYSCTL)&&defined(CONFIG_SMP) @@ -3808,10 +3815,10 @@ static void sc_destroy_sched_domain_sysc kfree(root); } #else -static void sc_init_sched_domain_sysctl() +static void sc_init_sched_domain_sysctl(void) { } -static void sc_destroy_sched_domain_sysctl() +static void sc_destroy_sched_domain_sysctl(void) { } #endif | |