PERFORCE change 123894 for review

Roman Divacky rdivacky at FreeBSD.org
Sun Jul 22 13:39:36 UTC 2007


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

Change 123894 by rdivacky at rdivacky_witten on 2007/07/22 13:39:16

	IFC

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_at/sys/Makefile#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/cpu_switch.S#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/Makefile.inc#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/board.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/boot2.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/bwct_board.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/centipad_board.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/emac.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/emac.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_internal.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_record.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_cd.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/00READ#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/README#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/TODO#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/cnode.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_fbsd.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_io.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_kernel.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_namecache.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_namecache.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_opstats.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_pioctl.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_psdev.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_psdev.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_subr.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_subr.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_venus.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_venus.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vfsops.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vfsops.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vnops.c#3 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vnops.h#3 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#8 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#8 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kern.pre.mk#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kmod.mk#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options#8 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/altq/altq/altq_subr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_common.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_adapter.h#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_ioctl.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_main.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_offload.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_offload.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_osdep.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_sge.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/sys/mvec.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#2 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/splash_bmp.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/firewire.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/firewirereg.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ipmi/ipmi_isa.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/LICENSE#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_82598.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_api.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_api.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_common.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_common.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_osdep.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_phy.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_phy.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_type.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/kbdmux/kbdmux.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/msk/if_msk.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/eth_z8e.dat.gz.uu#3 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/eth_z8e.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 delete
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/ethp_z8e.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/if_mxge.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/if_mxge_var.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/mcp_gen_header.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/mxge_eth_z8e.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/mxge_ethp_z8e.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/mxge_lro.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/mxge_mcp.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/if_nxge.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ral/rt2661.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/atiixp.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/hda/hdac_private.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/ich.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sym/sym_hipd.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rue.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_ruereg.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_ural.c#7 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_port.h#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_quirks.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/wi/if_wi.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/README#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/TODO#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/cnode.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_fbsd.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_io.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_kernel.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_namecache.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_namecache.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_opstats.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_pioctl.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_psdev.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_psdev.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_subr.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_subr.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_venus.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_venus.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_vfsops.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_vfsops.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_vnops.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/coda/coda_vnops.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/bpb.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_subr.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/genassym.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/swtch.s#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/sys_machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/vm_machdep.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/pc/vesa.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_machdep.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/isa/isa_dma.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_event.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#13 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_resource.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_rwlock.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sched_4bsd.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/tty.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/Makefile#7 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/coda/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/coda5/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/cxgb/Makefile#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/netgraph/atm/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/netgraph/bluetooth/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/atm_proto.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/icmp_var.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp.h#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_asconf.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_cc_functions.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_cc_functions.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_input.c#7 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_os.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_os_bsd.h#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_peeloff.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_structs.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_sysctl.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_sysctl.h#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_timer.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_timer.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_var.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.c#7 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.h#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/udp_var.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6.h#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_usrreq.c#7 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_output.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_usrreq.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_var.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec_input.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec_output.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/netsmb/smb_dev.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/agp.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/agppriv.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/agpreg.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/pmap.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/lock_profile.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mutex.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/rwlock.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysent.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_fault.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_meter.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_phys.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_zeroidle.c#5 integrate

Differences ...

==== //depot/projects/soc2007/rdivacky/linux_at/sys/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.44 2007/07/05 08:55:13 bz Exp $
+# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@
 .endif
 
 # Directories to include in cscope name file and TAGS.
-CSCOPEDIRS=	bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \
+CSCOPEDIRS=	bsm cam compat conf contrib crypto ddb dev fs geom gnu \
 		i4b isa kern libkern modules net net80211 netatalk netatm \
 		netgraph netinet netinet6 netipsec netipx netnatm netncp \
 		netsmb nfs nfsclient nfs4client rpc pccard pci security sys \

==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ====

@@ -30,13 +30,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $
  */
 
 #include <machine/asmacros.h>
 #include <machine/specialreg.h>
 
 #include "assym.s"
+#include "opt_sched.h"
 
 /*****************************************************************************/
 /* Scheduling                                                                */
@@ -50,6 +51,12 @@
 #define LK
 #endif
 
+#if defined(SCHED_ULE) && defined(SMP)
+#define	SETLK	xchgq
+#else
+#define	SETLK	movq
+#endif
+
 /*
  * cpu_throw()
  *
@@ -148,13 +155,7 @@
 	movq	%cr3,%rax
 	cmpq	%rcx,%rax			/* Same address space? */
 	jne	swinact
-	movq	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
-	/* Wait for the new thread to become unblocked */
-	movq	$blocked_lock, %rdx
-1:
-	movq	TD_LOCK(%rsi),%rcx
-	cmpq	%rcx, %rdx
-	je	1b
+	SETLK	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
 	jmp	sw1
 swinact:
 	movq	%rcx,%cr3			/* new address space */
@@ -163,21 +164,24 @@
 	movq	TD_PROC(%rdi), %rcx		/* oldproc */
 	movq	P_VMSPACE(%rcx), %rcx
 	LK btrl	%eax, VM_PMAP+PM_ACTIVE(%rcx)	/* clear old */
-	movq	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
+	SETLK	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
 swact:
+	/* Set bit in new pmap->pm_active */
+	movq	TD_PROC(%rsi),%rdx		/* newproc */
+	movq	P_VMSPACE(%rdx), %rdx
+	LK btsl	%eax, VM_PMAP+PM_ACTIVE(%rdx)	/* set new */
+
+sw1:
+#if defined(SCHED_ULE) && defined(SMP)
 	/* Wait for the new thread to become unblocked */
 	movq	$blocked_lock, %rdx
 1:
 	movq	TD_LOCK(%rsi),%rcx
 	cmpq	%rcx, %rdx
+	pause
 	je	1b
-
-	/* Set bit in new pmap->pm_active */
-	movq	TD_PROC(%rsi),%rdx		/* newproc */
-	movq	P_VMSPACE(%rdx), %rdx
-	LK btsl	%eax, VM_PMAP+PM_ACTIVE(%rdx)	/* set new */
-
-sw1:
+	lfence
+#endif
 	/*
 	 * At this point, we've switched address spaces and are ready
 	 * to load up the rest of the next context.

==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysvec.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.30 2007/07/12 18:01:30 jhb Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
@@ -1024,7 +1024,8 @@
 	VM_PROT_ALL,
 	linux_copyout_strings,
 	exec_linux_setregs,
-	linux32_fixlimit
+	linux32_fixlimit,
+	&linux32_maxssiz,
 };
 
 static Elf32_Brandinfo linux_brand = {

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/Makefile.inc#2 (text) ====

@@ -1,12 +1,12 @@
-# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.6 2006/12/20 17:47:54 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.7 2007/07/13 14:27:04 imp Exp $
 
 .if !target(__at91_boot_Makefile.inc__)
 .PATH:	${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm
 
 __at91_boot_Makefile.inc__:
 
-# tsc, bwct, kb920x are the supported flavors
-BOOT_FLAVOR=kb920x
+# tsc, bwct, kb920x, centipad are the supported flavors
+BOOT_FLAVOR?=kb920x
 
 CFLAGS=-Os -mcpu=arm9 -ffreestanding \
 	-I${.CURDIR}/../libat91 \

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/board.h#2 (text+ko) ====

@@ -21,8 +21,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.1 2006/11/09 20:07:26 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.2 2007/07/13 14:27:04 imp Exp $
  */
 
 void Update(void);
 void board_init(void);
+int drvread(void *, unsigned, unsigned);

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/boot2.c#2 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.6 2007/07/13 14:27:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
@@ -26,9 +26,7 @@
 
 #include <stdarg.h>
 
-#include "emac.h"
 #include "lib.h"
-#include "sd-card.h"
 #include "board.h"
 
 #define RBX_ASKNAME	0x0	/* -a */
@@ -84,8 +82,6 @@
     RBX_VERBOSE
 };
 
-unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
-
 unsigned dsk_start;
 static char cmd[512];
 static char kname[1024];
@@ -96,7 +92,6 @@
 static int parse(void);
 static int xfsread(ino_t, void *, size_t);
 static int dskread(void *, unsigned, unsigned);
-static int drvread(void *, unsigned, unsigned);
 
 #include "ufsread.c"
 
@@ -147,10 +142,6 @@
     ino_t ino;
 
     board_init();
-    EMAC_Init();
-    EMAC_SetMACAddress(mac);
-    while (sdcard_init() == 0)
-	printf("Looking for SD card\n");
 
     dmadat = (void *)(0x20000000 + (16 << 20));
     /* Process configuration file */
@@ -179,14 +170,11 @@
 	xputchar('\n');
 	autoboot = 0;
 	c = 0;
-	printf("cmd is '%s'\n", cmd);
 	if (parse())
 	    xputchar('\a');
 #ifdef XMODEM_DL
 	else if (*cmd == '*')
-		Update();
-	else if (*cmd == '#')
-		reset();
+	    Update();
 #endif
 	else
 	    load();
@@ -281,14 +269,14 @@
 	dp = (void *)(sec + DOSPARTOFF);
 	for (i = 0; i < NDOSPART; i++) {
 	    if (dp[i].dp_typ == DOSPTYP_386BSD)
-		    break;
+		break;
 	}
 	if (i == NDOSPART)
-		return -1;
+	    return -1;
 	// Although dp_start is aligned within the disk partition structure,
 	// DOSPARTOFF is 446, which is only word (2) aligned, not longword (4)
 	// aligned.  Cope by using memcpy to fetch the start of this partition.
-	memcpy(&dsk_start, &dp[i].dp_start, 4);
+	memcpy(&dsk_start, &dp[1].dp_start, 4);
 	if (drvread(sec, dsk_start + LABELSECTOR, 1))
 		return -1;
 	d = (void *)(sec + LABELOFFSET);
@@ -306,12 +294,3 @@
     }
     return drvread(buf, dsk_start + lba, nblk);
 }
-
-static int
-drvread(void *buf, unsigned lba, unsigned nblk)
-{
-    static unsigned c = 0x2d5c7c2f;
-
-    printf("%c\b", c = c << 8 | c >> 24);
-    return (MCI_read((char *)buf, lba << 9, nblk << 9));
-}

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ====

@@ -24,15 +24,16 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.3 2006/11/09 20:08:46 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.4 2007/07/13 14:27:04 imp Exp $");
 
 #include <sys/param.h>
 
 #include "emac.h"
 #include "lib.h"
 #include "board.h"
+#include "sd-card.h"
 
-extern unsigned char mac[];
+unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
 
 static void
 MacFromEE()
@@ -40,7 +41,7 @@
 	uint32_t sig;
 	sig = 0;
 	ReadEEPROM(12 * 1024, (uint8_t *)&sig, sizeof(sig));
-	if (sig != 0xaa55aa55)
+	if (sig != 0x92021054)
 		return;
 	ReadEEPROM(12 * 1024 + 4, mac, 6);
 	printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
@@ -57,4 +58,14 @@
 {
     InitEEPROM();
     MacFromEE();
+    EMAC_Init();
+    EMAC_SetMACAddress(mac);
+    while (sdcard_init() == 0)
+	printf("Looking for SD card\n");
+}
+
+int
+drvread(void *buf, unsigned lba, unsigned nblk)
+{
+    return (MCI_read((char *)buf, lba << 9, nblk << 9));
 }

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/Makefile#2 (text) ====

@@ -1,4 +1,4 @@
-#  $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.8 2007/03/15 03:31:49 imp Exp $
+#  $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.9 2007/07/13 14:27:04 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -8,7 +8,7 @@
 	putchar.c printf.c reset.c spi_flash.c xmodem.c \
 	sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \
 	memset.c memcmp.c
-SRCS+=ashldi3.c divsi3.S
+SRCS+=ashldi3.c divsi3.c
 NO_MAN=
 
 .if ${MK_TAG_LIST} != "no"

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 (text) ====

@@ -24,7 +24,7 @@
  * This software is derived from software provide by Kwikbyte who specifically
  * disclaimed copyright on the code.
  *
- * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.5 2007/03/28 22:40:37 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.6 2007/07/13 14:27:04 imp Exp $
  */
 
 #include "at91rm9200.h"
@@ -62,7 +62,7 @@
 	AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10;
 #endif
 
-#ifdef BOOT_KB920X
+#if defined(BOOT_KB920X)
 	AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC18 | AT91C_PIO_PC19 |
 	  AT91C_PIO_PC20;
 	AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC18 | AT91C_PIO_PC19 |
@@ -136,7 +136,11 @@
 	AT91C_BASE_EBI->EBI_CSA = value;
 
 	AT91C_BASE_SDRC->SDRC_CR =
+#ifdef KB9202_B
+	    AT91C_SDRC_NC_10 |
+#else
 	    AT91C_SDRC_NC_9 |
+#endif
 	    AT91C_SDRC_NR_13 |
 	    AT91C_SDRC_NB_4_BANKS |
 	    AT91C_SDRC_CAS_2 |

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 (text) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.5 2007/03/28 22:40:37 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.6 2007/07/13 14:27:04 imp Exp $
  */
 
 #ifndef _AT91RM9200_LOWLEVEL_H_
@@ -39,6 +39,14 @@
 #define OSC_MAIN_MULT		90
 #endif
 
+#ifdef BOOT_CENTIPAD
+/* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */
+#define OSC_MAIN_FREQ_DIV	5	/* for 10MHz osc */
+#define SDRAM_WIDTH	AT91C_SDRC_DBW_16_BITS
+typedef unsigned short sdram_size_t;
+#define OSC_MAIN_MULT		90
+#endif
+
 #ifdef BOOT_BWCT
 /* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */
 #define OSC_MAIN_FREQ_DIV	4	/* for 16MHz osc */

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/emac.c#2 (text) ====

@@ -19,7 +19,7 @@
  * only.
  * END_BLOCK
  * 
- * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.7 2007/03/28 22:40:37 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.8 2007/07/13 14:27:04 imp Exp $
  ******************************************************************************/
 
 #include "at91rm9200.h"
@@ -380,7 +380,7 @@
 static void
 MII_GetLinkSpeed(AT91PS_EMAC pEmac)
 {
-#if defined(BOOT_TSC) | defined(BOOT_KB920X)
+#if defined(BOOT_TSC) || defined(BOOT_KB920X) || defined(BOOT_CENTIPAD)
 	unsigned short stat2; 
 #endif
 	unsigned update;
@@ -394,7 +394,7 @@
 	update |= AT91C_EMAC_SPD;
 	update |= AT91C_EMAC_FD;
 #endif
-#ifdef BOOT_KB920X
+#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD)
 	stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG);
 	if (!(stat2 & MII_STS2_LINK))
 		return ;

==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/emac.h#2 (text) ====

@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.5 2006/11/09 20:32:36 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.6 2007/07/13 14:27:05 imp Exp $
  *****************************************************************************/
 
 
@@ -114,7 +114,7 @@
 /* MII registers definition */
 #define MII_STS_REG	0x01
 #define MII_STS_LINK_STAT	0x04
-#ifdef BOOT_KB920X
+#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD)
 #define MII_STS2_REG	0x11
 #define MII_STS2_LINK	0x400
 #define MII_STS2_100TX	0x4000

==== //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit.h#3 (text) ====

@@ -2,8 +2,6 @@
  * Copyright (c) 2005 Apple Computer, Inc.
  * All rights reserved.
  *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,10 +26,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#36
- * $FreeBSD: src/sys/bsm/audit.h,v 1.8 2007/04/17 12:27:08 rwatson Exp $
+ * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#38
+ * $FreeBSD: src/sys/bsm/audit.h,v 1.9 2007/07/22 12:28:12 rwatson Exp $
  */
 
 #ifndef _BSM_AUDIT_H

==== //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_internal.h#3 (text) ====

@@ -6,8 +6,6 @@
  * This code was developed in part by Robert N. M. Watson, Senior Principal
  * Scientist, SPARTA, Inc.
  *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -32,10 +30,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#16
- * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.7 2007/04/17 12:27:08 rwatson Exp $
+ * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#18
+ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.8 2007/07/22 12:28:12 rwatson Exp $
  */
 
 #ifndef _AUDIT_INTERNAL_H

==== //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_kevents.h#3 (text) ====

@@ -2,8 +2,6 @@
  * Copyright (c) 2005 Apple Computer, Inc.
  * All rights reserved.
  *
- * @APPLE_BSD_LICENSE_HEADER_START@
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,10 +26,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @APPLE_BSD_LICENSE_HEADER_END@
- *
- * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#32
- * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.11 2007/04/17 12:27:08 rwatson Exp $
+ * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34
+ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.12 2007/07/22 12:28:12 rwatson Exp $
  */
 
 #ifndef _BSM_AUDIT_KEVENTS_H_
@@ -49,11 +45,12 @@
 #define	AUE_NULL		0
 #define	AUE_EXIT		1
 #define	AUE_FORK		2
+#define	AUE_FORKALL		AUE_FORK	/* Solaris-specific. */
 #define	AUE_OPEN		3
 #define	AUE_CREAT		4
 #define	AUE_LINK		5
 #define	AUE_UNLINK		6
-#define	AUE_DELETE		AUE_UNLINK
+#define	AUE_DELETE		AUE_UNLINK	/* Darwin-specific. */
 #define	AUE_EXEC		7
 #define	AUE_CHDIR		8
 #define	AUE_MKNOD		9
@@ -62,7 +59,7 @@
 #define	AUE_UMOUNT		12
 #define	AUE_JUNK		13	/* Solaris-specific. */
 #define	AUE_ACCESS		14
-#define	AUE_CHECKUSERACCESS	AUE_ACCESS
+#define	AUE_CHECKUSERACCESS	AUE_ACCESS	/* Darwin-specific. */
 #define	AUE_KILL		15
 #define	AUE_STAT		16
 #define	AUE_LSTAT		17
@@ -161,7 +158,7 @@
 #define	AUE_SEMOP		110
 #define	AUE_CORE		111	/* Solaris-specific, currently. */
 #define	AUE_CLOSE		112
-#define	AUE_SYSTEMBOOT		113
+#define	AUE_SYSTEMBOOT		113	/* Solaris-specific. */
 #define	AUE_ASYNC_DAEMON_EXIT	114	/* Solaris-specific. */
 #define	AUE_NFSSVC_EXIT		115	/* Solaris-specific. */
 #define	AUE_WRITEL		128	/* Solaris-specific. */
@@ -184,9 +181,14 @@
 #define	AUE_GETKERNSTATE	147	/* Solaris-specific. */
 #define	AUE_SETKERNSTATE	148	/* Solaris-specific. */
 #define	AUE_GETPORTAUDIT	149	/* Solaris-specific. */
-#define	AUE_AUDISTAT		150	/* Solaris-specific. */
+#define	AUE_AUDITSTAT		150	/* Solaris-specific. */
+#define	AUE_REVOKE		151
+#define	AUE_MAC			152	/* Solaris-specific. */
 #define	AUE_ENTERPROM		153	/* Solaris-specific. */
 #define	AUE_EXITPROM		154	/* Solaris-specific. */
+#define	AUE_IFLOAT		155	/* Solaris-specific. */
+#define	AUE_PFLOAT		156	/* Solaris-specific. */
+#define	AUE_UPRIV		157	/* Solaris-specific. */
 #define	AUE_IOCTL		158
 #define	AUE_SOCKET		183
 #define	AUE_SENDTO		184
@@ -198,28 +200,30 @@
 #define	AUE_RECVMSG		190
 #define	AUE_RECVFROM		191
 #define	AUE_READ		192
+#define	AUE_GETDENTS		193
 #define	AUE_LSEEK		194
 #define	AUE_WRITE		195
 #define	AUE_WRITEV		196
 #define	AUE_NFS			197	/* Solaris-specific. */
 #define	AUE_READV		198
-					/* XXXRW: XXX Solaris old stat()? */
+#define	AUE_OSTAT		199	/* Solaris-specific. */
 #define	AUE_SETUID		200	/* XXXRW: Solaris old setuid? */
 #define	AUE_STIME		201	/* XXXRW: Solaris old stime? */
 #define	AUE_UTIME		202	/* XXXRW: Solaris old utime? */
 #define	AUE_NICE		203	/* XXXRW: Solaris old nice? */
-					/* XXXRW: Solaris old setpgrp? */
-#define	AUE_SETGID		205	/* XXXRW: Solaris old setgid? */
-					/* XXXRW: Solaris readl? */
-					/* XXXRW: Solaris readvl()? */
+#define	AUE_OSETPGRP		204	/* Solaris-specific. */
+#define	AUE_SETGID		205
+#define	AUE_READL		206	/* Solaris-specific. */
+#define	AUE_READVL		207	/* Solaris-specific. */
+#define	AUE_FSTAT		208
 #define	AUE_DUP2		209
 #define	AUE_MMAP		210
 #define	AUE_AUDIT		211
-#define	AUE_PRIOCNTLSYS		212
+#define	AUE_PRIOCNTLSYS		212	/* Solaris-specific. */
 #define	AUE_MUNMAP		213
 #define	AUE_SETEGID		214
 #define	AUE_SETEUID		215
-#define	AUE_PUTMSG		216
+#define	AUE_PUTMSG		216	/* Solaris-specific. */
 #define	AUE_GETMSG		217	/* Solaris-specific. */
 #define	AUE_PUTPMSG		218	/* Solaris-specific. */
 #define	AUE_GETPMSG		219	/* Solaris-specific. */
@@ -236,26 +240,27 @@
 #define	AUE_AUDITON_SETCOND	230
 #define	AUE_AUDITON_GETCLASS	231
 #define	AUE_AUDITON_SETCLASS	232
-#define	AUE_UTSSYS		233	/* Solaris-specific. */
+#define	AUE_FUSERS		233	/* Solaris-specific; also UTSSYS? */
 #define	AUE_STATVFS		234
-#define	AUE_XSTAT		235
-#define	AUE_LXSTAT		236
+#define	AUE_XSTAT		235	/* Solaris-specific. */
+#define	AUE_LXSTAT		236	/* Solaris-specific. */
 #define	AUE_LCHOWN		237
 #define	AUE_MEMCNTL		238	/* Solaris-specific. */
 #define	AUE_SYSINFO		239	/* Solaris-specific. */
 #define	AUE_XMKNOD		240	/* Solaris-specific. */
 #define	AUE_FORK1		241
-					/* XXXRW: Solaris modctl()? */
+#define	AUE_MODCTL		242	/* Solaris-specific. */
 #define	AUE_MODLOAD		243
 #define	AUE_MODUNLOAD		244
 #define	AUE_MODCONFIG		245	/* Solaris-specific. */
 #define	AUE_MODADDMAJ		246	/* Solaris-specific. */
-#define	AUE_SOCKACCEPT		247
-#define	AUE_SOCKCONNECT		248
-#define	AUE_SOCKSEND		249
-#define	AUE_SOCKRECEIVE		250
+#define	AUE_SOCKACCEPT		247	/* Solaris-specific. */
+#define	AUE_SOCKCONNECT		248	/* Solaris-specific. */
+#define	AUE_SOCKSEND		249	/* Solaris-specific. */
+#define	AUE_SOCKRECEIVE		250	/* Solaris-specific. */
 #define	AUE_ACLSET		251
 #define	AUE_FACLSET		252
+#define	AUE_DOORFS		253	/* Solaris-specific. */
 #define	AUE_DOORFS_DOOR_CALL	254	/* Solaris-specific. */
 #define	AUE_DOORFS_DOOR_RETURN	255	/* Solaris-specific. */
 #define	AUE_DOORFS_DOOR_CREATE	256	/* Solaris-specific. */
@@ -267,11 +272,42 @@
 #define	AUE_P_ONLINE		262	/* Solaris-specific. */
 #define	AUE_PROCESSOR_BIND	263	/* Solaris-specific. */
 #define	AUE_INST_SYNC		264	/* Solaris-specific. */
-#define	AUE_SOCK_CONFIG		265	/* Solaris-specific. */
+#define	AUE_SOCKCONFIG		265	/* Solaris-specific. */
 #define	AUE_SETAUDIT_ADDR	266
 #define	AUE_GETAUDIT_ADDR	267
+#define	AUE_UMOUNT2		268	/* Solaris-specific. */
+#define	AUE_FSAT		269	/* Solaris-specific. */
+#define	AUE_OPENAT_R		270
+#define	AUE_OPENAT_RC		271
+#define	AUE_OPENAT_RT		272
+#define	AUE_OPENAT_RTC		273
+#define	AUE_OPENAT_W		274
+#define	AUE_OPENAT_WC		275
+#define	AUE_OPENAT_WT		276
+#define	AUE_OPENAT_WTC		277
+#define	AUE_OPENAT_RW		278
+#define	AUE_OPENAT_RWC		279
+#define	AUE_OPENAT_RWT		280
+#define	AUE_OPENAT_RWTC		281
+#define	AUE_RENAMEAT		282
+#define	AUE_FSTATAT		283
+#define	AUE_FCHOWNAT		284
+#define	AUE_FUTIMESAT		285
+#define	AUE_UNLINKAT		286
 #define	AUE_CLOCK_SETTIME	287
 #define	AUE_NTP_ADJTIME		288
+#define	AUE_SETPPRIV		289	/* Solaris-specific. */
+#define	AUE_MODDEVPLCY		290	/* Solaris-specific. */
+#define	AUE_MODADDPRIV		291	/* Solaris-specific. */
+#define	AUE_CRYPTOADM		292	/* Solaris-specific. */
+#define	AUE_CONFIGKSSL		293	/* Solaris-specific. */
+#define	AUE_BRANDSYS		294	/* Solaris-specific. */
+#define	AUE_PF_POLICY_ADDRULE	295	/* Solaris-specific. */
+#define	AUE_PF_POLICY_DELRULE	296	/* Solaris-specific. */
+#define	AUE_PF_POLICY_CLONE	297	/* Solaris-specific. */
+#define	AUE_PF_POLICY_FLIP	298	/* Solaris-specific. */
+#define	AUE_PF_POLICY_FLUSH	299	/* Solaris-specific. */
+#define	AUE_PF_POLICY_ALGS	300	/* Solaris-specific. */
 
 /*
  * Events added for Apple Darwin that potentially collide with future Solaris
@@ -286,30 +322,30 @@
 #define	AUE_DARWIN_PROFILE	305
 #define	AUE_DARWIN_KTRACE	306
 #define	AUE_DARWIN_SETLOGIN	307
-#define	AUE_DARWIN_REBOOT	308	/* XXX: See AUE_REBOOT. */
+#define	AUE_DARWIN_REBOOT	308
 #define	AUE_DARWIN_REVOKE	309
 #define	AUE_DARWIN_UMASK	310
 #define	AUE_DARWIN_MPROTECT	311
-#define	AUE_DARWIN_SETPRIORITY	312	/* XXX: See AUE_SETPRIORITY. */
-#define	AUE_DARWIN_SETTIMEOFDAY	313	/* XXX: See AUE_SETTIMEOFDAY. */
-#define	AUE_DARWIN_FLOCK	314	/* XXX: See AUE_FLOCK. */
+#define	AUE_DARWIN_SETPRIORITY	312
+#define	AUE_DARWIN_SETTIMEOFDAY	313
+#define	AUE_DARWIN_FLOCK	314
 #define	AUE_DARWIN_MKFIFO	315
 #define	AUE_DARWIN_POLL		316
-#define	AUE_DARWIN_SOCKETPAIR	317	/* XXXRW: See AUE_SOCKETPAIR. */
+#define	AUE_DARWIN_SOCKETPAIR	317
 #define	AUE_DARWIN_FUTIMES	318
 #define	AUE_DARWIN_SETSID	319
 #define	AUE_DARWIN_SETPRIVEXEC	320	/* Darwin-specific. */
-#define	AUE_DARWIN_NFSSVC	321	/* XXX: See AUE_NFS_SVC. */
-#define	AUE_DARWIN_GETFH	322	/* XXX: See AUE_NFS_GETFH. */
-#define	AUE_DARWIN_QUOTACTL	323	/* XXX: See AUE_QUOTACTL. */
+#define	AUE_DARWIN_NFSSVC	321
+#define	AUE_DARWIN_GETFH	322
+#define	AUE_DARWIN_QUOTACTL	323
 #define	AUE_DARWIN_ADDPROFILE	324	/* Darwin-specific. */
 #define	AUE_DARWIN_KDEBUGTRACE	325	/* Darwin-specific. */
 #define	AUE_DARWIN_KDBUGTRACE	AUE_KDEBUGTRACE
 #define	AUE_DARWIN_FSTAT	326
 #define	AUE_DARWIN_FPATHCONF	327
 #define	AUE_DARWIN_GETDIRENTRIES	328
-#define	AUE_DARWIN_TRUNCATE	329	/* XXX: See AUE_TRUNCATE. */
-#define	AUE_DARWIN_FTRUNCATE	330	/* XXX: See AUE_FTRUNCATE. */
+#define	AUE_DARWIN_TRUNCATE	329
+#define	AUE_DARWIN_FTRUNCATE	330
 #define	AUE_DARWIN_SYSCTL	331
 #define	AUE_DARWIN_MLOCK	332
 #define	AUE_DARWIN_MUNLOCK	333
@@ -348,6 +384,11 @@
  * These often duplicate events added to the Solaris set by Darwin, but use
  * event identifiers in a higher range in order to avoid colliding with
  * future Solaris additions.
+ *
+ * If an event in this section is later added to Solaris, we prefer the
+ * Solaris event identifier, and add _OPENBSM_ to the OpenBSM-specific
+ * identifier so that old trails can still be processed, but new trails use
+ * the Solaris identifier.
  */
 #define	AUE_GETFSSTAT		43001
 #define	AUE_PTRACE		43002
@@ -356,7 +397,7 @@
 #define	AUE_PROFILE		43005
 #define	AUE_KTRACE		43006
 #define	AUE_SETLOGIN		43007
-#define	AUE_REVOKE		43008
+#define	AUE_OPENBSM_REVOKE	43008	/* Solaris event now preferred. */
 #define	AUE_UMASK		43009
 #define	AUE_MPROTECT		43010
 #define	AUE_MKFIFO		43011
@@ -367,7 +408,7 @@
 #define	AUE_ADDPROFILE		43016	/* Darwin-specific. */
 #define	AUE_KDEBUGTRACE		43017	/* Darwin-specific. */
 #define	AUE_KDBUGTRACE		AUE_KDEBUGTRACE
-#define	AUE_FSTAT		43018
+#define	AUE_OPENBSM_FSTAT	43018	/* Solaris event now preferred. */
 #define	AUE_FPATHCONF		43019
 #define	AUE_GETDIRENTRIES	43020
 #define	AUE_SYSCTL		43021
@@ -497,6 +538,16 @@
 #define	AUE_LISTEN		43140	/* FreeBSD/Darwin/Linux. */
 #define	AUE_MLOCKALL		43141	/* FreeBSD. */
 #define	AUE_MUNLOCKALL		43142	/* FreeBSD. */
+#define	AUE_CLOSEFROM		43143	/* FreeBSD. */
+#define	AUE_FEXECVE		43144	/* FreeBSD. */
+#define	AUE_FACCESSAT		43145	/* FreeBSD. */
+#define	AUE_FCHMODAT		43146	/* FreeBSD. */
+#define	AUE_LINKAT		43147	/* FreeBSD. */
+#define	AUE_MKDIRAT		43148	/* FreeBSD. */
+#define	AUE_MKFIFOAT		43149	/* FreeBSD. */
+#define	AUE_MKNODAT		43150	/* FreeBSD. */
+#define	AUE_READLINKAT		43151	/* FreeBSD. */
+#define	AUE_SYMLINKAT		43152	/* FreeBSD. */
 
 /*

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


More information about the p4-projects mailing list