[PATCH] powerpc: Use soft irq-disable on all 64-bit machines

[Stephen Rothwell]

On Wed, 14 Jun 2006 17:23:09 +1000 Stephen Rothwell <sfr at canb.auug.org.au> wrote:
>
> On Wed, 14 Jun 2006 17:08:40 +1000 Stephen Rothwell <sfr at canb.auug.org.au> wrote:
> >
> > Looks good.  A couple of small fixes below.
> 
> Plus we want the below as well ...

And this ...
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 434461a..c6b0400 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -89,6 +89,8 @@ system_call_common:
 	addi	r9,r1,STACK_FRAME_OVERHEAD
 	ld	r11,exception_marker at toc(r2)
 	std	r11,-16(r9)		/* "regshere" marker */
+	lbz	r10,PACAPROCENABLED(r13)
+	std	r10,SOFTE(r1)
 #ifdef CONFIG_PPC_ISERIES
 	/* Hack for handling interrupts when soft-enabling on iSeries */
 	cmpdi	cr1,r0,0x5555		/* syscall 0x5555 */
@@ -96,8 +98,6 @@ #ifdef CONFIG_PPC_ISERIES
 	crand	4*cr0+eq,4*cr1+eq,4*cr0+eq
 	beq	hardware_interrupt_entry
 #endif
-	lbz	r10,PACAPROCENABLED(r13)
-	std	r10,SOFTE(r1)
 	mfmsr	r11
 	ori	r11,r11,MSR_EE
 	mtmsrd	r11,1