Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't enable interrupts while calling trap() if the trapping frame 

didn't have them enabled either.

Addresses PR port-macppc/29559.
This commit is contained in:
nathanw 2005-03-04 22:40:32 +00:00
parent 8de99480fa
commit ec956cbe3a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/powerpc/powerpc/trap_subr.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap_subr.S,v 1.56 2004/06/09 23:24:51 kleink Exp $ */
/* $NetBSD: trap_subr.S,v 1.57 2005/03/04 22:40:32 nathanw Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -854,7 +854,9 @@ k_trap:
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: */