diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 09:00:06 +0200 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 09:00:06 +0200 |
commit | 4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch) | |
tree | b3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /arch/powerpc/kernel/head_32.S | |
parent | powerpc: Remove unused/obsolete CONFIG_XICS (diff) | |
parent | powerpc/4xx: Fix regression in SMP on 476 (diff) | |
download | linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.tar.xz linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.zip |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/kernel/head_32.S')
-rw-r--r-- | arch/powerpc/kernel/head_32.S | 9 |
1 files changed, 0 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: mtspr SPRN_SRR1,r4 SYNC RFI - -_GLOBAL(start_secondary_resume) - /* Reset stack */ - rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ - addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD - li r3,0 - std r3,0(r1) /* Zero the stack frame pointer */ - bl start_secondary - b . #endif /* CONFIG_SMP */ #ifdef CONFIG_KVM_BOOK3S_HANDLER |