Messages in this thread | | | Date | Fri, 20 May 2011 10:46:53 -0400 | From | Josh Boyer <> | Subject | Re: [git pull] Please pull powerpc.git merge branch |
| |
On Fri, May 20, 2011 at 04:32:59PM +0200, Richard Cochran wrote: >On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote: >> On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote: >> >When I try to build 'next' (now at 208b3a4c), it does not compile due >> >to a change from the following commit. >> > >> >> Benjamin Herrenschmidt (1): >> >> powerpc/smp: Make start_secondary_resume available to all CPU variants >> > >> >I would appreciate your help in getting this fixed... >> >> Could you try the patch below? > >Yes, and it both compiles and boots.
Thanks for testing!
Ben, can you pull this patch in as-is (fixing up the Subject), or do you need me to resubmit it?
josh >> >> Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S, >> however it uses a 64-bit instruction which is not valid on 32-bit >> platforms. Use 'stw' instead. >> >> Reported-by: Richard Cochran <richardcochran@gmail.com> >> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> >> >> --- >> >> diff --git a/arch/powerpc/kernel/misc_32.S >> b/arch/powerpc/kernel/misc_32.S >> index 402560e..998a100 100644 >> --- a/arch/powerpc/kernel/misc_32.S >> +++ b/arch/powerpc/kernel/misc_32.S >> @@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume) >> 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 */ >> + stw r3,0(r1) /* Zero the stack frame pointer */ >> bl start_secondary >> b . >> #endif /* CONFIG_SMP */ >>
| |