diff options
-rw-r--r-- | sys/arch/i386/include/psl.h | 2 | ||||
-rw-r--r-- | usr.bin/vmstat/vmstat.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h index e1dc71ec94f..ed357a93f13 100644 --- a/sys/arch/i386/include/psl.h +++ b/sys/arch/i386/include/psl.h @@ -74,7 +74,6 @@ #ifdef _KERNEL #include <machine/intr.h> -#endif #ifndef _LOCORE @@ -94,5 +93,6 @@ struct intrhand { }; #endif /* _LOCORE */ +#endif /* _KERNEL */ #endif /* !_I386_PSL_H_ */ diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index f7f0bb2d8ae..4fb56feb283 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1,5 +1,5 @@ /* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */ -/* $OpenBSD: vmstat.c,v 1.12 1996/06/22 17:38:14 tholo Exp $ */ +/* $OpenBSD: vmstat.c,v 1.13 1996/06/24 23:51:59 tholo Exp $ */ /* * Copyright (c) 1980, 1986, 1991, 1993 @@ -724,7 +724,9 @@ dointr() } #elif defined(i386) /* To get struct intrhand */ +#define _KERNEL #include <machine/psl.h> +#undef _KERNEL void dointr() { |