d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- When enabling/disabling interrupts, set/clear both PSL_EE and PSL_RI, not

Browse Source 
just PSL_EE.
- Make cpu_critical_enter/exit independant of save_intr/restore_intr.
This commit is contained in:
benno 2002-02-28 03:07:48 +00:00
parent 0535cd31ee
commit bd730b6871
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/powerpc/include/cpufunc.h
View File

@ -35,7 +35,7 @@
#include <machine/psl.h>
#define CRITICAL_FORK (mfmsr() | PSL_EE)
#define CRITICAL_FORK (mfmsr() | PSL_EE | PSL_RI)
#ifdef __GNUC__
@ -93,7 +93,7 @@ disable_intr(void)
unsigned int msr;
msr = mfmsr();
mtmsr(msr & ~PSL_EE);
mtmsr(msr & ~(PSL_EE|PSL_RI));
}
static __inline void
@ -102,7 +102,7 @@ enable_intr(void)
unsigned int msr;
msr = mfmsr();
mtmsr(msr | PSL_EE);
mtmsr(msr | PSL_EE | PSL_RI);
}
static __inline unsigned int
@ -118,8 +118,15 @@ save_intr(void)
static __inline critical_t
cpu_critical_enter(void)
{
u_int msr;
critical_t crit;
return ((critical_t)save_intr());
msr = mfmsr();
crit = (critical_t)msr;
msr &= ~(PSL_EE | PSL_RI);
mtmsr(msr);
return (crit);
}
static __inline void
@ -133,7 +140,7 @@ static __inline void
cpu_critical_exit(critical_t msr)
{
return (restore_intr((unsigned int)msr));
mtmsr(msr);
}
static __inline void