PERFORCE change 141345 for review
Wayne Salamon
wsalamon at FreeBSD.org
Thu May 8 23:41:45 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=141345
Change 141345 by wsalamon at vh2 on 2008/05/08 23:41:13
Integ development branch from parent.
Affected files ...
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.powerpc#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.sparc64#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.sun4v#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/kern.mk#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.mips#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/iwn/LICENSE#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/core_priv.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_addr.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_cache.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_fmr_pool.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_mad.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_marshall.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_pack.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_sa.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_smi.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_umem.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_user_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_user_mad.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_user_sa.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_user_verbs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_verbs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/iw_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/getopt.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/getopt.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/krping.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/krping.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/krping_dev.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_addr.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cache.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cm_ib.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cma.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_device.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_iwcm.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_user_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_verbs.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/types.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_capture.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-disk.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-fd.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-tape.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bce/if_bce.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_main.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_offload.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/t3cdev.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82571.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82571.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_api.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_api.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_defines.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_hw.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_ich8lan.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_ich8lan.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_osdep.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_phy.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_phy.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/if_em.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_82575.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_api.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_api.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_defines.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_hw.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_mac.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_manage.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_osdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_osdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_phy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/if_igb.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/if_igb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwn/if_iwn.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwn/if_iwnreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwn/if_iwnvar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/brgphy.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/ciphy.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt_user.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ofw/ofw_console.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pcivar.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_macio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_quicc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_sbus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_core.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ti/if_ti.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_rum.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_udav.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uipaq.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uscanner.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/vx/if_vx.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/if_wi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/est.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_kthread.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_umtx.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_4bsd.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_blist.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_witness.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/am29lv081b.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cp0.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/float.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pmap.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mips_subr.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/iw_cxgb/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/em/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/esp/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/hfa/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/hme/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/isp/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/iwn/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/iwnfw/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/le/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/mpt/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/addr/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/cma/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/core/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/iwcm/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/krping/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/scc/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/libalias/alias.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/sio.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/clock.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/locore.S#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/mmu_oea.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/mp_cpudep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/swtch.S#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/trap_subr.S#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/vm_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/vm_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pcpu.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/smp.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/spr.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/mpc85xx.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/ocpbus.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/macio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/maciovar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/bus.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/bus_common.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pci_if.m#3 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/bus_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/counter.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/upa.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/include/bus_common.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/blist.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/kdb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/mbuf.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/mount.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/mpt_ioctl.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/proc.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/umtx.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/user.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_kern.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_map.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_map.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_mmap.c#3 integrate
Differences ...
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.686 2008/04/25 05:18:47 jeff Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -53,6 +53,7 @@
#include "opt_maxmem.h"
#include "opt_msgbuf.h"
#include "opt_perfmon.h"
+#include "opt_sched.h"
#include <sys/param.h>
#include <sys/proc.h>
@@ -527,62 +528,192 @@
__asm__ ("hlt");
}
+void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */
+
+static void
+cpu_idle_hlt(int busy)
+{
+ /*
+ * we must absolutely guarentee that hlt is the next instruction
+ * after sti or we introduce a timing window.
+ */
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else
+ __asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_acpi(int busy)
+{
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else if (cpu_idle_hook)
+ cpu_idle_hook();
+ else
+ __asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_spin(int busy)
+{
+ return;
+}
+
+void (*cpu_idle_fn)(int) = cpu_idle_acpi;
+
+void
+cpu_idle(int busy)
+{
+#ifdef SMP
+ if (mp_grab_cpu_hlt())
+ return;
+#endif
+ cpu_idle_fn(busy);
+}
+
/*
- * Hook to idle the CPU when possible. In the SMP case we default to
- * off because a halted cpu will not currently pick up a new thread in the
- * run queue until the next timer tick. If turned on this will result in
- * approximately a 4.2% loss in real time performance in buildworld tests
- * (but improves user and sys times oddly enough), and saves approximately
- * 5% in power consumption on an idle machine (tests w/2xCPU 1.1GHz P3).
- *
- * XXX we need to have a cpu mask of idle cpus and generate an IPI or
- * otherwise generate some sort of interrupt to wake up cpus sitting in HLT.
- * Then we can have our cake and eat it too.
- *
- * XXX I'm turning it on for SMP as well by default for now. It seems to
- * help lock contention somewhat, and this is critical for HTT. -Peter
+ * mwait cpu power states. Lower 4 bits are sub-states.
*/
-static int cpu_idle_hlt = 1;
-TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt);
-SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
- &cpu_idle_hlt, 0, "Idle loop HLT enable");
+#define MWAIT_C0 0xf0
+#define MWAIT_C1 0x00
+#define MWAIT_C2 0x10
+#define MWAIT_C3 0x20
+#define MWAIT_C4 0x30
+
+#define MWAIT_DISABLED 0x0
+#define MWAIT_WOKEN 0x1
+#define MWAIT_WAITING 0x2
+
+static void
+cpu_idle_mwait(int busy)
+{
+ int *mwait;
+
+ mwait = (int *)PCPU_PTR(monitorbuf);
+ *mwait = MWAIT_WAITING;
+ if (sched_runnable())
+ return;
+ cpu_monitor(mwait, 0, 0);
+ if (*mwait == MWAIT_WAITING)
+ cpu_mwait(0, MWAIT_C1);
+}
static void
-cpu_idle_default(void)
+cpu_idle_mwait_hlt(int busy)
+{
+ int *mwait;
+
+ mwait = (int *)PCPU_PTR(monitorbuf);
+ if (busy == 0) {
+ *mwait = MWAIT_DISABLED;
+ cpu_idle_hlt(busy);
+ return;
+ }
+ *mwait = MWAIT_WAITING;
+ if (sched_runnable())
+ return;
+ cpu_monitor(mwait, 0, 0);
+ if (*mwait == MWAIT_WAITING)
+ cpu_mwait(0, MWAIT_C1);
+}
+
+int
+cpu_idle_wakeup(int cpu)
{
+ struct pcpu *pcpu;
+ int *mwait;
+
+ if (cpu_idle_fn == cpu_idle_spin)
+ return (1);
+ if (cpu_idle_fn != cpu_idle_mwait && cpu_idle_fn != cpu_idle_mwait_hlt)
+ return (0);
+ pcpu = pcpu_find(cpu);
+ mwait = (int *)pcpu->pc_monitorbuf;
/*
- * we must absolutely guarentee that hlt is the
- * absolute next instruction after sti or we
- * introduce a timing window.
+ * This doesn't need to be atomic since missing the race will
+ * simply result in unnecessary IPIs.
*/
- __asm __volatile("sti; hlt");
+ if (cpu_idle_fn == cpu_idle_mwait_hlt && *mwait == MWAIT_DISABLED)
+ return (0);
+ *mwait = MWAIT_WOKEN;
+
+ return (1);
}
/*
- * Note that we have to be careful here to avoid a race between checking
- * sched_runnable() and actually halting. If we don't do this, we may waste
- * the time between calling hlt and the next interrupt even though there
- * is a runnable process.
+ * Ordered by speed/power consumption.
*/
-void
-cpu_idle(void)
+struct {
+ void *id_fn;
+ char *id_name;
+} idle_tbl[] = {
+ { cpu_idle_spin, "spin" },
+ { cpu_idle_mwait, "mwait" },
+ { cpu_idle_mwait_hlt, "mwait_hlt" },
+ { cpu_idle_hlt, "hlt" },
+ { cpu_idle_acpi, "acpi" },
+ { NULL, NULL }
+};
+
+static int
+idle_sysctl_available(SYSCTL_HANDLER_ARGS)
+{
+ char *avail, *p;
+ int error;
+ int i;
+
+ avail = malloc(256, M_TEMP, M_WAITOK);
+ p = avail;
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (strstr(idle_tbl[i].id_name, "mwait") &&
+ (cpu_feature2 & CPUID2_MON) == 0)
+ continue;
+ p += sprintf(p, "%s, ", idle_tbl[i].id_name);
+ }
+ error = sysctl_handle_string(oidp, avail, 0, req);
+ free(avail, M_TEMP);
+ return (error);
+}
+
+static int
+idle_sysctl(SYSCTL_HANDLER_ARGS)
{
+ char buf[16];
+ int error;
+ char *p;
+ int i;
-#ifdef SMP
- if (mp_grab_cpu_hlt())
- return;
-#endif
- if (cpu_idle_hlt) {
- disable_intr();
- if (sched_runnable())
- enable_intr();
- else
- (*cpu_idle_hook)();
+ p = "unknown";
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (idle_tbl[i].id_fn == cpu_idle_fn) {
+ p = idle_tbl[i].id_name;
+ break;
+ }
+ }
+ strncpy(buf, p, sizeof(buf));
+ error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
+ if (error != 0 || req->newptr == NULL)
+ return (error);
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (strstr(idle_tbl[i].id_name, "mwait") &&
+ (cpu_feature2 & CPUID2_MON) == 0)
+ continue;
+ if (strcmp(idle_tbl[i].id_name, buf))
+ continue;
+ cpu_idle_fn = idle_tbl[i].id_fn;
+ return (0);
}
+ return (EINVAL);
}
-/* Other subsystems (e.g., ACPI) can hook this later. */
-void (*cpu_idle_hook)(void) = cpu_idle_default;
+SYSCTL_PROC(_machdep, OID_AUTO, idle_available, CTLTYPE_STRING | CTLFLAG_RD,
+ 0, 0, idle_sysctl_available, "A", "list of available idle functions");
+
+SYSCTL_PROC(_machdep, OID_AUTO, idle, CTLTYPE_STRING | CTLFLAG_RW, 0, 0,
+ idle_sysctl, "A", "currently selected idle function");
/*
* Clear registers on exec
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/pmap.c#4 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
/*
* Manages physical address maps.
@@ -2266,7 +2266,7 @@
* the 2mpage to referencing the page table page.
*/
if ((oldpde & PG_MANAGED) != 0)
- pmap_pv_demote_pde(pmap, va, oldpde & PG_FRAME);
+ pmap_pv_demote_pde(pmap, va, oldpde & PG_PS_FRAME);
pmap_pde_demotions++;
CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#lx"
@@ -2301,10 +2301,10 @@
pmap_invalidate_page(kernel_pmap, sva);
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
if (oldpde & PG_MANAGED) {
- pvh = pa_to_pvh(oldpde & PG_FRAME);
+ pvh = pa_to_pvh(oldpde & PG_PS_FRAME);
pmap_pvh_free(pvh, pmap, sva);
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
vm_page_dirty(m);
@@ -2600,7 +2600,7 @@
oldpde = newpde = *pde;
if (oldpde & PG_MANAGED) {
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
/*
* In contrast to the analogous operation on a 4KB page
@@ -2839,7 +2839,7 @@
* Promote the pv entries.
*/
if ((newpde & PG_MANAGED) != 0)
- pmap_pv_promote_pde(pmap, va, newpde & PG_FRAME);
+ pmap_pv_promote_pde(pmap, va, newpde & PG_PS_FRAME);
/*
* Propagate the PAT index to its proper position.
@@ -3820,7 +3820,7 @@
pc->pc_map[field] |= bitmask;
if ((tpte & PG_PS) != 0) {
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
- pvh = pa_to_pvh(tpte & PG_FRAME);
+ pvh = pa_to_pvh(tpte & PG_PS_FRAME);
TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
if (TAILQ_EMPTY(&pvh->pv_list)) {
for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
@@ -4029,7 +4029,7 @@
* table page.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
rtval++;
if (rtval > 4) {
@@ -4098,7 +4098,7 @@
* write access may repromote.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pte = pmap_pde_to_pte(pde, va);
oldpte = *pte;
if ((oldpte & PG_V) != 0) {
@@ -4163,7 +4163,8 @@
* fully populated, this removal never frees
* a page table page.
*/
- va += VM_PAGE_TO_PHYS(m) - (oldpde & PG_FRAME);
+ va += VM_PAGE_TO_PHYS(m) - (oldpde &
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
}
}
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#4 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.497 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.498 2008/05/03 17:05:38 sam Exp $
cpu HAMMER
ident GENERIC
@@ -235,6 +235,8 @@
# Wireless NIC cards
device wlan # 802.11 support
+options IEEE80211_DEBUG # enable debug msgs
+options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/NOTES#4 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.79 2008/04/29 21:36:15 sam Exp $
#
#
@@ -302,6 +302,7 @@
# (requires miibus)
# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter
# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters
# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
# nve: nVidia nForce MCP on-board Ethernet Networking
# ral: Ralink Technology IEEE 802.11 wireless adapter
@@ -313,6 +314,7 @@
options ED_HPP
options ED_SIC
device iwi
+device iwn
device ipw
device nfe # nVidia nForce MCP on-board Ethernet Networking
device nve # nVidia nForce MCP on-board Ethernet Networking
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcpu.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/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -43,6 +43,7 @@
* other processors"
*/
#define PCPU_MD_FIELDS \
+ char pc_monitorbuf[128] __aligned(128); /* cache line */ \
struct pcpu *pc_prvspace; /* Self-reference */ \
struct pmap *pc_curpmap; \
struct amd64tss *pc_tssp; \
==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/machdep.c#4 (text+ko) ====
@@ -46,7 +46,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.31 2008/04/25 05:18:48 jeff Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -326,12 +326,19 @@
}
void
-cpu_idle(void)
+cpu_idle(int busy)
{
cpu_sleep(0);
}
int
+cpu_idle_wakeup(int cpu)
+{
+
+ return (0);
+}
+
+int
fill_regs(struct thread *td, struct reg *regs)
{
struct trapframe *tf = td->td_frame;
==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/uart_dev_at91usart.c#2 (text) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.13 2007/12/25 17:51:55 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.14 2008/05/04 23:29:37 peter Exp $");
#include "opt_comconsole.h"
@@ -506,9 +506,20 @@
at91_rx_put(struct uart_softc *sc, int key)
{
#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
+ int kdb_brk;
+
if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
- if (kdb_alt_break(key, &sc->sc_altbrk))
- kdb_enter(KDB_WHY_BREAK, "Break sequence to console");
+ if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) {
+ case KDB_REQ_DEBUGGER:
+ kdb_enter(KDB_WHY_BREAK, "Break sequence on console");
+ break;
+ case KDB_REQ_PANIC:
+ kdb_panic("Panic sequence on console");
+ break;
+ case KDB_REQ_REBOOT:
+ kdb_reboot();
+ break;
+ }
}
#endif
uart_rx_put(sc, key);
==== //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1481 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1484 2008/05/06 22:41:23 julian Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -762,6 +762,8 @@
device ether #Generic Ethernet
device vlan #VLAN support (needs miibus)
device wlan #802.11 support
+options IEEE80211_DEBUG #enable debugging msgs
+options IEEE80211_AMPDU_AGE #age frames in AMPDU reorder q's
device wlan_wep #802.11 WEP support
device wlan_ccmp #802.11 CCMP support
device wlan_tkip #802.11 TKIP support
@@ -868,7 +870,12 @@
# The MBUF_STRESS_TEST option enables options which create
# various random failures / extreme cases related to mbuf
# functions. See mbuf(9) for a list of available test cases.
+# MBUF_PROFILING enables code to profile the mbuf chains
+# exiting the system (via participating interfaces) and
+# return a logarithmic histogram of monitored parameters
+# (e.g. packet size, wasted space, number of mbufs in chain).
options MBUF_STRESS_TEST
+options MBUF_PROFILING
# Statically Link in accept filters
options ACCEPT_FILTER_DATA
==== //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1297 2008/05/06 20:49:52 jhb Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -732,6 +732,48 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
+ipwbssfw.c optional ipwbssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwbssfw.c"
+ipw_bss.fwo optional ipwbssfw | ipwfw \
+ dependency "ipw_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
+ no-implicit-rule \
+ clean "ipw_bss.fwo"
+ipw_bss.fw optional ipwbssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_bss.fw"
+ipwibssfw.c optional ipwibssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwibssfw.c"
+ipw_ibss.fwo optional ipwibssfw | ipwfw \
+ dependency "ipw_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
+ no-implicit-rule \
+ clean "ipw_ibss.fwo"
+ipw_ibss.fw optional ipwibssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_ibss.fw"
+ipwmonitorfw.c optional ipwmonitorfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwmonitorfw.c"
+ipw_monitor.fwo optional ipwmonitorfw | ipwfw \
+ dependency "ipw_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
+ no-implicit-rule \
+ clean "ipw_monitor.fwo"
+ipw_monitor.fw optional ipwmonitorfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_monitor.fw"
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
@@ -746,6 +788,63 @@
dev/isp/isp_target.c optional isp
dev/ispfw/ispfw.c optional ispfw
dev/iwi/if_iwi.c optional iwi
+iwibssfw.c optional iwibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwibssfw.c"
+iwi_bss.fwo optional iwibssfw | iwifw \
+ dependency "iwi_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
+ no-implicit-rule \
+ clean "iwi_bss.fwo"
+iwi_bss.fw optional iwibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_bss.fw"
+iwiibssfw.c optional iwiibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwiibssfw.c"
+iwi_ibss.fwo optional iwiibssfw | iwifw \
+ dependency "iwi_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
+ no-implicit-rule \
+ clean "iwi_ibss.fwo"
+iwi_ibss.fw optional iwiibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_ibss.fw"
+iwimonitorfw.c optional iwimonitorfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwimonitorfw.c"
+iwi_monitor.fwo optional iwimonitorfw | iwifw \
+ dependency "iwi_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
+ no-implicit-rule \
+ clean "iwi_monitor.fwo"
+iwi_monitor.fw optional iwimonitorfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_monitor.fw"
+dev/iwn/if_iwn.c optional iwn
+iwnfw.c optional iwnfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwnfw.c"
+iwnfw.fwo optional iwnfw \
+ dependency "iwn.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
+ no-implicit-rule \
+ clean "iwn.fwo"
+iwn.fw optional iwnfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwn.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
@@ -832,6 +931,7 @@
dev/mpt/mpt_debug.c optional mpt
dev/mpt/mpt_pci.c optional mpt pci
dev/mpt/mpt_raid.c optional mpt
+dev/mpt/mpt_user.c optional mpt
dev/msk/if_msk.c optional msk
dev/mxge/if_mxge.c optional mxge pci
dev/mxge/mxge_lro.c optional mxge pci
@@ -922,6 +1022,62 @@
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
dev/ral/if_ral_pci.c optional ral pci
+rt2561fw.c optional rt2561fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561fw.c"
+rt2561fw.fwo optional rt2561fw | ralfw \
+ dependency "rt2561.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
+ no-implicit-rule \
+ clean "rt2561.fwo"
+rt2561.fw optional rt2561fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561.fw"
+rt2561sfw.c optional rt2561sfw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561sfw.c"
+rt2561sfw.fwo optional rt2561sfw | ralfw \
+ dependency "rt2561s.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
+ no-implicit-rule \
+ clean "rt2561s.fwo"
+rt2561s.fw optional rt2561sfw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561s.fw"
+rt2661fw.c optional rt2661fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2661fw.c"
+rt2661fw.fwo optional rt2661fw | ralfw \
+ dependency "rt2661.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
+ no-implicit-rule \
+ clean "rt2661.fwo"
+rt2661.fw optional rt2661fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2661.fw"
+rt2860fw.c optional rt2860fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2860fw.c"
+rt2860fw.fwo optional rt2860fw | ralfw \
+ dependency "rt2860.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
+ no-implicit-rule \
+ clean "rt2860.fwo"
+rt2860.fw optional rt2860fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2860.fw"
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
@@ -1183,6 +1339,20 @@
dev/wi/if_wi_pccard.c optional wi pccard
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list