diff options
| author | rwatson <rwatson@FreeBSD.org> | 2007-07-14 21:49:24 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2007-07-14 21:49:24 +0000 |
| commit | ea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683 (patch) | |
| tree | 4aec3325f92defda29d478c1dd870656056e3c0a /sys/conf/options | |
| parent | 81f7b063ece187dd48e800e82efc3cc68af13eda (diff) | |
| download | FreeBSD-src-ea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683.zip FreeBSD-src-ea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683.tar.gz | |
Disconnect netatm from the build as it is not MPSAFE and relies on
NET_NEEDS_GIANT, which will shortly be removed. This is done in a
away that it may be easily reattached to the build before 7.1 if
appropriate locking is added. Specifics:
- Don't install netatm include files
- Disconnect netatm command line management tools
- Don't build libatm
- Don't include ATM parts in rescue or sysinstall
- Don't install sample configuration files and documents
- Don't build kernel support as a module or in NOTES
- Don't build netgraph wrapper nodes for netatm
This removes the last remaining consumer of NET_NEEDS_GIANT.
Reviewed by: harti
Discussed with: bz, bms
Approved by: re (kensmith)
Diffstat (limited to 'sys/conf/options')
| -rw-r--r-- | sys/conf/options | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/conf/options b/sys/conf/options index 281c40d..cd64e63 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -480,12 +480,12 @@ ZERO_COPY_SOCKETS opt_zero.h TI_PRIVATE_JUMBOS opt_ti.h TI_JUMBO_HDRSPLIT opt_ti.h -# ATM (HARP version) -ATM_CORE opt_atm.h -ATM_IP opt_atm.h -ATM_SIGPVC opt_atm.h -ATM_SPANS opt_atm.h -ATM_UNI opt_atm.h +# ATM (HARP version) - disabled as not MPSAFE in 7.0 +#ATM_CORE opt_atm.h +#ATM_IP opt_atm.h +#ATM_SIGPVC opt_atm.h +#ATM_SPANS opt_atm.h +#ATM_UNI opt_atm.h # XXX Conflict: # of devices vs network protocol (Native ATM). # This makes "atm.h" unusable. |
