GC some unused, bogus interrupt functions and replace them with proper

implementations of intr_disable and intr_restore.

1 files changed, 6 insertions, 20 deletions

diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h
index 282c9c4..1fabff7 100644
--- a/sys/powerpc/include/cpufunc.h
+++ b/sys/powerpc/include/cpufunc.h
@@ -84,35 +84,21 @@ mfdec(void)
 	return (value);
 }
 
-/*
- * Bogus interrupt manipulation
- */
-static __inline void
-disable_intr(void)
+static __inline register_t
+intr_disable(void)
 {
-	unsigned int	msr;
+	register_t	msr;
 
 	msr = mfmsr();
 	mtmsr(msr & ~(PSL_EE|PSL_RI));
+	return (msr);
 }
 
 static __inline void
-enable_intr(void)
+intr_restore(register_t msr)
 {
-	unsigned int	msr;
-
-	msr = mfmsr();
-	mtmsr(msr | PSL_EE | PSL_RI);
-}
 
-static __inline unsigned int
-save_intr(void)
-{
-	unsigned int	msr;
-
-	msr = mfmsr();
-
-	return msr;
+	mtmsr(msr);
 }
 
 static __inline critical_t