aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/systm.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/sys/systm.h')
-rw-r--r--sys/sys/systm.h22
1 files changed, 17 insertions, 5 deletions
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 60c4c25de0a6..cc39cadbae02 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)systm.h 8.7 (Berkeley) 3/29/95
- * $Id: systm.h,v 1.69 1998/01/21 18:28:49 gibbs Exp $
+ * $Id: systm.h,v 1.70 1998/02/24 02:01:11 bde Exp $
*/
#ifndef _SYS_SYSTM_H_
@@ -112,7 +112,11 @@ void ttyprintf __P((struct tty *, const char *, ...));
void bcopy __P((const void *from, void *to, size_t len));
void ovbcopy __P((const void *from, void *to, size_t len));
+#ifdef __i386__
extern void (*bzero) __P((void *buf, size_t len));
+#else
+void bzero __P((void *buf, size_t len));
+#endif
void *memcpy __P((void *to, const void *from, size_t len));
@@ -126,10 +130,10 @@ int copyout __P((const void *kaddr, void *udaddr, size_t len));
int fubyte __P((const void *base));
int subyte __P((void *base, int byte));
int suibyte __P((void *base, int byte));
-int fuword __P((const void *base));
-int suword __P((void *base, int word));
-int fusword __P((void *base));
-int susword __P((void *base, int word));
+long fuword __P((const void *base));
+int suword __P((void *base, long word));
+long fusword __P((void *base));
+int susword __P((void *base, long word));
int hzto __P((struct timeval *tv));
void realitexpire __P((void *));
@@ -176,6 +180,8 @@ void callout_handle_init __P((struct callout_handle *));
struct callout_handle timeout __P((timeout_t *, void *, int));
void untimeout __P((timeout_t *, void *, struct callout_handle));
+#ifdef __i386__
+
/* Interrupt management */
void setdelayed(void);
void setsoftast(void);
@@ -213,6 +219,12 @@ intrmask_t splvm(void);
void splx(intrmask_t ipl);
void splz(void);
+#endif
+
+#ifdef __alpha__
+#include <machine/ipl.h>
+#endif
+
/*
* XXX It's not clear how "machine independent" these will be yet, but
* they are used all over the place especially in pci drivers. We would