[src/netbsd-2-0]: src/sys/arch/powerpc/powerpc Pull up revision 1.57 (request...

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

details:   https://anonhg.NetBSD.org/src/rev/976df6cfbc97
branches:  netbsd-2-0
changeset: 564771:976df6cfbc97
user:      snj <snj%NetBSD.org@localhost>
date:      Sat May 07 07:09:27 2005 +0000

description:
Pull up revision 1.57 (requested by matt in ticket #1286):
Don't enable interrupts while calling trap() if the trapping frame
didn't have them enabled either.
Addresses PR port-macppc/29559.

diffstat:

 sys/arch/powerpc/powerpc/trap_subr.S |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 868d67985080 -r 976df6cfbc97 sys/arch/powerpc/powerpc/trap_subr.S
--- a/sys/arch/powerpc/powerpc/trap_subr.S      Fri May 06 23:51:35 2005 +0000
+++ b/sys/arch/powerpc/powerpc/trap_subr.S      Sat May 07 07:09:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap_subr.S,v 1.54 2003/12/09 09:49:01 simonb Exp $    */
+/*     $NetBSD: trap_subr.S,v 1.54.2.1 2005/05/07 07:09:27 snj Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -871,7 +871,9 @@
 trapagain:
 /* Now we can recover interrupts again: */
        mfmsr   %r7
-       ori     %r7,%r7,(PSL_EE|PSL_ME|PSL_RI)@l
+       ldreg   %r6, (FRAME_SRR1+(2*SZREG))(%r1)
+       andi.   %r6,%r6,(PSL_EE|PSL_ME|PSL_RI)@l
+       or      %r7,%r7,%r6
        mtmsr   %r7
        isync
 /* Call C trap code: */