diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-18 23:07:12 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-18 23:07:12 -0400 |
commit | 69e3cea8d5fd52677f2b6219542d0f8b53fe4c80 (patch) | |
tree | 307ab1bb6a276e36dc9f496dab98ec6e06ce42d4 /arch | |
parent | fce519588acfac249e8fdc1f5016c73d617de315 (diff) |
powerpc/smp: Make start_secondary_resume available to all CPU variants
This should fix SMP & Hotplug builds on FSL BookE and 476
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/head_32.S | 9 | ||||
-rw-r--r-- | arch/powerpc/kernel/misc_32.S | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index c5c24beb8387..98c4b29a56f4 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S | |||
@@ -890,15 +890,6 @@ __secondary_start: | |||
890 | mtspr SPRN_SRR1,r4 | 890 | mtspr SPRN_SRR1,r4 |
891 | SYNC | 891 | SYNC |
892 | RFI | 892 | RFI |
893 | |||
894 | _GLOBAL(start_secondary_resume) | ||
895 | /* Reset stack */ | ||
896 | rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ | ||
897 | addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD | ||
898 | li r3,0 | ||
899 | std r3,0(r1) /* Zero the stack frame pointer */ | ||
900 | bl start_secondary | ||
901 | b . | ||
902 | #endif /* CONFIG_SMP */ | 893 | #endif /* CONFIG_SMP */ |
903 | 894 | ||
904 | #ifdef CONFIG_KVM_BOOK3S_HANDLER | 895 | #ifdef CONFIG_KVM_BOOK3S_HANDLER |
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 094bd9821ad4..402560e957bd 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
@@ -694,6 +694,17 @@ _GLOBAL(kernel_thread) | |||
694 | addi r1,r1,16 | 694 | addi r1,r1,16 |
695 | blr | 695 | blr |
696 | 696 | ||
697 | #ifdef CONFIG_SMP | ||
698 | _GLOBAL(start_secondary_resume) | ||
699 | /* Reset stack */ | ||
700 | rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ | ||
701 | addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD | ||
702 | li r3,0 | ||
703 | std r3,0(r1) /* Zero the stack frame pointer */ | ||
704 | bl start_secondary | ||
705 | b . | ||
706 | #endif /* CONFIG_SMP */ | ||
707 | |||
697 | /* | 708 | /* |
698 | * This routine is just here to keep GCC happy - sigh... | 709 | * This routine is just here to keep GCC happy - sigh... |
699 | */ | 710 | */ |