svn commit: r206526 - in user/imp/tbemd/sys/modules: . hwpmc
iwnfw/iwn6000 ixgbe linux procfs syscons syscons/beastie wlan zfs
Warner Losh
imp at FreeBSD.org
Mon Apr 12 23:18:17 UTC 2010
Author: imp
Date: Mon Apr 12 23:18:16 2010
New Revision: 206526
URL: http://svn.freebsd.org/changeset/base/206526
Log:
merge from head, part 11 of many
Added:
user/imp/tbemd/sys/modules/syscons/beastie/
- copied from r206514, head/sys/modules/syscons/beastie/
Modified:
user/imp/tbemd/sys/modules/Makefile
user/imp/tbemd/sys/modules/hwpmc/Makefile
user/imp/tbemd/sys/modules/iwnfw/iwn6000/Makefile
user/imp/tbemd/sys/modules/ixgbe/Makefile
user/imp/tbemd/sys/modules/linux/Makefile
user/imp/tbemd/sys/modules/procfs/Makefile
user/imp/tbemd/sys/modules/syscons/Makefile
user/imp/tbemd/sys/modules/wlan/Makefile
user/imp/tbemd/sys/modules/zfs/Makefile
Modified: user/imp/tbemd/sys/modules/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -20,6 +20,7 @@ SUBDIR= ${_3dfx} \
aio \
alc \
ale \
+ alq \
${_amd} \
${_amdsbwd} \
${_amdtemp} \
@@ -66,7 +67,7 @@ SUBDIR= ${_3dfx} \
${_cryptodev} \
${_cs} \
${_ctau} \
- cxgb \
+ ${_cxgb} \
${_cyclic} \
dc \
dcons \
@@ -268,18 +269,18 @@ SUBDIR= ${_3dfx} \
stge \
${_streams} \
${_svr4} \
- sym \
+ ${_sym} \
${_syscons} \
sysvipc \
ti \
tl \
- ${_tmpfs} \
+ tmpfs \
trm \
${_twa} \
twe \
tx \
txp \
- uart \
+ ${_uart} \
ubsec \
udf \
udf_iconv \
@@ -312,11 +313,22 @@ SUBDIR= ${_3dfx} \
${_zfs} \
zlib \
-.if ${MACHINE_CPUARCH} != "powerpc"
+.if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \
+ ${MACHINE_CPUARCH} != "mips"
_syscons= syscons
_vpo= vpo
.endif
+.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
+# no BUS_SPACE_UNSPECIFIED
+# No barrier instruction support (specific to this driver)
+_sym= sym
+# no uart_cpu_$MACHINE_ARCH
+_uart= uart
+# intr_disable() is a macro, causes problems
+_cxgb= cxgb
+.endif
+
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
_crypto= crypto
@@ -416,7 +428,6 @@ _sppp= sppp
_stg= stg
_streams= streams
_svr4= svr4
-_tmpfs= tmpfs
_wi= wi
_xe= xe
.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
@@ -554,7 +565,6 @@ _sound= sound
_speaker= speaker
_splash= splash
_sppp= sppp
-_tmpfs= tmpfs
_twa= twa
_vesa= vesa
_x86bios= x86bios
@@ -567,10 +577,7 @@ _zfs= zfs
.endif
.if ${MACHINE_CPUARCH} == "ia64"
-# Modules not enabled on ia64 (as compared to i386) include:
-# aac acpi aout apm atspeaker drm ibcs2 linprocfs linux ncv
-# nsp s3 sbni stg vesa
-# acpi is not enabled because it is broken as a module on ia64
+_aac= aac
_aic= aic
_an= an
_arcnet= arcnet
@@ -583,12 +590,17 @@ _cm= cm
_cmx= cmx
_coff= coff
_cpufreq= cpufreq
+_dpt= dpt
_em= em
_ep= ep
+_et= et
_exca= exca
_fe= fe
+_hptiop= hptiop
+_ida= ida
_igb= igb
_iir= iir
+_ips= ips
_mly= mly
_pccard= pccard
_scsi_low= scsi_low
@@ -597,6 +609,7 @@ _sound= sound
_splash= splash
_sppp= sppp
_streams= streams
+_twa= twa
_wi= wi
_xe= xe
.endif
Modified: user/imp/tbemd/sys/modules/hwpmc/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/hwpmc/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/hwpmc/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -10,7 +10,7 @@ SRCS= hwpmc_mod.c hwpmc_logging.c vnode_
.if ${MACHINE_CPUARCH} == "amd64"
SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_piv.c hwpmc_tsc.c
-SRCS+= hwpmc_x86.c
+SRCS+= hwpmc_x86.c hwpmc_uncore.c
SRCS+= device_if.h bus_if.h
.endif
@@ -20,7 +20,7 @@ SRCS+= hwpmc_arm.c
.if ${MACHINE_CPUARCH} == "i386"
SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_piv.c hwpmc_ppro.c
-SRCS+= hwpmc_pentium.c hwpmc_tsc.c hwpmc_x86.c
+SRCS+= hwpmc_pentium.c hwpmc_tsc.c hwpmc_x86.c hwpmc_uncore.c
SRCS+= device_if.h bus_if.h
.endif
Modified: user/imp/tbemd/sys/modules/iwnfw/iwn6000/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/iwnfw/iwn6000/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/iwnfw/iwn6000/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -1,6 +1,6 @@
# $FreeBSD$
KMOD= iwn6000fw
-IMG= iwlwifi-6000-9.176.4.1
+IMG= iwlwifi-6000-9.193.4.1
.include <bsd.kmod.mk>
Modified: user/imp/tbemd/sys/modules/ixgbe/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/ixgbe/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/ixgbe/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -6,7 +6,7 @@ SRCS += ixgbe.c
# Shared source
SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c
SRCS += ixgbe_82599.c ixgbe_82598.c
-CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
+CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
clean:
rm -f device_if.h bus_if.h pci_if.h setdef* *_StripErr
Modified: user/imp/tbemd/sys/modules/linux/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/linux/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/linux/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -2,7 +2,7 @@
.if ${MACHINE_CPUARCH} == "amd64"
SFX= 32
-CFLAGS+=-DCOMPAT_IA32 -DCOMPAT_LINUX32
+CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32
.endif
.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX}
Modified: user/imp/tbemd/sys/modules/procfs/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/procfs/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/procfs/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -35,7 +35,7 @@ opt_compat.h:
echo "#define COMPAT_FREEBSD5 1" >> ${.TARGET}
echo "#define COMPAT_FREEBSD6 1" >> ${.TARGET}
.if ${MACHINE_CPUARCH} == "amd64"
- echo "#define COMPAT_IA32 1" >> ${.TARGET}
+ echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET}
echo "#define COMPAT_LINUX32 1" >> ${.TARGET}
.endif
.endif
Modified: user/imp/tbemd/sys/modules/syscons/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/syscons/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/syscons/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -1,6 +1,7 @@
# $FreeBSD$
SUBDIR= ${_apm} \
+ ${_beastie} \
blank \
${_daemon} \
${_dragon} \
@@ -18,6 +19,7 @@ _apm= apm
.endif
.if ${MACHINE_CPUARCH} != "sparc64"
+_beastie= beastie
_daemon= daemon
_dragon= dragon
_fire= fire
Modified: user/imp/tbemd/sys/modules/wlan/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/wlan/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/wlan/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -3,12 +3,13 @@
.PATH: ${.CURDIR}/../../net80211
KMOD= wlan
-SRCS= ieee80211.c ieee80211_action.c ieee80211_ageq.c \
+SRCS= ieee80211.c ieee80211_action.c ieee80211_ageq.c ieee80211_amrr.c \
ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \
ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \
ieee80211_mesh.c ieee80211_node.c ieee80211_output.c ieee80211_phy.c \
ieee80211_power.c ieee80211_proto.c ieee80211_scan.c \
- ieee80211_scan_sta.c ieee80211_radiotap.c ieee80211_regdomain.c \
+ ieee80211_scan_sta.c ieee80211_radiotap.c ieee80211_ratectl.c \
+ ieee80211_regdomain.c ieee80211_rssadapt.c \
ieee80211_ht.c ieee80211_hwmp.c ieee80211_adhoc.c ieee80211_hostap.c \
ieee80211_monitor.c ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c
SRCS+= bus_if.h device_if.h opt_inet.h opt_inet6.h opt_ipx.h opt_wlan.h \
Modified: user/imp/tbemd/sys/modules/zfs/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/zfs/Makefile Mon Apr 12 23:16:16 2010 (r206525)
+++ user/imp/tbemd/sys/modules/zfs/Makefile Mon Apr 12 23:18:16 2010 (r206526)
@@ -63,8 +63,8 @@ ZFS_SRCS= ${ZFS_OBJS:C/.o$/.c/}
SRCS+= ${ZFS_SRCS}
SRCS+= vdev_geom.c
-# Use UMA for ZIO allocation. This is not stable.
-#CFLAGS+=-DZIO_USE_UMA
+# Use UMA for ZIO allocation.
+CFLAGS+=-DZIO_USE_UMA
# Use FreeBSD's namecache.
CFLAGS+=-DFREEBSD_NAMECACHE
More information about the svn-src-user
mailing list