PERFORCE change 165314 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Sat Jun 27 15:04:00 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=165314
Change 165314 by trasz at trasz_victim on 2009/06/27 15:03:11
IFC.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#28 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#33 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw.8#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/if_bridge.4#6 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/sys_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/vm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/if_ate.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/vm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#36 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/alc/if_alc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ale/if_ale.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bfe/if_bfe.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bm.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cas/if_cas.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cpuctl/cpuctl.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cs/if_cs.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_adapter.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dc.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/de/if_de.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_em.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/et/if_et.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_ex.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fe/if_fe.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/gem/if_gem.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ie/if_ie.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgb/if_ixgb.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/le/lance.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lge/if_lge.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/malo/if_malo.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mge.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nfe/if_nfe.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nge/if_nge.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nve/if_nve.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nxge/if_nxge.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pcn/if_pcn.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pdq/pdq_ifsubr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sf/if_sf.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sis/if_sis.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sk/if_sk.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sn/if_sn.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snc/dp83932.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_ste.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/stge/if_stge.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tl/if_tl.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tsec/if_tsec.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tx/if_tx.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/txp/if_txp.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_aue.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axe.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cue.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_kue.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_rue.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_udav.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#30 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdi.h#5 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdi_util.h#3 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_upgt.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtw.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zyd.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vge/if_vge.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vr/if_vr.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wb/if_wb.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wi.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wl/if_wl.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xe/if_xe.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xl/if_xl.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/sys_machdep.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/vm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/vm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_prot.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thr.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_generic.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_process.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_extattr.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_lookup.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admsw.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/vm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#24 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_spppsubr.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/netisr.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs/nfs_nfssvc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/include/vm.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rl.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/vm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_syscalls.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/vm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/vm.h#2 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#28 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.197 2009/06/24 17:01:17 thompsa Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.198 2009/06/27 10:11:15 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -15,57 +15,72 @@
#
# 20090624: update usbdi(9)
-OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9
-OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9
-OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9
-OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9
-OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9
-OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9
-OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9
-OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9
-OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9
-OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9
-OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9
-OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9
-OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9
-OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9
-OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9
-OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9
-OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9
-OLD_FILES+=usr/share/man/man9/usbd_get_config.9
-OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9
-OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9
-OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9
-OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9
-OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9
-OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9
-OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9
-OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9
-OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9
-OLD_FILES+=usr/share/man/man9/usbd_get_speed.9
-OLD_FILES+=usr/share/man/man9/usbd_get_string.9
-OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9
-OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9
-OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9
-OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9
-OLD_FILES+=usr/share/man/man9/usbd_interface_count.9
-OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9
-OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9
-OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9
-OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9
-OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9
-OLD_FILES+=usr/share/man/man9/usbd_set_interface.9
-OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9
-OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9
-OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9
-OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9
-OLD_FILES+=usr/share/man/man9/usbd_transfer.9
-OLD_FILES+=usr/share/man/man9/usb_find_desc.9
+OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_config.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_speed.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_string.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_interface_count.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_set_interface.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9.gz
+OLD_FILES+=usr/share/man/man9/usbd_transfer.9.gz
+OLD_FILES+=usr/share/man/man9/usb_find_desc.9.gz
+# 20090623: number of headers needed for a usb driver reduced
+OLD_FILES+=usr/include/dev/usb/usb_defs.h
+OLD_FILES+=usr/include/dev/usb/usb_error.h
+OLD_FILES+=usr/include/dev/usb/usb_handle_request.h
+OLD_FILES+=usr/include/dev/usb/usb_hid.h
+OLD_FILES+=usr/include/dev/usb/usb_lookup.h
+OLD_FILES+=usr/include/dev/usb/usb_mfunc.h
+OLD_FILES+=usr/include/dev/usb/usb_parse.h
+OLD_FILES+=usr/include/dev/usb/usb_revision.h
+# 20090609: devclass_add_driver is no longer public
+OLD_FILES+=usr/share/man/man9/devclass_add_driver.9.gz
+OLD_FILES+=usr/share/man/man9/devclass_delete_driver.9.gz
+OLD_FILES+=usr/share/man/man9/devclass_find_driver.9.gz
# 20090605: removal of clists
OLD_FILES+=usr/include/sys/clist.h
# 20090602: removal of window(1)
OLD_FILES+=usr/bin/window
OLD_FILES+=usr/share/man/man1/window.1.gz
+# 20090531: bind 9.6.1rc1 import
+OLD_LIBS+=usr/lib/liblwres.so.30
# 20090530: removal of early.sh
OLD_FILES+=etc/rc.d/early.sh
# 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
@@ -105,7 +120,7 @@
OLD_DIRS+=usr/include/legacy/dev
OLD_DIRS+=usr/include/legacy
# 20090526: removal of makekey(8)
-OLD_FILES+=libexec/makekey
+OLD_FILES+=usr/libexec/makekey
OLD_FILES+=usr/share/man/man8/makekey.8.gz
# 20090522: removal of University of Michigan NFSv4 client
OLD_FILES+=etc/rc.d/idmapd
==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#33 (text+ko) ====
@@ -22,6 +22,12 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090624:
+ The ABI of various structures related to the SYSV IPC API have
+ been changed. As a result, the COMPAT_FREEBSD[456] kernel
+ options now all require COMPAT_FREEBSD7. Bump __FreeBSD_version
+ to 800100.
+
20090622:
Layout of struct vnet has changed as routing related variables
were moved to their own Vimage module. Modules need to be
@@ -1618,4 +1624,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.622 2009/06/26 01:10:10 dougb Exp $
+$FreeBSD: src/UPDATING,v 1.623 2009/06/26 17:50:52 jhb Exp $
==== //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw.8#11 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.230 2009/06/26 05:09:00 maxim Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.231 2009/06/26 19:49:06 oleg Exp $
.\"
.Dd June 24, 2009
.Dt IPFW 8
@@ -1944,13 +1944,18 @@
The default value is 0, meaning no delay.
.Pp
.It Cm burst Ar size
-If the data rate exceeds the pipe bandwith limit
-(and pipe was idle long enough),
+If the data to be sent exceeds the pipe's bandwidth limit
+(and the pipe was previously idle), up to
.Ar size
-bytes of data is allowed to bypass the
+bytes of data are allowed to bypass the
.Nm dummynet
-scheduler (i.e. it will be sent without shaping), then transmission rate
-will not exceed pipe bandwidth. Effective burst size calculated as follows:
+scheduler, and will be sent as fast as the physical link allows.
+Any additional data will be transmitted at the rate specified
+by the
+.Nm pipe
+bandwidth.
+The burst size depends on how long the pipe has been idle;
+the effective burst size is calculated as follows:
MAX(
.Ar size
,
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/sys_machdep.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.91 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.92 2009/06/27 13:58:44 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@
* XXXKIB check that the BSM generation code knows to encode
* the op argument.
*/
- AUDIT_ARG(cmd, uap->op);
+ AUDIT_ARG_CMD(uap->op);
if (uap_space == UIO_USERSPACE) {
error = copyin(uap->parms, &la, sizeof(struct i386_ldt_args));
if (error != 0)
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/vm.h#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/vm.h,v 1.1 2009/06/26 04:47:43 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/vm.h,v 1.2 2009/06/26 16:22:24 alc Exp $
*/
#ifndef _MACHINE_VM_H_
@@ -42,4 +42,4 @@
#define VM_CACHE_DEFAULT VM_CACHE_WRITE_BACK
-#endif /* !_MACHINE_PMAP_H_ */
+#endif /* !_MACHINE_VM_H_ */
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/if_ate.c#9 (text) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.38 2009/06/11 17:05:13 avg Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.39 2009/06/26 11:45:06 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -413,7 +413,7 @@
*/
mcaf[0] = 0;
mcaf[1] = 0;
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -421,14 +421,14 @@
ifma->ifma_addr), ETHER_ADDR_LEN) >> 26;
af[index >> 3] |= 1 << (index & 7);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
/*
* Write the hash to the hash register. This card can also
* accept unicast packets as well as multicast packets using this
* register for easier bridging operations, but we don't take
* advantage of that. Locks here are to avoid LOR with the
- * IF_ADDR_LOCK, but might not be strictly necessary.
+ * if_maddr_rlock, but might not be strictly necessary.
*/
WR4(sc, ETH_HSL, mcaf[0]);
WR4(sc, ETH_HSH, mcaf[1]);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/vm.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/vm.h,v 1.1 2009/06/26 04:47:43 alc Exp $
+ * $FreeBSD: src/sys/arm/include/vm.h,v 1.2 2009/06/26 16:22:24 alc Exp $
*/
#ifndef _MACHINE_VM_H_
@@ -32,4 +32,4 @@
/* Cache control is not (yet) implemented. */
#define VM_CACHE_DEFAULT 0
-#endif /* !_MACHINE_PMAP_H_ */
+#endif /* !_MACHINE_VM_H_ */
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#9 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.19 2009/06/17 02:53:05 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.20 2009/06/26 11:45:06 rwatson Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -435,7 +435,7 @@
memset(clr, 0, ETHER_ADDR_LEN);
memset(set, 0xff, ETHER_ADDR_LEN);
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -445,7 +445,7 @@
set[i] &= mac[i];
}
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
for (i = 0; i < ETHER_ADDR_LEN; i++) {
mask[i] = set[i] | ~clr[i];
==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#13 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.91 2009/06/24 21:10:52 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.92 2009/06/27 13:58:44 rwatson Exp $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -2924,7 +2924,7 @@
struct uio *auio;
int error;
- AUDIT_ARG(fflags, uap->flags);
+ AUDIT_ARG_FFLAGS(uap->flags);
/*
* Filter out MNT_ROOTFS. We do not want clients of nmount() in
==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_signal.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.66 2008/10/19 10:02:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.67 2009/06/27 13:58:44 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -546,8 +546,8 @@
ksiginfo_t ksi;
int error;
- AUDIT_ARG(signum, signum);
- AUDIT_ARG(pid, pid);
+ AUDIT_ARG_SIGNUM(signum);
+ AUDIT_ARG_PID(pid);
/*
* Allow signal 0 as a means to check for privileges
@@ -563,7 +563,7 @@
return (ESRCH);
}
- AUDIT_ARG(process, p);
+ AUDIT_ARG_PROCESS(p);
error = p_cansignal(td, p, signum);
if (error)
goto out;
==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#36 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1548 2009/06/23 06:11:04 zec Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1549 2009/06/26 17:50:52 jhb Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -301,6 +301,9 @@
# Old tty interface.
options COMPAT_43TTY
+# Note that as a general rule, COMPAT_FREEBSD<n> depends on
+# COMPAT_FREEBSD<n+1>, COMPAT_FREEBSD<n+2>, etc.
+
# Enable FreeBSD4 compatibility syscalls
options COMPAT_FREEBSD4
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_ae.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.3 2009/02/04 20:35:31 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.4 2009/06/26 11:45:06 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2073,7 +2073,7 @@
* Load multicast tables.
*/
bzero(mchash, sizeof(mchash));
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -2081,7 +2081,7 @@
ifma->ifma_addr), ETHER_ADDR_LEN);
mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
AE_WRITE_4(sc, AE_REG_MHT0, mchash[0]);
AE_WRITE_4(sc, AE_REG_MHT1, mchash[1]);
AE_WRITE_4(sc, AE_MAC_REG, rxcfg);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#10 (text+ko) ====
@@ -28,7 +28,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.9 2009/05/20 03:33:27 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.10 2009/06/26 11:45:06 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3131,7 +3131,7 @@
/* Program new filter. */
bzero(mchash, sizeof(mchash));
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &sc->age_ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -3139,7 +3139,7 @@
ifma->ifma_addr), ETHER_ADDR_LEN);
mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
CSR_WRITE_4(sc, AGE_MAR0, mchash[0]);
CSR_WRITE_4(sc, AGE_MAR1, mchash[1]);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/alc/if_alc.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
/* Driver for Atheros AR8131/AR8132 PCIe Ethernet. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.1 2009/06/10 02:07:58 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.2 2009/06/26 11:45:06 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3446,7 +3446,7 @@
goto chipit;
}
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &sc->alc_ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -3454,7 +3454,7 @@
ifma->ifma_addr), ETHER_ADDR_LEN);
mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
chipit:
CSR_WRITE_4(sc, ALC_MAR0, mchash[0]);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ale/if_ale.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.4 2009/03/05 00:04:32 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.5 2009/06/26 11:45:06 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3048,7 +3048,7 @@
/* Program new filter. */
bzero(mchash, sizeof(mchash));
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &sc->ale_ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -3056,7 +3056,7 @@
ifma->ifma_addr), ETHER_ADDR_LEN);
mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
CSR_WRITE_4(sc, ALE_MAR0, mchash[0]);
CSR_WRITE_4(sc, ALE_MAR1, mchash[1]);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#22 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.258 2009/06/13 23:36:54 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.259 2009/06/26 11:45:06 rwatson Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -2408,7 +2408,7 @@
* Merge multicast addresses to form the hardware filter.
*/
mfilt[0] = mfilt[1] = 0;
- IF_ADDR_LOCK(ifp); /* XXX need some fiddling to remove? */
+ if_maddr_rlock(ifp); /* XXX need some fiddling to remove? */
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
caddr_t dl;
u_int32_t val;
@@ -2423,7 +2423,7 @@
pos &= 0x3f;
mfilt[pos / 32] |= (1 << (pos % 32));
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
} else
mfilt[0] = mfilt[1] = ~0;
ath_hal_setmcastfilter(sc->sc_ah, mfilt[0], mfilt[1]);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#11 (text) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.55 2009/06/23 22:19:27 davidch Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.56 2009/06/26 11:45:06 rwatson Exp $");
/*
* The following controllers are supported by this driver:
@@ -7260,7 +7260,7 @@
/* Accept one or more multicast(s). */
DBPRINT(sc, BCE_INFO_MISC, "Enabling selective multicast mode.\n");
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -7268,7 +7268,7 @@
ifma->ifma_addr), ETHER_ADDR_LEN) & 0xFF;
hashes[(h & 0xE0) >> 5] |= 1 << (h & 0x1F);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
for (i = 0; i < NUM_MC_HASH_REGISTERS; i++)
REG_WR(sc, BCE_EMAC_MULTICAST_HASH0 + (i * 4), hashes[i]);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bfe/if_bfe.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.54 2008/08/22 06:46:55 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.55 2009/06/26 11:45:06 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1111,14 +1111,14 @@
val |= BFE_RXCONF_ALLMULTI;
else {
val &= ~BFE_RXCONF_ALLMULTI;
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
bfe_cam_write(sc,
LLADDR((struct sockaddr_dl *)ifma->ifma_addr), i++);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
}
CSR_WRITE_4(sc, BFE_RXCONF, val);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#11 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.225 2009/05/30 17:56:19 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.226 2009/06/26 11:45:06 rwatson Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -1186,7 +1186,7 @@
CSR_WRITE_4(sc, BGE_MAR0 + (i * 4), 0);
/* Now program new ones. */
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -1194,7 +1194,7 @@
ifma->ifma_addr), ETHER_ADDR_LEN) & 0x7F;
hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
for (i = 0; i < 4; i++)
CSR_WRITE_4(sc, BGE_MAR0 + (i * 4), hashes[i]);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bm.c#7 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bm/if_bm.c,v 1.6 2009/02/04 22:16:27 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bm/if_bm.c,v 1.7 2009/06/26 11:45:06 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1072,7 +1072,7 @@
/* Clear the hash table. */
memset(hash, 0, sizeof(hash));
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(inm, &ifp->if_multiaddrs, ifma_link) {
if (inm->ifma_addr->sa_family != AF_LINK)
continue;
@@ -1085,7 +1085,7 @@
/* Set the corresponding bit in the filter. */
hash[crc >> 4] |= 1 << (crc & 0xf);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
}
/* Write out new hash table */
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cas/if_cas.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cas/if_cas.c,v 1.3 2009/06/25 16:38:16 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cas/if_cas.c,v 1.4 2009/06/26 11:45:06 rwatson Exp $");
/*
* driver for Sun Cassini/Cassini+ and National Semiconductor DP83065
@@ -2531,7 +2531,7 @@
/* Clear the hash table. */
memset(hash, 0, sizeof(hash));
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(inm, &ifp->if_multiaddrs, ifma_link) {
if (inm->ifma_addr->sa_family != AF_LINK)
continue;
@@ -2544,7 +2544,7 @@
/* Set the corresponding bit in the filter. */
hash[crc >> 4] |= 1 << (15 - (crc & 15));
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
v |= CAS_MAC_RX_CONF_HFILTER;
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cpuctl/cpuctl.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cpuctl/cpuctl.c,v 1.3 2008/09/27 08:51:18 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cpuctl/cpuctl.c,v 1.4 2009/06/26 22:13:15 stas Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -222,14 +222,17 @@
* Explicitly clear cpuid data to avoid returning stale
* info
*/
- data->data = 0;
DPRINTF("[cpuctl,%d]: operating on MSR %#0x for %d cpu\n", __LINE__,
data->msr, cpu);
oldcpu = td->td_oncpu;
is_bound = cpu_sched_is_bound(td);
set_cpu(cpu, td);
- ret = cmd == CPUCTL_RDMSR ? rdmsr_safe(data->msr, &data->data) :
- wrmsr_safe(data->msr, data->data);
+ if (cmd == CPUCTL_RDMSR) {
+ data->data = 0;
+ ret = rdmsr_safe(data->msr, &data->data);
+ } else {
+ ret = wrmsr_safe(data->msr, data->data);
+ }
restore_cpu(oldcpu, is_bound, td);
return (ret);
}
@@ -368,7 +371,7 @@
/*
* Perform update.
*/
- wrmsr_safe(MSR_K8_UCODE_UPDATE, (uintptr_t)args->data);
+ wrmsr_safe(MSR_K8_UCODE_UPDATE, (uintptr_t)ptr);
/*
* Serialize instruction flow.
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cs/if_cs.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.54 2008/07/09 16:47:55 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.55 2009/06/26 11:45:06 rwatson Exp $");
/*
*
@@ -1022,7 +1022,7 @@
* Set up the filter to only accept multicast
* frames we're interested in.
*/
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
struct sockaddr_dl *dl =
(struct sockaddr_dl *)ifma->ifma_addr;
@@ -1032,7 +1032,7 @@
mask = (u_int16_t) (1 << (index & 0xf));
af[port] |= mask;
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
}
cs_writereg(sc, PP_LAF + 0, af[0]);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_adapter.h#10 (text+ko) ====
@@ -25,7 +25,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.46 2009/06/19 23:34:32 kmacy Exp $
+$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.47 2009/06/26 19:04:08 rwatson Exp $
***************************************************************************/
@@ -467,7 +467,7 @@
struct ifmultiaddr *ifma;
int i = 0;
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -477,8 +477,7 @@
}
i++;
}
- IF_ADDR_UNLOCK(ifp);
-
+ if_maddr_runlock(ifp);
rm->idx++;
return (macaddr);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dc.c#8 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.200 2009/05/30 15:14:44 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.201 2009/06/26 11:45:06 rwatson Exp $");
/*
* DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
@@ -1110,7 +1110,7 @@
else
DC_CLRBIT(sc, DC_NETCFG, DC_NETCFG_RX_ALLMULTI);
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -1118,7 +1118,7 @@
LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
sp[h >> 4] |= htole32(1 << (h & 0xF));
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
if (ifp->if_flags & IFF_BROADCAST) {
h = dc_mchash_le(sc, ifp->if_broadcastaddr);
@@ -1185,7 +1185,7 @@
return;
/* Now program new ones. */
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -1200,7 +1200,7 @@
else
hashes[1] |= (1 << (h - 32));
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
CSR_WRITE_4(sc, DC_AL_MAR0, hashes[0]);
CSR_WRITE_4(sc, DC_AL_MAR1, hashes[1]);
@@ -1258,7 +1258,7 @@
return;
/* now program new ones */
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -1268,7 +1268,7 @@
else
hashes[1] |= (1 << (h - 32));
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
CSR_WRITE_4(sc, DC_AX_FILTIDX, DC_AX_FILTIDX_MAR0);
CSR_WRITE_4(sc, DC_AX_FILTDATA, hashes[0]);
@@ -1313,7 +1313,7 @@
else
DC_CLRBIT(sc, DC_NETCFG, DC_NETCFG_RX_ALLMULTI);
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -1321,7 +1321,7 @@
LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
sp[h >> 4] |= htole32(1 << (h & 0xF));
}
- IF_ADDR_UNLOCK(ifp);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list