AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

sched: proper prototype for kernel/sched.c:migration_init()

Browse Source 
This patch adds a proper prototype for migration_init() in
include/linux/sched.h

Since there's no point in always returning 0 to a caller that doesn't check
the return value it also changes the function to return void.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Adrian Bunk 2007-11-09 22:39:39 +01:00 committed by Ingo Molnar
parent b82d9fdd84
commit e6fe6649b4
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/sched.h
View File

@ -1988,6 +1988,14 @@ static inline void inc_syscw(struct task_struct *tsk)
} }
#endif #endif
#ifdef CONFIG_SMP
void migration_init(void);
#else
static inline void migration_init(void)
{
}
#endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif

4
init/main.c
View File

@ -56,6 +56,7 @@
#include <linux/pid_namespace.h> #include <linux/pid_namespace.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/sched.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/bugs.h> #include <asm/bugs.h>
@ -747,11 +748,8 @@ __setup("nosoftlockup", nosoftlockup_setup);
static void __init do_pre_smp_initcalls(void) static void __init do_pre_smp_initcalls(void)
{ {
extern int spawn_ksoftirqd(void); extern int spawn_ksoftirqd(void);
#ifdef CONFIG_SMP
extern int migration_init(void);
migration_init(); migration_init();
#endif
spawn_ksoftirqd(); spawn_ksoftirqd();
if (!nosoftlockup) if (!nosoftlockup)
spawn_softlockup_task(); spawn_softlockup_task();

4
kernel/sched.c
View File

@ -5650,7 +5650,7 @@ static struct notifier_block __cpuinitdata migration_notifier = {
.priority = 10 .priority = 10
}; };
int __init migration_init(void) void __init migration_init(void)
{ {
void *cpu = (void *)(long)smp_processor_id(); void *cpu = (void *)(long)smp_processor_id();
int err; int err;
@ -5660,8 +5660,6 @@ int __init migration_init(void)
BUG_ON(err == NOTIFY_BAD); BUG_ON(err == NOTIFY_BAD);
migration_call(&migration_notifier, CPU_ONLINE, cpu); migration_call(&migration_notifier, CPU_ONLINE, cpu);
register_cpu_notifier(&migration_notifier); register_cpu_notifier(&migration_notifier);
return 0;
} }
#endif #endif