Made PEND_INTS default.

Made NEW_STRATEGY default.
Removed misc. old cruft.

Centralized simple locks into mp_machdep.c
Centralized simple lock macros into param.h

More cleanup in the direction of making splxx()/cpl MP-safe.

1 files changed, 1 insertions, 14 deletions

diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index e80d91a..6b195f6f 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.26 1997/08/18 03:35:59 fsmp Exp $
+ * $Id: smp.h,v 1.23 1997/08/21 04:48:45 smp Exp smp $
  *
  */
 
@@ -75,10 +75,6 @@ extern volatile u_int		started_cpus;
 extern u_int			vec[];
 extern u_int			Xintr8254;
 extern u_int			mask8254;
-extern struct simplelock	imen_lock;
-extern struct simplelock	cpl_lock;
-extern struct simplelock	fast_intr_lock;
-extern struct simplelock	intr_lock;
 
 /* functions in apic_ipl.s */
 void	vec8254			__P((void));
@@ -88,13 +84,6 @@ void	apic_eoi		__P((void));
 u_int	io_apic_read		__P((int, int));
 void	io_apic_write		__P((int, int, u_int));
 
-/* functions in simplelock.s */
-#include <machine/param.h>
-void	s_lock_init		__P((struct simplelock *));
-void	s_lock			__P((struct simplelock *));
-int	s_lock_try		__P((struct simplelock *));
-void	s_unlock		__P((struct simplelock *));
-
 /* global data in mp_machdep.c */
 extern int			mp_ncpus;
 extern int			mp_naps;
@@ -113,8 +102,6 @@ extern u_int			all_cpus;
 extern u_int			SMP_prvpt[];
 extern u_char			SMP_ioapic[];
 
-extern struct simplelock	com_lock;
-
 /* functions in mp_machdep.c */
 u_int	mp_bootaddress		__P((u_int));
 int	mp_probe		__P((void));