[src/trunk]: src/sys/arch/powerpc/ibm4xx Set SRR1 to r31 in intr_exit. Not c...

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f75f6aea1df0
branches:  trunk
changeset: 784478:f75f6aea1df0
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Tue Jan 29 15:33:44 2013 +0000

description:
Set SRR1 to r31 in intr_exit.  Not cpuinfo.

diffstat:

 sys/arch/powerpc/ibm4xx/trap_subr.S |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 06143113e327 -r f75f6aea1df0 sys/arch/powerpc/ibm4xx/trap_subr.S
--- a/sys/arch/powerpc/ibm4xx/trap_subr.S       Tue Jan 29 14:09:48 2013 +0000
+++ b/sys/arch/powerpc/ibm4xx/trap_subr.S       Tue Jan 29 15:33:44 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap_subr.S,v 1.22 2011/12/22 11:33:54 kiyohara Exp $  */
+/*     $NetBSD: trap_subr.S,v 1.23 2013/01/29 15:33:44 kiyohara Exp $  */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -485,7 +485,6 @@
 /* Disable interrupts */
        wrteei  0
        isync
-       GET_CPUINFO(%r5)
 
        lwz     %r4,FRAME_SRR1(%r1)
 /* Returning to user mode? */
@@ -499,7 +498,7 @@
        FRAME_SAVE_CALLEE               /* save rest of callee registers */
        li      %r6,EXC_AST
        stw     %r6,FRAME_EXC(%r1)
-       mr      %r31,%r5                /* move SRR1 to R31 */
+       lwz     %r31,FRAME_SRR1(%r1)    /* move SRR1 to R31 */
        b       trapagain
 
 /*