* [PATCH] 2.6.39 powerpc: Fix 32-bit SMP build
@ 2011-05-30 12:26 Josh Boyer
2011-05-30 21:18 ` Benjamin Herrenschmidt
2011-06-03 5:56 ` [stable] " Greg KH
0 siblings, 2 replies; 4+ messages in thread
From: Josh Boyer @ 2011-05-30 12:26 UTC (permalink / raw)
To: linuxppc-dev; +Cc: stable
Backport upstream commit 6de06f313a65d0ec
Commit fa3f82c8bb7acb ("powerpc/smp: soft-replugged CPUs must go back to
start_secondary") introduced start_secondary_resume to head_32.S, however
it uses a 64-bit instruction which is not valid on 32-bit platforms. Use
'stw' instead.
CC: stable@kernel.org
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
---
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index c5c24be..727f40a 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -896,7 +896,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 */
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] 2.6.39 powerpc: Fix 32-bit SMP build
2011-05-30 12:26 [PATCH] 2.6.39 powerpc: Fix 32-bit SMP build Josh Boyer
@ 2011-05-30 21:18 ` Benjamin Herrenschmidt
2011-06-03 5:56 ` [stable] " Greg KH
1 sibling, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2011-05-30 21:18 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev, stable
On Mon, 2011-05-30 at 08:26 -0400, Josh Boyer wrote:
> Backport upstream commit 6de06f313a65d0ec
>
> Commit fa3f82c8bb7acb ("powerpc/smp: soft-replugged CPUs must go back to
> start_secondary") introduced start_secondary_resume to head_32.S, however
> it uses a 64-bit instruction which is not valid on 32-bit platforms. Use
> 'stw' instead.
>
> CC: stable@kernel.org
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
>
> diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
> index c5c24be..727f40a 100644
> --- a/arch/powerpc/kernel/head_32.S
> +++ b/arch/powerpc/kernel/head_32.S
> @@ -896,7 +896,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 */
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [stable] [PATCH] 2.6.39 powerpc: Fix 32-bit SMP build
2011-05-30 12:26 [PATCH] 2.6.39 powerpc: Fix 32-bit SMP build Josh Boyer
2011-05-30 21:18 ` Benjamin Herrenschmidt
@ 2011-06-03 5:56 ` Greg KH
2011-06-03 10:30 ` Josh Boyer
1 sibling, 1 reply; 4+ messages in thread
From: Greg KH @ 2011-06-03 5:56 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev, stable
On Mon, May 30, 2011 at 08:26:21AM -0400, Josh Boyer wrote:
> Backport upstream commit 6de06f313a65d0ec
>
> Commit fa3f82c8bb7acb ("powerpc/smp: soft-replugged CPUs must go back to
> start_secondary") introduced start_secondary_resume to head_32.S, however
> it uses a 64-bit instruction which is not valid on 32-bit platforms. Use
> 'stw' instead.
>
> CC: stable@kernel.org
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
This doesn't apply either:
patching file arch/powerpc/kernel/head_32.S
Hunk #1 FAILED at 896.
1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/head_32.S.rej
Please send something that at least applies, and hopefully builds...
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [stable] [PATCH] 2.6.39 powerpc: Fix 32-bit SMP build
2011-06-03 5:56 ` [stable] " Greg KH
@ 2011-06-03 10:30 ` Josh Boyer
0 siblings, 0 replies; 4+ messages in thread
From: Josh Boyer @ 2011-06-03 10:30 UTC (permalink / raw)
To: Greg KH; +Cc: linuxppc-dev, stable
On Fri, Jun 03, 2011 at 02:56:50PM +0900, Greg KH wrote:
>On Mon, May 30, 2011 at 08:26:21AM -0400, Josh Boyer wrote:
>> Backport upstream commit 6de06f313a65d0ec
>>
>> Commit fa3f82c8bb7acb ("powerpc/smp: soft-replugged CPUs must go back to
>> start_secondary") introduced start_secondary_resume to head_32.S, however
>> it uses a 64-bit instruction which is not valid on 32-bit platforms. Use
>> 'stw' instead.
>>
>> CC: stable@kernel.org
>> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
>
>This doesn't apply either:
>
>patching file arch/powerpc/kernel/head_32.S
>Hunk #1 FAILED at 896.
>1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/head_32.S.rej
>
>Please send something that at least applies, and hopefully builds...
Odd. It was generated with git from 2.6.39 and it builds here. I'll
try and figure out what went wrong.
josh
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-03 12:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-30 12:26 [PATCH] 2.6.39 powerpc: Fix 32-bit SMP build Josh Boyer
2011-05-30 21:18 ` Benjamin Herrenschmidt
2011-06-03 5:56 ` [stable] " Greg KH
2011-06-03 10:30 ` Josh Boyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).