diff options
author | peter <peter@FreeBSD.org> | 2001-01-19 09:57:29 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2001-01-19 09:57:29 +0000 |
commit | 940f70431fe17c2fad0fc85126d6871969c09e22 (patch) | |
tree | 67d8004eba4312e7068ca2baa60f06b64f5c9c23 /sys | |
parent | acde0edb4dc1b1c096343db3a6230abf6ab4851d (diff) | |
download | FreeBSD-src-940f70431fe17c2fad0fc85126d6871969c09e22.zip FreeBSD-src-940f70431fe17c2fad0fc85126d6871969c09e22.tar.gz |
Remove the static splXXX functions and replace them by static __inline
stubs. Remove the xxx_imask variables which have been all but gone for
a while.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/alpha/alpha/ipl_funcs.c | 5 | ||||
-rw-r--r-- | sys/i386/include/asnames.h | 7 | ||||
-rw-r--r-- | sys/i386/isa/ipl.s | 23 | ||||
-rw-r--r-- | sys/ia64/ia64/ipl_funcs.c | 5 | ||||
-rw-r--r-- | sys/kern/kern_intr.c | 24 | ||||
-rw-r--r-- | sys/sys/systm.h | 59 |
6 files changed, 21 insertions, 102 deletions
diff --git a/sys/alpha/alpha/ipl_funcs.c b/sys/alpha/alpha/ipl_funcs.c index 3f98cf7..253fa8d 100644 --- a/sys/alpha/alpha/ipl_funcs.c +++ b/sys/alpha/alpha/ipl_funcs.c @@ -28,8 +28,3 @@ #include <sys/param.h> #include <sys/systm.h> - -unsigned int bio_imask; /* XXX */ -unsigned int cam_imask; /* XXX */ -unsigned int net_imask; /* XXX */ -unsigned int tty_imask; /* XXX */ diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h index bea3b49..6a42386 100644 --- a/sys/i386/include/asnames.h +++ b/sys/i386/include/asnames.h @@ -161,7 +161,6 @@ #define _bcopy_vector bcopy_vector #define _bigJump bigJump #define _bintr bintr -#define _bio_imask bio_imask #define _bioscall_vector bioscall_vector #define _bootCodeSeg bootCodeSeg #define _bootDataSeg bootDataSeg @@ -174,7 +173,6 @@ #define _bootinfo bootinfo #define _btrap btrap #define _bzero bzero -#define _cam_imask cam_imask #define _checkstate_cpus checkstate_cpus #define _checkstate_cpustate checkstate_cpustate #define _checkstate_curproc checkstate_curproc @@ -251,7 +249,6 @@ #define __mtx_enter_giant_def _mtx_enter_giant_def #define __mtx_exit_giant_def _mtx_exit_giant_def #define _mul64 mul64 -#define _net_imask net_imask #define _nfs_diskless nfs_diskless #define _nfs_diskless_valid nfs_diskless_valid #define _normalize normalize @@ -290,10 +287,7 @@ #define _sigcode sigcode #define _smp_active smp_active #define _smp_rendezvous_action smp_rendezvous_action -#define _soft_imask soft_imask #define _softclock softclock -#define _softnet_imask softnet_imask -#define _softtty_imask softtty_imask #define _spending spending #define _spl0 spl0 #define _splz splz @@ -315,7 +309,6 @@ #define _time time #define _trap trap #define _trapwrite trapwrite -#define _tty_imask tty_imask #define _vec vec #define _vec8254 vec8254 #define _vm86_prepcall vm86_prepcall diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s index 3f8fc96..ca874ea 100644 --- a/sys/i386/isa/ipl.s +++ b/sys/i386/isa/ipl.s @@ -43,31 +43,8 @@ /* * AT/386 * Vector interrupt control section - * - * *_imask - Interrupt masks for various spl*() functions - * ipending - Pending interrupts (set when a masked interrupt occurs) */ - .data - ALIGN_DATA - -/* current priority (all off) */ - - .globl _tty_imask -_tty_imask: .long 0 - .globl _bio_imask -_bio_imask: .long 0 - .globl _net_imask -_net_imask: .long 0 - .globl _cam_imask -_cam_imask: .long 0 - .globl _soft_imask -_soft_imask: .long 0 - .globl _softnet_imask -_softnet_imask: .long 0 - .globl _softtty_imask -_softtty_imask: .long 0 - .text /* diff --git a/sys/ia64/ia64/ipl_funcs.c b/sys/ia64/ia64/ipl_funcs.c index 3f98cf7..253fa8d 100644 --- a/sys/ia64/ia64/ipl_funcs.c +++ b/sys/ia64/ia64/ipl_funcs.c @@ -28,8 +28,3 @@ #include <sys/param.h> #include <sys/systm.h> - -unsigned int bio_imask; /* XXX */ -unsigned int cam_imask; /* XXX */ -unsigned int net_imask; /* XXX */ -unsigned int tty_imask; /* XXX */ diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index f25cf87..e4411c9 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -318,27 +318,3 @@ swi_net(void *dummy) bits &= ~(1 << i); } } - -/* - * Dummy spl calls. The only reason for these is to not break - * all the code which expects to call them. - */ -void spl0 (void) {} -void splx (intrmask_t x) {} -intrmask_t splq(intrmask_t mask) { return 0; } -intrmask_t splbio(void) { return 0; } -intrmask_t splcam(void) { return 0; } -intrmask_t splclock(void) { return 0; } -intrmask_t splhigh(void) { return 0; } -intrmask_t splimp(void) { return 0; } -intrmask_t splnet(void) { return 0; } -intrmask_t splsoftcam(void) { return 0; } -intrmask_t splsoftcambio(void) { return 0; } -intrmask_t splsoftcamnet(void) { return 0; } -intrmask_t splsoftclock(void) { return 0; } -intrmask_t splsofttty(void) { return 0; } -intrmask_t splsoftvm(void) { return 0; } -intrmask_t splsofttq(void) { return 0; } -intrmask_t splstatclock(void) { return 0; } -intrmask_t spltty(void) { return 0; } -intrmask_t splvm(void) { return 0; } diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 3219429..6507ca6 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -202,50 +202,33 @@ 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)); -/* Interrupt management */ -void spl0 __P((void)); -intrmask_t splbio __P((void)); -intrmask_t splcam __P((void)); -intrmask_t splclock __P((void)); -intrmask_t splhigh __P((void)); -intrmask_t splimp __P((void)); -intrmask_t splnet __P((void)); -intrmask_t splsoftcam __P((void)); -intrmask_t splsoftcambio __P((void)); -intrmask_t splsoftcamnet __P((void)); -intrmask_t splsoftclock __P((void)); -intrmask_t splsofttty __P((void)); -intrmask_t splsoftvm __P((void)); -intrmask_t splsofttq __P((void)); -intrmask_t splstatclock __P((void)); -intrmask_t spltty __P((void)); -intrmask_t splvm __P((void)); -void splx __P((intrmask_t ipl)); -intrmask_t splq __P((intrmask_t ipl)); -void splz __P((void)); +/* Stubs for obsolete functions that used to be for interrupt management */ +static __inline void spl0(void) { return; } +static __inline intrmask_t splbio(void) { return 0; } +static __inline intrmask_t splcam(void) { return 0; } +static __inline intrmask_t splclock(void) { return 0; } +static __inline intrmask_t splhigh(void) { return 0; } +static __inline intrmask_t splimp(void) { return 0; } +static __inline intrmask_t splnet(void) { return 0; } +static __inline intrmask_t splsoftcam(void) { return 0; } +static __inline intrmask_t splsoftcambio(void) { return 0; } +static __inline intrmask_t splsoftcamnet(void) { return 0; } +static __inline intrmask_t splsoftclock(void) { return 0; } +static __inline intrmask_t splsofttty(void) { return 0; } +static __inline intrmask_t splsoftvm(void) { return 0; } +static __inline intrmask_t splsofttq(void) { return 0; } +static __inline intrmask_t splstatclock(void) { return 0; } +static __inline intrmask_t spltty(void) { return 0; } +static __inline intrmask_t splvm(void) { return 0; } +static __inline void splx(intrmask_t ipl) { return; } +static __inline intrmask_t splq(intrmask_t ipl) { return 0; } +static __inline void splz(void) { return; } #if defined(__ia64__) #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 - * have to modify lots of drivers since <machine/cpufunc.h> no longer - * implicitly causes these to be defined when it #included <machine/spl.h> - */ -extern intrmask_t bio_imask; /* group of interrupts masked with splbio() */ -extern intrmask_t cam_imask; /* group of interrupts masked with splcam() */ -extern intrmask_t net_imask; /* group of interrupts masked with splimp() */ -extern intrmask_t stat_imask; /* interrupts masked with splstatclock() */ -extern intrmask_t tty_imask; /* group of interrupts masked with spltty() */ - -/* Read only */ -extern const intrmask_t soft_imask; /* interrupts masked with splsoft*() */ -extern const intrmask_t softnet_imask; /* interrupt masked with splnet() */ -extern const intrmask_t softtty_imask; /* interrupt masked with splsofttty() */ - -/* * Various callout lists. */ |