PERFORCE change 161009 for review

Marko Zec zec at FreeBSD.org
Thu Apr 23 22:41:42 UTC 2009


http://perforce.freebsd.org/chv.cgi?CH=161009

Change 161009 by zec at zec_amdx2 on 2009/04/23 22:40:40

	IFC @ 161003

Affected files ...

.. //depot/projects/vimage/src/share/man/man4/cpuctl.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/ed.4#4 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/glxsb.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.powerpc/Makefile#3 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.powerpc/bm.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.powerpc/tsec.4#1 branch
.. //depot/projects/vimage/src/share/man/man4/route.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/u3g.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/vlan.4#2 integrate
.. //depot/projects/vimage/src/share/man/man9/altq.9#2 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#19 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#8 integrate
.. //depot/projects/vimage/src/sys/amd64/include/param.h#6 integrate
.. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#16 integrate
.. //depot/projects/vimage/src/sys/arm/at91/at91.c#10 integrate
.. //depot/projects/vimage/src/sys/arm/at91/at91_cfata.c#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/at91_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/arm/at91/at91rm92reg.h#5 integrate
.. //depot/projects/vimage/src/sys/arm/at91/files.at91#6 integrate
.. //depot/projects/vimage/src/sys/arm/conf/AVILA.hints#5 integrate
.. //depot/projects/vimage/src/sys/arm/conf/BWCT#8 integrate
.. //depot/projects/vimage/src/sys/arm/conf/BWCT.hints#2 integrate
.. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA.hints#3 integrate
.. //depot/projects/vimage/src/sys/arm/include/param.h#3 integrate
.. //depot/projects/vimage/src/sys/bsm/audit.h#10 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_domain.h#2 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#11 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_record.h#9 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#8 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#9 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_emul.c#8 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_emul.h#7 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#9 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#47 integrate
.. //depot/projects/vimage/src/sys/conf/files#63 integrate
.. //depot/projects/vimage/src/sys/conf/options#46 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed_cbus.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed_isa.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed_pci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_edvar.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/ds133x.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/ds1672.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mlx/mlx.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/mly/mly.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/mse/mse.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/nve/if_nve.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#14 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#15 integrate
.. //depot/projects/vimage/src/sys/dev/re/if_re.c#25 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#47 integrate
.. //depot/projects/vimage/src/sys/dev/xl/if_xl.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#5 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rename.c#5 integrate
.. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#12 integrate
.. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#18 integrate
.. //depot/projects/vimage/src/sys/i386/include/param.h#5 integrate
.. //depot/projects/vimage/src/sys/ia64/include/param.h#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_cpuset.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exit.c#29 integrate
.. //depot/projects/vimage/src/sys/kern/kern_malloc.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/kern_uuid.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_acl.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_cache.c#25 integrate
.. //depot/projects/vimage/src/sys/mips/include/param.h#3 integrate
.. //depot/projects/vimage/src/sys/mips/mips/pmap.c#10 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#45 integrate
.. //depot/projects/vimage/src/sys/net/flowtable.c#1 branch
.. //depot/projects/vimage/src/sys/net/flowtable.h#1 branch
.. //depot/projects/vimage/src/sys/net/if.c#78 integrate
.. //depot/projects/vimage/src/sys/net/if.h#11 integrate
.. //depot/projects/vimage/src/sys/net/if_dead.c#1 branch
.. //depot/projects/vimage/src/sys/net/if_llatbl.c#5 integrate
.. //depot/projects/vimage/src/sys/net/if_mib.c#13 integrate
.. //depot/projects/vimage/src/sys/net/if_stf.c#17 integrate
.. //depot/projects/vimage/src/sys/net/if_tun.c#16 integrate
.. //depot/projects/vimage/src/sys/net/if_var.h#33 integrate
.. //depot/projects/vimage/src/sys/net/if_vlan.c#18 integrate
.. //depot/projects/vimage/src/sys/net/rtsock.c#31 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#8 integrate
.. //depot/projects/vimage/src/sys/netatalk/at_control.c#3 integrate
.. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#25 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.c#33 integrate
.. //depot/projects/vimage/src/sys/netinet/in.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet/in_mcast.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#54 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_divert.c#28 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#73 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#14 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#27 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#54 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_mroute.h#6 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#35 integrate
.. //depot/projects/vimage/src/sys/netinet/vinet.h#55 integrate
.. //depot/projects/vimage/src/sys/netinet6/icmp6.c#42 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6.c#32 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#37 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_var.h#10 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#54 integrate
.. //depot/projects/vimage/src/sys/netinet6/mld6.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.c#48 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#33 integrate
.. //depot/projects/vimage/src/sys/pci/if_rlreg.h#20 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/trap.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/locore.S#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/swtch.S#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/vm_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/hid.h#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/param.h#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/trap_aim.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/vmparam.h#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/cpu.c#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#12 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit.c#17 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#14 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_domain.c#2 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_fcntl.c#2 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#13 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_private.h#10 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#19 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/param.h#4 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/param.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/acl.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/malloc.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#49 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extern.h#2 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#13 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#14 integrate
.. //depot/projects/vimage/src/sys/vm/vm_fault.c#14 integrate
.. //depot/projects/vimage/src/sys/vm/vm_map.c#16 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#21 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.c#14 integrate

Differences ...

==== //depot/projects/vimage/src/share/man/man4/cpuctl.4#3 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/cpuctl.4,v 1.5 2009/01/05 20:46:46 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/cpuctl.4,v 1.6 2009/04/23 08:37:56 brueffer Exp $
 .\"
 .Dd May 31, 2008
 .Dt CPUCTL 4
@@ -142,7 +142,7 @@
 The
 .Nm
 driver first appeared in
-.Fx 8.0 .
+.Fx 7.2 .
 .Sh BUGS
 Yes, probably, report if any.
 .Sh AUTHORS

==== //depot/projects/vimage/src/share/man/man4/ed.4#4 (text+ko) ====

@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ed.4,v 1.60 2009/04/10 15:01:48 imp Exp $
+.\" $FreeBSD: src/share/man/man4/ed.4,v 1.61 2009/04/18 04:21:04 imp Exp $
 .\"
 .Dd April 9, 2009
 .Dt ED 4
@@ -311,8 +311,6 @@
 .Bl -bullet -compact
 .It
 Mitsubishi LAN Adapter B8895
-.It
-D-Link DE-650
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -395,13 +393,6 @@
 undocumented.
 Neither the NE2000 nor the WD83x0 drivers work with this card.
 .Pp
-The D-LINK DE-650 has funky resources that differ from other cards and could
-likely be made to work.
-Its shared memory interface conflicts with other resources on many
-laptops and cannot be moved.
-The pccard(4) layer does not support activating a CFE that it fails to
-allocate all the resources for.
-.Pp
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,

==== //depot/projects/vimage/src/share/man/man4/man4.i386/glxsb.4#2 (text+ko) ====

@@ -14,7 +14,7 @@
 .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/man4.i386/glxsb.4,v 1.3 2008/08/11 08:42:31 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/glxsb.4,v 1.4 2009/04/23 08:37:56 brueffer Exp $
 .\"
 .Dd June 8, 2008
 .Dt GLXSB 4 i386
@@ -82,7 +82,7 @@
 The
 .Nm
 device driver was imported into
-.Fx 8.0 .
+.Fx 7.1 .
 .Sh AUTHORS
 .An -nosplit
 The

==== //depot/projects/vimage/src/share/man/man4/man4.powerpc/Makefile#3 (text+ko) ====

@@ -1,10 +1,11 @@
-# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.5 2009/01/26 01:08:24 nwhitehorn Exp $
+# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.6 2009/04/22 15:25:00 raj Exp $
 
 MAN=	bm.4 \
 	pmu.4 \
 	powermac_nvram.4 \
 	snd_ai2s.4 \
-	snd_davbus.4
+	snd_davbus.4 \
+	tsec.4
 
 MANSUBDIR=/powerpc
 

==== //depot/projects/vimage/src/share/man/man4/man4.powerpc/bm.4#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/man4.powerpc/bm.4,v 1.1 2008/07/04 14:51:42 nwhitehorn Exp $
+.\" $FreeBSD: src/share/man/man4/man4.powerpc/bm.4,v 1.2 2009/04/23 08:37:56 brueffer Exp $
 .\"
 .Dd July 3, 2008
 .Dt BM 4
@@ -76,7 +76,7 @@
 The
 .Nm
 device driver appeared in
-.Fx 8.0 .
+.Fx 7.1 .
 .Sh AUTHORS
 .An -nosplit
 The

==== //depot/projects/vimage/src/share/man/man4/route.4#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)route.4	8.6 (Berkeley) 4/19/94
-.\" $FreeBSD: src/share/man/man4/route.4,v 1.21 2008/12/15 06:10:57 qingli Exp $
+.\" $FreeBSD: src/share/man/man4/route.4,v 1.23 2009/04/22 12:52:12 trasz Exp $
 .\"
 .Dd November 4, 2004
 .Dt ROUTE 4
@@ -196,6 +196,8 @@
 #define	RTM_REDIRECT	0x6    /* Told to use different route */
 #define	RTM_MISS	0x7    /* Lookup failed on this address */
 #define	RTM_LOCK	0x8    /* fix specified metrics */
+#define	RTM_OLDADD	0x9    /* caused by SIOCADDRT */
+#define	RTM_OLDDEL	0xa    /* caused by SIOCDELRT */
 #define	RTM_RESOLVE	0xb    /* request to resolve dst to LL addr - unused */
 #define	RTM_NEWADDR	0xc    /* address being added to iface */
 #define	RTM_DELADDR	0xd    /* address being removed from iface */
@@ -203,6 +205,7 @@
 #define	RTM_NEWMADDR	0xf    /* mcast group membership being added to if */
 #define	RTM_DELMADDR	0x10   /* mcast group membership being deleted */
 #define	RTM_IFANNOUNCE	0x11   /* iface arrival/departure */
+#define	RTM_IEEE80211	0x12   /* IEEE80211 wireless event */
 .Ed
 .Pp
 A message header consists of one of the following:
@@ -217,7 +220,7 @@
     pid_t   rtm_pid;            /* identify sender */
     int     rtm_seq;            /* for sender to identify action */
     int     rtm_errno;          /* why failed */
-    int     rtm_use;            /* from rtentry */
+    int     rtm_fmask;          /* bitmask used in RTM_CHANGE message */
     u_long  rtm_inits;          /* which metrics we are initializing */
     struct  rt_metrics rtm_rmx;	/* metrics themselves */
 };
@@ -301,6 +304,7 @@
 #define	RTV_SSTHRESH  0x20   /* init or lock _ssthresh */
 #define	RTV_RTT       0x40   /* init or lock _rtt */
 #define	RTV_RTTVAR    0x80   /* init or lock _rttvar */
+#define	RTV_WEIGHT    0x100  /* init or lock _weight */
 .Ed
 .Pp
 Specifiers for which addresses are present in the messages are:

==== //depot/projects/vimage/src/share/man/man4/u3g.4#3 (text+ko) ====

@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.9 2009/02/13 20:09:11 n_hibma Exp $
+.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.10 2009/04/23 08:37:56 brueffer Exp $
 .\"
 .Dd October 7, 2008
 .Dt U3G 4
@@ -109,7 +109,7 @@
 The
 .Nm
 driver appeared in
-.Fx 8.0 ,
+.Fx 7.2 ,
 is based on the
 .Xr uark 4
 driver, and written by

==== //depot/projects/vimage/src/share/man/man4/vlan.4#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/share/man/man4/vlan.4,v 1.50 2008/11/12 10:31:06 yongari Exp $
+.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.51 2009/04/20 15:01:45 antoine Exp $
 .\"
 .Dd November 12, 2008
 .Dt VLAN 4
@@ -36,7 +36,6 @@
 place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
-.Cd "device miibus"
 .Cd "device vlan"
 .Ed
 .Pp
@@ -193,18 +192,7 @@
 .Nm
 can be corrected manually if used in conjunction with such a parent interface.
 .Sh SEE ALSO
-.Xr kqueue 2 ,
-.Xr miibus 4 ,
 .Xr ifconfig 8 ,
 .Xr sysctl 8
 .Sh BUGS
 No 802.1Q features except VLAN tagging are implemented.
-.Pp
-.Dv EVFILT_NETDEV
-events on a
-.Nm
-interface will be sent through
-.Xr kqueue 2
-only if the parent interface uses
-.Xr miibus 4
-for link state notification.

==== //depot/projects/vimage/src/share/man/man9/altq.9#2 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/altq.9,v 1.5 2004/10/07 12:10:25 mlaier Exp $
+.\" $FreeBSD: src/share/man/man9/altq.9,v 1.6 2009/04/18 20:09:43 rwatson Exp $
 .\"
 .Dd August 25, 2004
 .Dt ALTQ 9
@@ -543,11 +543,6 @@
 and
 .Fn IFQ_DRV_PURGE
 are protected with a mutex of some kind.
-Setting
-.Dv IFF_NEEDSGIANT
-in
-.Va if_flags
-might also be appropriate.
 .Ss Attach routine
 Use
 .Fn IFQ_SET_MAXLEN

==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#11 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.91 2009/04/23 20:24:19 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -95,7 +95,6 @@
 	int		total_deferred;
 	int		map_count;
 	bus_size_t	alignment;
-	bus_size_t	boundary;
 	bus_addr_t	lowaddr;
 	char		zoneid[8];
 	char		lowaddrid[20];
@@ -978,7 +977,6 @@
 	/* Check to see if we already have a suitable zone */
 	STAILQ_FOREACH(bz, &bounce_zone_list, links) {
 		if ((dmat->alignment <= bz->alignment)
-		 && (dmat->boundary <= bz->boundary)
 		 && (dmat->lowaddr >= bz->lowaddr)) {
 			dmat->bounce_zone = bz;
 			return (0);
@@ -994,8 +992,7 @@
 	bz->reserved_bpages = 0;
 	bz->active_bpages = 0;
 	bz->lowaddr = dmat->lowaddr;
-	bz->alignment = dmat->alignment;
-	bz->boundary = dmat->boundary;
+	bz->alignment = MAX(dmat->alignment, PAGE_SIZE);
 	bz->map_count = 0;
 	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
 	busdma_zonecount++;
@@ -1042,9 +1039,6 @@
 	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
 	    "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "boundary", CTLFLAG_RD, &bz->boundary, 0, "");
 
 	return (0);
 }
@@ -1069,7 +1063,7 @@
 							 M_NOWAIT, 0ul,
 							 bz->lowaddr,
 							 PAGE_SIZE,
-							 bz->boundary);
+							 0);
 		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;

==== //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#19 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.302 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.303 2009/04/22 21:40:37 jhb Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -354,8 +354,6 @@
 	} else
 		KASSERT(boot_cpu_id == PCPU_GET(apic_id),
 		    ("BSP's APIC ID doesn't match boot_cpu_id"));
-	cpu_apic_ids[0] = boot_cpu_id;
-	apic_cpuids[boot_cpu_id] = 0;
 
 	/* Setup the initial logical CPUs info. */
 	logical_cpus = logical_cpus_mask = 0;
@@ -418,28 +416,30 @@
 void
 cpu_mp_announce(void)
 {
-	int i, x;
 	const char *hyperthread;
+	int i;
 
-	/* List CPUs */
+	/* List active CPUs first. */
 	printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id);
-	for (i = 1, x = 0; x <= MAX_APIC_ID; x++) {
-		if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp)
+	for (i = 1; i < mp_ncpus; i++) {
+		if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread)
+			hyperthread = "/HT";
+		else
+			hyperthread = "";
+		printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread,
+		    cpu_apic_ids[i]);
+	}
+
+	/* List disabled CPUs last. */
+	for (i = 0; i <= MAX_APIC_ID; i++) {
+		if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled)
 			continue;
-		if (cpu_info[x].cpu_hyperthread) {
+		if (cpu_info[i].cpu_hyperthread)
 			hyperthread = "/HT";
-		} else {
+		else
 			hyperthread = "";
-		}
-		if (cpu_info[x].cpu_disabled)
-			printf("  cpu (AP%s): APIC ID: %2d (disabled)\n",
-			    hyperthread, x);
-		else {
-			KASSERT(i < mp_ncpus,
-			    ("mp_ncpus and actual cpus are out of whack"));
-			printf(" cpu%d (AP%s): APIC ID: %2d\n", i++,
-			    hyperthread, x);
-		}
+		printf("  cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread,
+		    i);
 	}
 }
 
@@ -693,11 +693,19 @@
 
 	/*
 	 * Assign CPU IDs to local APIC IDs and disable any CPUs
-	 * beyond MAXCPU.  CPU 0 has already been assigned to the BSP,
-	 * so we only have to assign IDs for APs.
+	 * beyond MAXCPU.  CPU 0 is always assigned to the BSP.
+	 *
+	 * To minimize confusion for userland, we attempt to number
+	 * CPUs such that all threads and cores in a package are
+	 * grouped together.  For now we assume that the BSP is always
+	 * the first thread in a package and just start adding APs
+	 * starting with the BSP's APIC ID.
 	 */
 	mp_ncpus = 1;
-	for (i = 0; i <= MAX_APIC_ID; i++) {
+	cpu_apic_ids[0] = boot_cpu_id;
+	apic_cpuids[boot_cpu_id] = 0;
+	for (i = boot_cpu_id + 1; i != boot_cpu_id;
+	     i == MAX_APIC_ID ? i = 0 : i++) {
 		if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp ||
 		    cpu_info[i].cpu_disabled)
 			continue;

==== //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#8 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
-# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.16 2009/04/15 22:38:22 marcel Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $
 
 machine		amd64
 
@@ -20,3 +20,5 @@
 options 	GEOM_PART_EBR
 options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_PART_MBR
+
+options		FLOWTABLE

==== //depot/projects/vimage/src/sys/amd64/include/param.h#6 (text+ko) ====

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.27 2009/04/20 12:59:23 rwatson Exp $
  */
 
 /*
@@ -89,6 +89,12 @@
 #define	ALIGN(p)		_ALIGN(p)
 #define	ALIGNED_POINTER(p,t)	_ALIGNED_POINTER(p,t)
 
+/*
+ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
+ * architecture.  It should be used with appropriate caution.
+ */
+#define	CACHE_LINE_SHIFT	6
+#define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
 
 /* Size of the level 1 page table units */
 #define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))

==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#16 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.46 2009/04/17 13:22:18 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.47 2009/04/23 20:24:19 jhb Exp $");
 
 /*
  * ARM bus dma support routines
@@ -114,7 +114,6 @@
 	int		total_deferred;
 	int		map_count;
 	bus_size_t	alignment;
-	bus_size_t	boundary;
 	bus_addr_t	lowaddr;
 	char		zoneid[8];
 	char		lowaddrid[20];
@@ -689,10 +688,10 @@
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			if (pmap != NULL)
+			if (__predict_true(pmap == pmap_kernel()))
+				paddr = pmap_kextract(vaddr);
+			else
 				paddr = pmap_extract(pmap, vaddr);
-			else
-				paddr = pmap_kextract(vaddr);
 			if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
 			    run_filter(dmat, paddr) != 0)
 				map->pagesneeded++;
@@ -1267,7 +1266,6 @@
 	/* Check to see if we already have a suitable zone */
 	STAILQ_FOREACH(bz, &bounce_zone_list, links) {
 		if ((dmat->alignment <= bz->alignment)
-		 && (dmat->boundary <= bz->boundary)
 		 && (dmat->lowaddr >= bz->lowaddr)) {
 			dmat->bounce_zone = bz;
 			return (0);
@@ -1283,8 +1281,7 @@
 	bz->reserved_bpages = 0;
 	bz->active_bpages = 0;
 	bz->lowaddr = dmat->lowaddr;
-	bz->alignment = dmat->alignment;
-	bz->boundary = dmat->boundary;
+	bz->alignment = MAX(dmat->alignment, PAGE_SIZE);
 	bz->map_count = 0;
 	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
 	busdma_zonecount++;
@@ -1331,9 +1328,6 @@
 	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
 	    "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "boundary", CTLFLAG_RD, &bz->boundary, 0, "");
 
 	return (0);
 }
@@ -1358,7 +1352,7 @@
 							 M_NOWAIT, 0ul,
 							 bz->lowaddr,
 							 PAGE_SIZE,
-							 bz->boundary);
+							 0);
 		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;

==== //depot/projects/vimage/src/sys/arm/at91/at91.c#10 (text) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.22 2009/01/22 21:54:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.23 2009/04/22 23:54:41 stas Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -418,6 +418,11 @@
 		AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE,
 		AT91RM92_IRQ_UHP
 	},
+	{
+		"at91_cfata", 0,
+		AT91RM92_CF_BASE, AT91RM92_CF_SIZE,
+		-1
+	},
 	{	0, 0, 0, 0, 0 }
 };
 
@@ -507,6 +512,9 @@
 	if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE,
 	    AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0)
 		panic("at91_attach: failed to set up ohci memory");
+	if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_CF_BASE,
+	    AT91RM92_CF_BASE + AT91RM92_CF_SIZE - 1) != 0)
+		panic("at91_attach: failed to set up CompactFlash ATA memory");
 
 	for (i = 0; i < 32; i++) {
 		bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + 

==== //depot/projects/vimage/src/sys/arm/at91/at91_machdep.c#3 (text+ko) ====

@@ -46,7 +46,7 @@
 #include "opt_msgbuf.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.3 2008/12/01 10:16:25 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.4 2009/04/22 23:54:41 stas Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
@@ -179,6 +179,14 @@
 		PTE_NOCACHE,
 	},
 	{
+		/* CompactFlash controller. */
+		AT91RM92_CF_BASE,
+		AT91RM92_CF_PA_BASE,
+		AT91RM92_CF_SIZE,
+		VM_PROT_READ|VM_PROT_WRITE,
+		PTE_NOCACHE,
+	},
+	{
 		0,
 		0,
 		0,

==== //depot/projects/vimage/src/sys/arm/at91/at91rm92reg.h#5 (text) ====

@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.7 2008/11/25 00:13:26 imp Exp $ */
+/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.8 2009/04/22 23:54:41 stas Exp $ */
 
 #ifndef AT91RM92REG_H_
 #define AT91RM92REG_H_
@@ -341,6 +341,10 @@
 #define AT91RM92_OHCI_PA_BASE	0x00300000
 #define AT91RM92_OHCI_SIZE	0x00100000
 
+#define	AT91RM92_CF_BASE	0xdfd00000
+#define	AT91RM92_CF_PA_BASE	0x51400000
+#define	AT91RM92_CF_SIZE	0x00100000
+
 #ifndef AT91C_MASTER_CLOCK
 #define AT91C_MASTER_CLOCK	60000000
 #endif

==== //depot/projects/vimage/src/sys/arm/at91/files.at91#6 (text) ====

@@ -1,8 +1,9 @@
-# $FreeBSD: src/sys/arm/at91/files.at91,v 1.11 2009/04/05 18:21:40 thompsa Exp $
+# $FreeBSD: src/sys/arm/at91/files.at91,v 1.12 2009/04/22 23:54:41 stas Exp $
 arm/arm/cpufunc_asm_arm9.S	standard
 arm/arm/irq_dispatch.S		standard
 arm/at91/at91_machdep.c		standard
 arm/at91/at91.c			standard
+arm/at91/at91_cfata.c		optional	at91_cfata
 arm/at91/at91_st.c		standard
 arm/at91/at91_mci.c		optional	at91_mci
 arm/at91/at91_pio.c		standard

==== //depot/projects/vimage/src/sys/arm/conf/AVILA.hints#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.5 2009/02/03 19:16:04 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.7 2009/04/21 22:48:12 stas Exp $
 
 #
 # Device wiring for the Gateworks Avila 2384.
@@ -44,5 +44,5 @@
 hint.ad7418.0.addr=0x50
 
 # Dallas Semiconductor DS1672 RTC
-hint.ds1672.0.at="iicbus0"
-hint.ds1672.0.addr=0xd0
+hint.ds1672_rtc.0.at="iicbus0"
+hint.ds1672_rtc.0.addr=0xd0

==== //depot/projects/vimage/src/sys/arm/conf/BWCT#8 (text+ko) ====

@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.9 2009/02/23 18:34:56 thompsa Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.10 2009/04/17 22:45:57 ticso Exp $
 
 ident		BWCT
 
@@ -51,7 +51,7 @@
 #options 	NFSLOCKD		#Network Lock Manager
 options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 options		BOOTP_NFSROOT
-options	BOOTP
+options		BOOTP
 
 #options 	MSDOSFS			#MSDOS Filesystem
 #options 	CD9660			#ISO 9660 Filesystem
@@ -83,7 +83,7 @@
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options		DIAGNOSTIC
+#options	DIAGNOSTIC
 
 device		md
 device		at91_twi		# TWI: Two Wire Interface
@@ -101,7 +101,7 @@
 #device		smb
 # SPI bus
 device		spibus
-#device  	at45d		# at45db642 and maybe others
+#device		at45d		# at45db642 and maybe others
 
 device		bpf		# Berkeley packet filter
 
@@ -109,5 +109,3 @@
 #device		ohci
 #device		usb
 #device		umass		# Disks/Mass storage - Requires scbus and da
-
-#device		at91_qdmmc

==== //depot/projects/vimage/src/sys/arm/conf/BWCT.hints#2 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.1 2007/01/05 02:08:35 ticso Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.3 2009/04/21 22:48:12 stas Exp $
 
 # Dallas Semiconductor DS1672 RTC sitting on the I2C bus
-hint.ds1672.0.at="iicbus0"
-hint.ds1672.0.addr=0xd0
+hint.ds1672_rtc.0.at="iicbus0"
+hint.ds1672_rtc.0.addr=0xd0
 
 # NAtional Semiconductor LM75 temperature sensor sitting on the I2C bus
 hint.lm75.0.at="iicbus0"

==== //depot/projects/vimage/src/sys/arm/conf/CAMBRIA.hints#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.2 2009/03/10 21:49:51 sam Exp $
+# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.4 2009/04/21 22:48:12 stas Exp $
 
 #
 # Device wiring for the Gateworks Cambria 2358.
@@ -46,8 +46,8 @@
 hint.ad7418.0.addr=0x50
 
 # Dallas Semiconductor DS1672 RTC
-hint.ds1672.0.at="iicbus0"
-hint.ds1672.0.addr=0xd0
+hint.ds1672_rtc.0.at="iicbus0"
+hint.ds1672_rtc.0.addr=0xd0
 
 # USB is part of the chip
 hint.ehci.0.at="ixp0"

==== //depot/projects/vimage/src/sys/arm/include/param.h#3 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/arm/include/param.h,v 1.12 2008/03/27 05:03:25 jb Exp $
+ * $FreeBSD: src/sys/arm/include/param.h,v 1.15 2009/04/20 12:59:23 rwatson Exp $
  */
 
 /*
@@ -81,6 +81,13 @@
 #define	ALIGNBYTES	_ALIGNBYTES
 #define	ALIGN(p)	_ALIGN(p)
 
+/*
+ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
+ * architecture.  It should be used with appropriate caution.
+ */
+#define	CACHE_LINE_SHIFT	6
+#define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
+
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)	/* Page size */
 #define	PAGE_MASK	(PAGE_SIZE - 1)

==== //depot/projects/vimage/src/sys/bsm/audit.h#10 (text) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2005 Apple Inc.
+ * Copyright (c) 2005-2009 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,21 +26,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#5
- * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $
+ * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9
+ * $FreeBSD: src/sys/bsm/audit.h,v 1.16 2009/04/19 14:53:17 rwatson Exp $
  */
 
-#ifndef _BSM_AUDIT_H
+#ifndef	_BSM_AUDIT_H
 #define	_BSM_AUDIT_H
 
-#ifdef	__APPLE__
-/* Temporary until rdar://problem/6133383 is resolved. */
+#include <sys/param.h>
 #include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/cdefs.h>
-#include <sys/queue.h>
-#endif /* __APPLE__ */
 
 #define	AUDIT_RECORD_MAGIC	0x828a0f1b
 #define	MAX_AUDIT_RECORDS	20
@@ -101,20 +95,20 @@
 /*
  * auditon(2) commands.
  */
-#define	A_GETPOLICY	2
-#define	A_SETPOLICY	3
+#define	A_OLDGETPOLICY	2
+#define	A_OLDSETPOLICY	3
 #define	A_GETKMASK	4
 #define	A_SETKMASK	5
-#define	A_GETQCTRL	6
-#define	A_SETQCTRL	7
+#define	A_OLDGETQCTRL	6
+#define	A_OLDSETQCTRL	7
 #define	A_GETCWD	8
 #define	A_GETCAR	9
 #define	A_GETSTAT	12
 #define	A_SETSTAT	13
 #define	A_SETUMASK	14
 #define	A_SETSMASK	15
-#define	A_GETCOND	20
-#define	A_SETCOND	21
+#define	A_OLDGETCOND	20
+#define	A_OLDSETCOND	21
 #define	A_GETCLASS	22
 #define	A_SETCLASS	23
 #define	A_GETPINFO	24
@@ -126,6 +120,12 @@
 #define	A_SETKAUDIT	30
 #define	A_SENDTRIGGER	31
 #define	A_GETSINFO_ADDR	32
+#define	A_GETPOLICY	33
+#define	A_SETPOLICY	34
+#define	A_GETQCTRL	35
+#define	A_SETQCTRL	36
+#define	A_GETCOND	37
+#define	A_SETCOND	38
 
 /*
  * Audit policy controls.
@@ -216,7 +216,6 @@
 	au_mask_t	ap_mask;	/* Audit masks. */
 	au_tid_t	ap_termid;	/* Terminal ID. */
 	au_asid_t	ap_asid;	/* Audit session ID. */
-	u_int64_t	ap_flags;	/* Audit session flags. */
 };
 typedef	struct auditpinfo	auditpinfo_t;
 
@@ -226,15 +225,12 @@
 	au_mask_t	ap_mask;	/* Audit masks. */
 	au_tid_addr_t	ap_termid;	/* Terminal ID. */
 	au_asid_t	ap_asid;	/* Audit session ID. */
+	u_int64_t	ap_flags;	/* Audit session flags. */
 };
 typedef	struct auditpinfo_addr	auditpinfo_addr_t;
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list