Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6fe6649 authored by Adrian Bunk's avatar Adrian Bunk Committed by Ingo Molnar
Browse files

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



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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b82d9fdd

include/linux/sched.h

+8 −0
Original line number Diff line number Diff line
@@ -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

init/main.c

+1 −3
Original line number Diff line number Diff line
@@ -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>
@@ -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();

kernel/sched.c

+1 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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