Commit 6b2fb3c6 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

idle_regs() must be __cpuinit

Fix the following section mismatch with CONFIG_HOTPLUG=n,
CONFIG_HOTPLUG_CPU=y:

WARNING: vmlinux.o(.text+0x399a6): Section mismatch: reference to .init.text.5:idle_regs (between 'fork_idle' and 'get_task_mm')
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c81c32f
...@@ -476,7 +476,7 @@ start_secondary (void *unused) ...@@ -476,7 +476,7 @@ start_secondary (void *unused)
return 0; return 0;
} }
struct pt_regs * __devinit idle_regs(struct pt_regs *regs) struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
{ {
return NULL; return NULL;
} }
......
...@@ -637,7 +637,7 @@ void __init early_cpu_init(void) ...@@ -637,7 +637,7 @@ void __init early_cpu_init(void)
} }
/* Make sure %fs is initialized properly in idle threads */ /* Make sure %fs is initialized properly in idle threads */
struct pt_regs * __devinit idle_regs(struct pt_regs *regs) struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
{ {
memset(regs, 0, sizeof(struct pt_regs)); memset(regs, 0, sizeof(struct pt_regs));
regs->fs = __KERNEL_PERCPU; regs->fs = __KERNEL_PERCPU;
......
...@@ -1399,7 +1399,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, ...@@ -1399,7 +1399,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
return ERR_PTR(retval); return ERR_PTR(retval);
} }
noinline struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_regs *regs) noinline struct pt_regs * __cpuinit __attribute__((weak)) idle_regs(struct pt_regs *regs)
{ {
memset(regs, 0, sizeof(struct pt_regs)); memset(regs, 0, sizeof(struct pt_regs));
return regs; return regs;
......
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