Skip to content

Commit

Permalink
sched: proper prototype for kernel/sched.c:migration_init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Bunk authored and Ingo Molnar committed Nov 9, 2007
1 parent b82d9fd commit e6fe664
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
8 changes: 8 additions & 0 deletions include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -1988,6 +1988,14 @@ static inline void inc_syscw(struct task_struct *tsk)
}
#endif

#ifdef CONFIG_SMP
void migration_init(void);
#else
static inline void migration_init(void)
{
}
#endif

#endif /* __KERNEL__ */

#endif
4 changes: 1 addition & 3 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
#include <linux/pid_namespace.h>
#include <linux/device.h>
#include <linux/kthread.h>
#include <linux/sched.h>

#include <asm/io.h>
#include <asm/bugs.h>
Expand Down Expand Up @@ -747,11 +748,8 @@ __setup("nosoftlockup", nosoftlockup_setup);
static void __init do_pre_smp_initcalls(void)
{
extern int spawn_ksoftirqd(void);
#ifdef CONFIG_SMP
extern int migration_init(void);

migration_init();
#endif
spawn_ksoftirqd();
if (!nosoftlockup)
spawn_softlockup_task();
Expand Down
4 changes: 1 addition & 3 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -5650,7 +5650,7 @@ static struct notifier_block __cpuinitdata migration_notifier = {
.priority = 10
};

int __init migration_init(void)
void __init migration_init(void)
{
void *cpu = (void *)(long)smp_processor_id();
int err;
Expand All @@ -5660,8 +5660,6 @@ int __init migration_init(void)
BUG_ON(err == NOTIFY_BAD);
migration_call(&migration_notifier, CPU_ONLINE, cpu);
register_cpu_notifier(&migration_notifier);

return 0;
}
#endif

Expand Down

0 comments on commit e6fe664

Please sign in to comment.