diff options
| author |   art <art@openbsd.org> | 2007-05-08 07:23:18 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2007-05-08 07:23:18 +0000 |
| commit | 77c7508db0ec7a6b0b18dc1beccaaaa31470ad07 (patch) | |
| tree | 11e7341f086df6bdb356923863c358994fcbfd7e /sys/arch/sparc/include | |
| parent | regen (diff) | |
| download | wireguard-openbsd-77c7508db0ec7a6b0b18dc1beccaaaa31470ad07.tar.xz wireguard-openbsd-77c7508db0ec7a6b0b18dc1beccaaaa31470ad07.zip | |
Switch sparc to __HAVE_CPUINFO.
miod@ tested (since I hacked it up blindly) and ok.
Diffstat (limited to 'sys/arch/sparc/include')
| -rw-r--r-- | sys/arch/sparc/include/_types.h | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/include/psl.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/sys/arch/sparc/include/_types.h b/sys/arch/sparc/include/_types.h index bbc73389c41..4de839f5177 100644 --- a/sys/arch/sparc/include/_types.h +++ b/sys/arch/sparc/include/_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _types.h,v 1.4 2007/02/03 20:08:50 miod Exp $ */ +/* $OpenBSD: _types.h,v 1.5 2007/05/08 07:23:18 art Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -116,5 +116,6 @@ typedef void * __wctype_t; #define __HAVE_DEVICE_REGISTER #define __HAVE_MUTEX +#define __HAVE_CPUINFO #endif /* _SPARC__TYPES_H_ */ diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h index c866f1d4803..44686965093 100644 --- a/sys/arch/sparc/include/cpu.h +++ b/sys/arch/sparc/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.28 2007/03/15 10:22:29 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.29 2007/05/08 07:23:18 art Exp $ */ /* $NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */ /* @@ -68,7 +68,9 @@ #include <sys/evcount.h> #include <machine/psl.h> +#include <machine/reg.h> #include <sparc/sparc/intreg.h> +#include <sparc/sparc/cpuvar.h> /* * definitions of cpu-dependent requirements diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h index 8454ad65e57..96418442bc9 100644 --- a/sys/arch/sparc/include/psl.h +++ b/sys/arch/sparc/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.21 2006/03/12 03:14:37 brad Exp $ */ +/* $OpenBSD: psl.h,v 1.22 2007/05/08 07:23:18 art Exp $ */ /* $NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */ /* @@ -95,6 +95,7 @@ */ #define IPL_AUHARD 13 /* hard audio interrupts */ #define IPL_STATCLOCK 14 /* statclock() */ +#define IPL_SCHED IPL_STATCLOCK #define IPL_HIGH 15 /* splhigh() */ #if defined(_KERNEL) && !defined(_LOCORE) @@ -226,6 +227,7 @@ SPLHOLD(splclock, IPL_CLOCK) SPLHOLD(splfd, IPL_FD) SPLHOLD(splzs, IPL_ZS) SPLHOLD(splaudio, IPL_AUHARD) +SPLHOLD(splsched, IPL_SCHED) SPLHOLD(splstatclock, IPL_STATCLOCK) static __inline int splhigh() |