From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EDDDFB6F67 for ; Tue, 31 May 2011 07:18:39 +1000 (EST) Subject: Re: [PATCH] 2.6.39 powerpc: Fix 32-bit SMP build From: Benjamin Herrenschmidt To: Josh Boyer In-Reply-To: <20110530122621.GD2557@zod.rchland.ibm.com> References: <20110530122621.GD2557@zod.rchland.ibm.com> Content-Type: text/plain; charset="UTF-8" Date: Tue, 31 May 2011 07:18:28 +1000 Message-ID: <1306790308.7481.618.camel@pasglop> Mime-Version: 1.0 Cc: linuxppc-dev@lists.ozlabs.org, stable@kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Acked-by: Benjamin Herrenschmidt > --- > > 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 */