diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-02-06 04:37:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:41:08 -0500 |
commit | 6b2fb3c65844452bb9e8b449d50863d1b36c5dc0 (patch) | |
tree | 2dee8421cd2b679e703b2ae8d7bdfafde7ef6d68 | |
parent | 6c81c32f9616fd6f2795dceae2f70943cb4d8609 (diff) |
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: Adrian 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 | ||||
-rw-r--r-- | kernel/fork.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 328fd2fd5f44..32ee5979a042 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -476,7 +476,7 @@ start_secondary (void *unused) | |||
476 | return 0; | 476 | return 0; |
477 | } | 477 | } |
478 | 478 | ||
479 | struct pt_regs * __devinit idle_regs(struct pt_regs *regs) | 479 | struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs) |
480 | { | 480 | { |
481 | return NULL; | 481 | return NULL; |
482 | } | 482 | } |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index d9313d9adced..f86a3c4a2669 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -637,7 +637,7 @@ void __init early_cpu_init(void) | |||
637 | } | 637 | } |
638 | 638 | ||
639 | /* Make sure %fs is initialized properly in idle threads */ | 639 | /* Make sure %fs is initialized properly in idle threads */ |
640 | struct pt_regs * __devinit idle_regs(struct pt_regs *regs) | 640 | struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs) |
641 | { | 641 | { |
642 | memset(regs, 0, sizeof(struct pt_regs)); | 642 | memset(regs, 0, sizeof(struct pt_regs)); |
643 | regs->fs = __KERNEL_PERCPU; | 643 | regs->fs = __KERNEL_PERCPU; |
diff --git a/kernel/fork.c b/kernel/fork.c index 8adfe5ddb688..3995297567a9 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -1399,7 +1399,7 @@ fork_out: | |||
1399 | return ERR_PTR(retval); | 1399 | return ERR_PTR(retval); |
1400 | } | 1400 | } |
1401 | 1401 | ||
1402 | noinline struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_regs *regs) | 1402 | noinline struct pt_regs * __cpuinit __attribute__((weak)) idle_regs(struct pt_regs *regs) |
1403 | { | 1403 | { |
1404 | memset(regs, 0, sizeof(struct pt_regs)); | 1404 | memset(regs, 0, sizeof(struct pt_regs)); |
1405 | return regs; | 1405 | return regs; |