diff options
author | rwatson <rwatson@FreeBSD.org> | 2007-07-27 11:59:57 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2007-07-27 11:59:57 +0000 |
commit | c29e74320ba2271247571fc5ac01363963dcf016 (patch) | |
tree | 1d0bccf3909d0a0064cfcd777f148f0f6b272555 /sys/dev | |
parent | 16ad7cce99fdefc348a2c705afbcdccf1057386f (diff) | |
download | FreeBSD-src-c29e74320ba2271247571fc5ac01363963dcf016.zip FreeBSD-src-c29e74320ba2271247571fc5ac01363963dcf016.tar.gz |
First in a series of changes to remove the now-unused Giant compatibility
framework for non-MPSAFE network protocols:
- Remove debug_mpsafenet variable, sysctl, and tunable.
- Remove NET_NEEDS_GIANT() and associate SYSINITSs used by it to force
debug.mpsafenet=0 if non-MPSAFE protocols are compiled into the kernel.
- Remove logic to automatically flag interrupt handlers as non-MPSAFE if
debug.mpsafenet is set for an INTR_TYPE_NET handler.
- Remove logic to automatically flag netisr handlers as non-MPSAFE if
debug.mpsafenet is set.
- Remove references in a few subsystems, including NFS and Cronyx drivers,
which keyed off debug_mpsafenet to determine various aspects of their own
locking behavior.
- Convert NET_LOCK_GIANT(), NET_UNLOCK_GIANT(), and NET_ASSERT_GIANT into
no-op's, as their entire behavior was determined by the value in
debug_mpsafenet.
- Alias NET_CALLOUT_MPSAFE to CALLOUT_MPSAFE.
Many remaining references to NET_.*_GIANT() and NET_CALLOUT_MPSAFE are still
present in subsystems, and will be removed in followup commits.
Reviewed by: bz, jhb
Approved by: re (kensmith)
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ath/ath_rate/amrr/amrr.c | 2 | ||||
-rw-r--r-- | sys/dev/ath/ath_rate/onoe/onoe.c | 2 | ||||
-rw-r--r-- | sys/dev/ce/if_ce.c | 7 | ||||
-rw-r--r-- | sys/dev/cp/if_cp.c | 5 | ||||
-rw-r--r-- | sys/dev/ctau/if_ct.c | 5 | ||||
-rw-r--r-- | sys/dev/cx/if_cx.c | 5 |
6 files changed, 2 insertions, 24 deletions
diff --git a/sys/dev/ath/ath_rate/amrr/amrr.c b/sys/dev/ath/ath_rate/amrr/amrr.c index da564a8..00ae568 100644 --- a/sys/dev/ath/ath_rate/amrr/amrr.c +++ b/sys/dev/ath/ath_rate/amrr/amrr.c @@ -504,7 +504,7 @@ ath_rate_attach(struct ath_softc *sc) if (asc == NULL) return NULL; asc->arc.arc_space = sizeof(struct amrr_node); - callout_init(&asc->timer, debug_mpsafenet ? CALLOUT_MPSAFE : 0); + callout_init(&asc->timer, CALLOUT_MPSAFE); ath_rate_sysctlattach(sc); return &asc->arc; diff --git a/sys/dev/ath/ath_rate/onoe/onoe.c b/sys/dev/ath/ath_rate/onoe/onoe.c index 281e4f1..eb5759e 100644 --- a/sys/dev/ath/ath_rate/onoe/onoe.c +++ b/sys/dev/ath/ath_rate/onoe/onoe.c @@ -478,7 +478,7 @@ ath_rate_attach(struct ath_softc *sc) if (osc == NULL) return NULL; osc->arc.arc_space = sizeof(struct onoe_node); - callout_init(&osc->timer, debug_mpsafenet ? CALLOUT_MPSAFE : 0); + callout_init(&osc->timer, CALLOUT_MPSAFE); ath_rate_sysctlattach(sc); return &osc->arc; diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c index d06663a..8f93667 100644 --- a/sys/dev/ce/if_ce.c +++ b/sys/dev/ce/if_ce.c @@ -2604,13 +2604,6 @@ static int ce_modevent (module_t mod, int type, void *unused) #if __FreeBSD_version < 500000 dev = makedev (CDEV_MAJOR, 0); #endif -#if __FreeBSD_version >= 501114 - if (!debug_mpsafenet && ce_mpsafenet) { - printf ("WORNING! Network stack is not MPSAFE. " - "Turning off debug.ce.mpsafenet.\n"); - ce_mpsafenet = 0; - } -#endif #if __FreeBSD_version >= 502103 if (ce_mpsafenet) ce_cdevsw.d_flags &= ~D_NEEDGIANT; diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c index 540f7ab..dbe40bc 100644 --- a/sys/dev/cp/if_cp.c +++ b/sys/dev/cp/if_cp.c @@ -2265,11 +2265,6 @@ static int cp_modevent (module_t mod, int type, void *unused) { static int load_count = 0; - if (!debug_mpsafenet && cp_mpsafenet) { - printf ("WORNING! Network stack is not MPSAFE. " - "Turning off debug.cp.mpsafenet.\n"); - cp_mpsafenet = 0; - } if (cp_mpsafenet) cp_cdevsw.d_flags &= ~D_NEEDGIANT; diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c index 7f0bad5..3769419 100644 --- a/sys/dev/ctau/if_ct.c +++ b/sys/dev/ctau/if_ct.c @@ -2206,11 +2206,6 @@ static int ct_modevent (module_t mod, int type, void *unused) { static int load_count = 0; - if (!debug_mpsafenet && ct_mpsafenet) { - printf ("WORNING! Network stack is not MPSAFE. " - "Turning off debug.ct.mpsafenet.\n"); - ct_mpsafenet = 0; - } if (ct_mpsafenet) ct_cdevsw.d_flags &= ~D_NEEDGIANT; diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c index 2bfbf22..b75f23b 100644 --- a/sys/dev/cx/if_cx.c +++ b/sys/dev/cx/if_cx.c @@ -2523,11 +2523,6 @@ static int cx_modevent (module_t mod, int type, void *unused) { static int load_count = 0; - if (!debug_mpsafenet && cx_mpsafenet) { - printf ("WORNING! Network stack is not MPSAFE. " - "Turning off debug.cx.mpsafenet.\n"); - cx_mpsafenet = 0; - } if (cx_mpsafenet) cx_cdevsw.d_flags &= ~D_NEEDGIANT; |