3 files changed, 5 insertions, 19 deletions
diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h
index 0fd0dd0..25f37d3 100644
--- a/sys/powerpc/include/cpufunc.h
+++ b/sys/powerpc/include/cpufunc.h
@@ -35,6 +35,8 @@
 
 #include <machine/psl.h>
 
+#define	CRITICAL_FORK	(mfmsr() |= PSL_EE)
+
 #ifdef __GNUC__
 
 static __inline void
@@ -114,7 +116,7 @@ save_intr(void)
 }
 
 static __inline critical_t
-critical_enter(void)
+cpu_critical_enter(void)
 {
 
 	return ((critical_t)save_intr());
@@ -128,7 +130,7 @@ restore_intr(unsigned int msr)
 }
 
 static __inline void
-critical_exit(critical_t msr)
+cpu_critical_exit(critical_t msr)
 {
 
 	return (restore_intr((unsigned int)msr));
diff --git a/sys/powerpc/include/mutex.h b/sys/powerpc/include/mutex.h
index 0aeaa74..0b7fe26 100644
--- a/sys/powerpc/include/mutex.h
+++ b/sys/powerpc/include/mutex.h
@@ -32,22 +32,7 @@
 #ifndef _MACHINE_MUTEX_H_
 #define _MACHINE_MUTEX_H_
 
-#ifndef LOCORE
-
-#ifdef _KERNEL
-
-#define	mtx_intr_enable(mutex)	do (mutex)->mtx_savecrit |= PSL_EE; while (0)
-
-/*
- * Assembly macros (for internal use only)
- *--------------------------------------------------------------------------
- */
-
-#define	_V(x)	__STRING(x)
-
-#endif	/* _KERNEL */
-
-#else	/* !LOCORE */
+#ifdef LOCORE
 
 /*
  * Simple assembly macros to get and release non-recursive spin locks
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 7ab6e77..c212c6b 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -66,7 +66,6 @@ ASSYM(PC_SWITCHTIME, offsetof(struct pcpu, pc_switchtime));
 
 ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock));
 ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse));
-ASSYM(MTX_SAVECRIT, offsetof(struct mtx, mtx_savecrit));
 
 ASSYM(PM_KERNELSR, offsetof(struct pmap, pm_sr[KERNEL_SR]));
 ASSYM(PM_USERSR, offsetof(struct pmap, pm_sr[USER_SR]));