PERFORCE change 136873 for review
Wayne Salamon
wsalamon at FreeBSD.org
Tue Mar 4 23:41:49 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=136873
Change 136873 by wsalamon at gretsch on 2008/03/04 23:41:08
Sync development branch with vendor branch.
Affected files ...
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/_bus.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btx/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/btx/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.powerpc#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.powerpc#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.powerpc#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/bin2h.pl#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_pciids.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/LICENSE#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_80003es2lan.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_80003es2lan.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82540.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82541.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82541.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82542.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82543.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82543.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82571.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82571.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82575.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82575.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_api.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_api.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_defines.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_hw.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_ich8lan.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_ich8lan.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_mac.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_mac.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_manage.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_manage.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_nvm.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_nvm.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_osdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_phy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_phy.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_regs.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ic/quicc.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_82575.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_82575.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_api.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_api.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_defines.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_hw.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_mac.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_mac.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_manage.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_manage.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_nvm.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_nvm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_osdep.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_phy.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_phy.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_regs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/if_igb.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/if_igb.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/md/md.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/msk/if_mskreg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/quicc/quicc_bfe.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/quicc/quicc_bfe_ocp.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/quicc/quicc_bus.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/quicc/quicc_core.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_quicc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bus.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_dev_quicc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tsec/if_tsec.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tsec/if_tsec.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tsec/if_tsecreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_bus_ocp.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_bus_scc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_dev_quicc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ubsa.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/coda/TODO#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nwfs/nwfs_node.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nwfs/nwfs_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_node.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_vtoc8.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/smp.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_main.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_cpuset.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/syscalls.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/syscalls.master#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vnode_if.src#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/em/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_apple/Makefile#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_gpt/Makefile#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_part/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/igb/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ipfw_nat/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_nat.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw_nat.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/key.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/key_debug.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netncp/ncp_conn.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netsmb/smb_conn.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_idmap.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pci/if_rl.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/swtch.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/trap.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/trap_subr.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/clock.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/copyinout.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/interrupt.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/locore.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/pmap.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/support.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/swtch.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/trap.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/trap_subr.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/uio_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/vm_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/MPC85XX#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/frame.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/hid.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/kdb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/md_var.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/mmuvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/ocpbus.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pcb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pmap.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/psl.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pte.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/sf_buf.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/spr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/tlb.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/trap.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/trap_aim.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/trap_booke.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/nexus.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/ocpbus.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/ocpbus.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/opic.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/pci_ocp.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/autoconf.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/db_trace.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/gdb_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm_klib.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_private.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_trigger.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/_types.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/buf.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/bufobj.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/cpuset.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/lockmgr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/mount.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/param.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/proc.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/sched.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/smp.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/syscall.mk#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/sysproto.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/types.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/vnode.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/vtoc.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/extattr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_map.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_object.c#2 integrate
Differences ...
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/identcpu.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.157 2008/02/02 23:17:27 das Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.158 2008/03/02 07:58:40 jeff Exp $");
#include "opt_cpu.h"
@@ -97,6 +97,10 @@
{ "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */
};
+int cpu_cores;
+int cpu_logical;
+
+
extern int pq_l2size;
extern int pq_l2nways;
@@ -360,11 +364,13 @@
if ((regs[0] & 0x1f) != 0)
cmp = ((regs[0] >> 26) & 0x3f) + 1;
}
+ cpu_cores = cmp;
+ cpu_logical = htt / cmp;
if (cmp > 1)
printf("\n Cores per package: %d", cmp);
if ((htt / cmp) > 1)
printf("\n Logical CPUs per core: %d",
- htt / cmp);
+ cpu_logical);
}
}
/* Avoid ugly blank lines: only print newline when we have to. */
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.287 2007/08/02 21:17:58 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.288 2008/03/02 07:58:40 jeff Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -83,12 +83,6 @@
extern struct pcpu __pcpu[];
-/*
- * CPU topology map datastructures for HTT.
- */
-static struct cpu_group mp_groups[MAXCPU];
-static struct cpu_top mp_top;
-
/* AP uses this during bootstrap. Do not staticize. */
char *bootSTK;
static int bootAP;
@@ -182,40 +176,38 @@
mem_range_softc.mr_op->initAP(&mem_range_softc);
}
-void
-mp_topology(void)
+struct cpu_group *
+cpu_topo(void)
{
- struct cpu_group *group;
- int apic_id;
- int groups;
- int cpu;
-
- /* Build the smp_topology map. */
- /* Nothing to do if there is no HTT support. */
- if (hyperthreading_cpus <= 1)
- return;
- group = &mp_groups[0];
- groups = 1;
- for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) {
- if (!cpu_info[apic_id].cpu_present)
- continue;
- /*
- * If the current group has members and we're not a logical
- * cpu, create a new group.
- */
- if (group->cg_count != 0 &&
- (apic_id % hyperthreading_cpus) == 0) {
- group++;
- groups++;
- }
- group->cg_count++;
- group->cg_mask |= 1 << cpu;
- cpu++;
+ if (cpu_cores == 0)
+ cpu_cores = 1;
+ if (cpu_logical == 0)
+ cpu_logical = 1;
+ if (mp_ncpus % (cpu_cores * cpu_logical) != 0) {
+ printf("WARNING: Non-uniform processors.\n");
+ printf("WARNING: Using suboptimal topology.\n");
+ return (smp_topo_none());
}
-
- mp_top.ct_count = groups;
- mp_top.ct_group = mp_groups;
- smp_topology = &mp_top;
+ /*
+ * No multi-core or hyper-threaded.
+ */
+ if (cpu_logical * cpu_cores == 1)
+ return (smp_topo_none());
+ /*
+ * Only HTT no multi-core.
+ */
+ if (cpu_logical > 1 && cpu_cores == 1)
+ return (smp_topo_1level(CG_SHARE_L1, cpu_logical, CG_FLAG_HTT));
+ /*
+ * Only multi-core no HTT.
+ */
+ if (cpu_cores > 1 && cpu_logical == 1)
+ return (smp_topo_1level(CG_SHARE_NONE, cpu_cores, 0));
+ /*
+ * Both HTT and multi-core.
+ */
+ return (smp_topo_2level(CG_SHARE_NONE, cpu_cores,
+ CG_SHARE_L1, cpu_logical, CG_FLAG_HTT));
}
/*
@@ -409,9 +401,6 @@
}
set_interrupt_apic_ids();
-
- /* Last, setup the cpu topology now that we have probed CPUs */
- mp_topology();
}
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/smp.h#2 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/amd64/include/smp.h,v 1.91 2007/09/20 20:38:43 attilio Exp $
+ * $FreeBSD: src/sys/amd64/include/smp.h,v 1.92 2008/03/02 07:58:40 jeff Exp $
*
*/
@@ -36,6 +36,10 @@
extern struct pcb stoppcbs[];
extern int cpu_apic_ids[];
+/* global data in identcpu.c */
+extern int cpu_cores;
+extern int cpu_logical;
+
/* IPI handlers */
inthand_t
IDTVEC(invltlb), /* TLB shootdowns - global */
@@ -57,7 +61,6 @@
void ipi_bitmap_handler(struct trapframe frame);
u_int mp_bootaddress(u_int);
int mp_grab_cpu_hlt(void);
-void mp_topology(void);
void smp_cache_flush(void);
void smp_invlpg(vm_offset_t addr);
void smp_masked_invlpg(u_int mask, vm_offset_t addr);
==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/_bus.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
-% * Copyright (c) 2005 M. Warner Losh.
+ * Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
+ * $FreeBSD: src/sys/arm/include/_bus.h,v 1.2 2008/02/26 11:45:32 rwatson Exp $
*/
#ifndef ARM_INCLUDE__BUS_H
==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.9 2008/02/26 11:44:41 rwatson Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -234,7 +234,7 @@
sc->sc_mem_rman.rm_descr = "IXP425 Memory";
if (rman_init(&sc->sc_mem_rman) != 0 ||
rman_manage_region(&sc->sc_mem_rman, 0, ~0) != 0)
- panic("ixp425_attach: failed to set up IRQ rman");
+ panic("ixp425_attach: failed to set up memory rman");
BUS_ADD_CHILD(dev, 0, "pcib", 0);
BUS_ADD_CHILD(dev, 0, "ixpclk", 0);
==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 (text+ko) ====
@@ -9,13 +9,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
*
* THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -31,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_iic.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_iic.c,v 1.2 2008/03/03 06:39:36 kevlo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot2/boot2.c#2 (text+ko) ====
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.85 2007/10/26 21:02:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.86 2008/02/28 17:08:05 jhb Exp $");
#include <sys/param.h>
#include <sys/disklabel.h>
@@ -129,7 +129,7 @@
unsigned start;
int init;
} dsk;
-static char cmd[512];
+static char cmd[512], cmddup[512];
static char kname[1024];
static uint32_t opts;
static int comspeed = SIOSPD;
@@ -255,10 +255,11 @@
fsread(ino, cmd, sizeof(cmd));
if (*cmd) {
+ memcpy(cmddup, cmd, sizeof(cmd));
if (parse())
autoboot = 0;
if (!OPT_CHECK(RBX_QUIET))
- printf("%s: %s", PATH_CONFIG, cmd);
+ printf("%s: %s", PATH_CONFIG, cmddup);
/* Do not process this command twice */
*cmd = 0;
}
==== //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btx/Makefile#2 (text+ko) ====
@@ -1,14 +1,10 @@
-# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.19 2004/12/21 08:47:13 ru Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.20 2008/02/27 23:35:39 jhb Exp $
PROG= btx
INTERNALPROG=
NO_MAN=
SRCS= btx.S
-.if defined(PAGING)
-CFLAGS+=-DPAGING
-.endif
-
.if defined(BOOT_BTX_NOHANG)
BOOT_BTX_FLAGS=0x1
.else
==== //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btx/btx.S#2 (text+ko) ====
@@ -12,7 +12,7 @@
* warranties of merchantability and fitness for a particular
* purpose.
*
- * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.44 2006/12/06 17:45:35 jhb Exp $
+ * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.45 2008/02/27 23:35:39 jhb Exp $
*/
/*
@@ -25,8 +25,7 @@
.set MEM_IDT,0x1e00 # IDT
.set MEM_TSS,0x1f98 # TSS
.set MEM_MAP,0x2000 # I/O bit map
- .set MEM_DIR,0x4000 # Page directory
- .set MEM_TBL,0x5000 # Page tables
+ .set MEM_TSS_END,0x3fff # Page directory
.set MEM_ORG,0x9000 # BTX code
.set MEM_USR,0xa000 # Start of user memory
/*
@@ -88,7 +87,7 @@
.set _ESP0H,MEM_ESP0>>0x8 # Byte 1 of ESP0
.set _ESP1H,MEM_ESP1>>0x8 # Byte 1 of ESP1
.set _TSSIO,MEM_MAP-MEM_TSS # TSS I/O base
- .set _TSSLM,MEM_DIR-MEM_TSS-1 # TSS limit
+ .set _TSSLM,MEM_TSS_END-MEM_TSS # TSS limit
.set _IDTLM,MEM_TSS-MEM_IDT-1 # IDT limit
/*
* Code segment.
@@ -158,58 +157,15 @@
movb $SEL_SDATA,TSS_SS0(%di) # Set SS0
movb $_ESP1H,TSS_ESP1+1(%di) # Set ESP1
movb $_TSSIO,TSS_MAP(%di) # Set I/O bit map base
-#ifdef PAGING
/*
- * Create page directory.
- */
- xor %edx,%edx # Page
- mov $PAG_SIZ>>0x8,%dh # size
- xor %eax,%eax # Zero
- mov $MEM_DIR,%di # Page directory
- mov $PAG_CNT>>0xa,%cl # Entries
- mov $MEM_TBL|0x7,%ax # First entry
-init.5: stosl # Write entry
- add %dx,%ax # To next
- loop init.5 # Till done
-/*
- * Create page tables.
- */
- mov $MEM_TBL,%di # Page table
- mov $PAG_CNT>>0x8,%ch # Entries
- xor %ax,%ax # Start address
-init.6: mov $0x7,%al # Set U:W:P flags
- cmp btx_hdr+0x8,%cx # Standard user page?
- jb init.7 # Yes
- cmp $PAG_CNT-MEM_BTX>>0xc,%cx # BTX memory?
- jae init.7 # No or first page
- and $~0x2,%al # Clear W flag
- cmp $PAG_CNT-MEM_USR>>0xc,%cx # User page zero?
- jne init.7 # No
- testb $0x80,btx_hdr+0x7 # Unmap it?
- jz init.7 # No
- and $~0x1,%al # Clear P flag
-init.7: stosl # Set entry
- add %edx,%eax # Next address
- loop init.6 # Till done
-#endif
-/*
* Bring up the system.
*/
mov $0x2820,%bx # Set protected mode
callw setpic # IRQ offsets
lidt idtdesc # Set IDT
-#ifdef PAGING
- xor %eax,%eax # Set base
- mov $MEM_DIR>>0x8,%ah # of page
- mov %eax,%cr3 # directory
-#endif
lgdt gdtdesc # Set GDT
mov %cr0,%eax # Switch to protected
-#ifdef PAGING
- or $0x80000001,%eax # mode and enable paging
-#else
inc %ax # mode
-#endif
mov %eax,%cr0 #
ljmp $SEL_SCODE,$init.8 # To 32-bit code
.code32
@@ -854,13 +810,6 @@
movl $MEM_USR,%eax # User base address
addl 0xc(%esp,1),%eax # Change to user
leal 0x4(%eax),%esp # stack
-#ifdef PAGING
- movl %cr0,%eax # Turn
- andl $~0x80000000,%eax # off
- movl %eax,%cr0 # paging
- xorl %eax,%eax # Flush
- movl %eax,%cr3 # TLB
-#endif
popl %eax # Call
call *%eax # program
intx30.1: orb $0x1,%ss:btx_hdr+0x7 # Flag reboot
==== //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/gptboot/gptboot.c#2 (text+ko) ====
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/gptboot/gptboot.c,v 1.86 2007/10/26 21:02:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/gptboot/gptboot.c,v 1.87 2008/02/28 17:08:05 jhb Exp $");
#include <sys/param.h>
#include <sys/gpt.h>
@@ -127,7 +127,7 @@
daddr_t start;
int init;
} dsk;
-static char cmd[512];
+static char cmd[512], cmddup[512];
static char kname[1024];
static uint32_t opts;
static int comspeed = SIOSPD;
@@ -253,10 +253,11 @@
fsread(ino, cmd, sizeof(cmd));
if (*cmd) {
+ memcpy(cmddup, cmd, sizeof(cmd));
if (parse())
autoboot = 0;
if (!OPT_CHECK(RBX_QUIET))
- printf("%s: %s", PATH_CONFIG, cmd);
+ printf("%s: %s", PATH_CONFIG, cmddup);
/* Do not process this command twice */
*cmd = 0;
}
==== //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/biosdisk.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.54 2007/11/12 23:53:43 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.55 2008/02/28 17:49:23 jhb Exp $");
/*
* BIOS disk device handling.
@@ -316,6 +316,29 @@
}
}
+/* Given a size in 512 byte sectors, convert it to a human-readable number. */
+static char *
+display_size(uint64_t size)
+{
+ static char buf[80];
+ char unit;
+
+ size /= 2;
+ unit = 'K';
+ if (size >= 10485760000LL) {
+ size /= 1073741824;
+ unit = 'T';
+ } else if (size >= 10240000) {
+ size /= 1048576;
+ unit = 'G';
+ } else if (size >= 10000) {
+ size /= 1024;
+ unit = 'M';
+ }
+ sprintf(buf, "%.6ld%cB", (long)size, unit);
+ return (buf);
+}
+
static uuid_t efi = GPT_ENT_TYPE_EFI;
static uuid_t freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT;
static uuid_t freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS;
@@ -329,33 +352,22 @@
{
char stats[80];
char line[96];
- uint64_t size;
- char unit;
- if (verbose) {
- size = (gp->gp_end + 1 - gp->gp_start) / 2048;
- unit = 'M';
- if (size >= 10240000) {
- size /= 1048576;
- unit = 'T';
- } else if (size >= 10000) {
- size /= 1024;
- unit = 'G';
- }
- sprintf(stats, " %.6ld%cB", (long)size, unit);
- } else
+ if (verbose)
+ sprintf(stats, " %s", display_size(gp->gp_end + 1 - gp->gp_start));
+ else
stats[0] = '\0';
if (uuid_equal(&gp->gp_type, &efi, NULL))
- sprintf(line, "%s: EFI%s\n", prefix, stats);
+ sprintf(line, "%s: EFI %s\n", prefix, stats);
else if (uuid_equal(&gp->gp_type, &ms_basic_data, NULL))
- sprintf(line, "%s: FAT/NTFS%s\n", prefix, stats);
+ sprintf(line, "%s: FAT/NTFS %s\n", prefix, stats);
else if (uuid_equal(&gp->gp_type, &freebsd_boot, NULL))
sprintf(line, "%s: FreeBSD boot%s\n", prefix, stats);
else if (uuid_equal(&gp->gp_type, &freebsd_ufs, NULL))
- sprintf(line, "%s: FreeBSD UFS%s\n", prefix, stats);
+ sprintf(line, "%s: FreeBSD UFS %s\n", prefix, stats);
else if (uuid_equal(&gp->gp_type, &freebsd_zfs, NULL))
- sprintf(line, "%s: FreeBSD ZFS%s\n", prefix, stats);
+ sprintf(line, "%s: FreeBSD ZFS %s\n", prefix, stats);
else if (uuid_equal(&gp->gp_type, &freebsd_swap, NULL))
sprintf(line, "%s: FreeBSD swap%s\n", prefix, stats);
else
@@ -377,70 +389,50 @@
bd_printslice(struct open_disk *od, struct dos_partition *dp, char *prefix,
int verbose)
{
+ char stats[80];
char line[80];
+ if (verbose)
+ sprintf(stats, " %s (%d - %d)", display_size(dp->dp_size),
+ dp->dp_start, dp->dp_start + dp->dp_size);
+ else
+ stats[0] = '\0';
+
switch (dp->dp_typ) {
case DOSPTYP_386BSD:
bd_printbsdslice(od, (daddr_t)dp->dp_start, prefix, verbose);
return;
case DOSPTYP_LINSWP:
- if (verbose)
- sprintf(line, "%s: Linux swap %.6dMB (%d - %d)\n",
- prefix, dp->dp_size / 2048,
- dp->dp_start, dp->dp_start + dp->dp_size);
- else
- sprintf(line, "%s: Linux swap\n", prefix);
+ sprintf(line, "%s: Linux swap%s\n", prefix, stats);
break;
case DOSPTYP_LINUX:
/*
* XXX
* read the superblock to confirm this is an ext2fs partition?
*/
- if (verbose)
- sprintf(line, "%s: ext2fs %.6dMB (%d - %d)\n", prefix,
- dp->dp_size / 2048, dp->dp_start,
- dp->dp_start + dp->dp_size);
- else
- sprintf(line, "%s: ext2fs\n", prefix);
+ sprintf(line, "%s: ext2fs%s\n", prefix, stats);
break;
case 0x00: /* unused partition */
case DOSPTYP_EXT:
return;
case 0x01:
- if (verbose)
- sprintf(line, "%s: FAT-12 %.6dMB (%d - %d)\n", prefix,
- dp->dp_size / 2048, dp->dp_start,
- dp->dp_start + dp->dp_size);
- else
- sprintf(line, "%s: FAT-12\n", prefix);
+ sprintf(line, "%s: FAT-12%s\n", prefix, stats);
break;
case 0x04:
case 0x06:
case 0x0e:
- if (verbose)
- sprintf(line, "%s: FAT-16 %.6dMB (%d - %d)\n", prefix,
- dp->dp_size / 2048, dp->dp_start,
- dp->dp_start + dp->dp_size);
- else
- sprintf(line, "%s: FAT-16\n", prefix);
+ sprintf(line, "%s: FAT-16%s\n", prefix, stats);
+ break;
+ case 0x07:
+ sprintf(line, "%s: NTFS/HPFS%s\n", prefix, stats);
break;
case 0x0b:
case 0x0c:
- if (verbose)
- sprintf(line, "%s: FAT-32 %.6dMB (%d - %d)\n", prefix,
- dp->dp_size / 2048, dp->dp_start,
- dp->dp_start + dp->dp_size);
- else
- sprintf(line, "%s: FAT-32\n", prefix);
+ sprintf(line, "%s: FAT-32%s\n", prefix, stats);
break;
default:
- if (verbose)
- sprintf(line, "%s: Unknown fs: 0x%x %.6dMB (%d - %d)\n",
- prefix, dp->dp_typ, dp->dp_size / 2048,
- dp->dp_start, dp->dp_start + dp->dp_size);
- else
- sprintf(line, "%s: Unknown fs: 0x%x\n", prefix,
- dp->dp_typ);
+ sprintf(line, "%s: Unknown fs: 0x%x %s\n", prefix, dp->dp_typ,
+ stats);
}
pager_output(line);
}
@@ -484,11 +476,11 @@
/* Only print out statistics in verbose mode */
if (verbose)
- sprintf(line, " %s%c: %s %.6dMB (%d - %d)\n", prefix, 'a' + i,
- (lp->d_partitions[i].p_fstype == FS_SWAP) ? "swap" :
+ sprintf(line, " %s%c: %s %s (%d - %d)\n", prefix, 'a' + i,
+ (lp->d_partitions[i].p_fstype == FS_SWAP) ? "swap " :
(lp->d_partitions[i].p_fstype == FS_VINUM) ? "vinum" :
- "FFS",
- lp->d_partitions[i].p_size / 2048,
+ "FFS ",
+ display_size(lp->d_partitions[i].p_size),
lp->d_partitions[i].p_offset,
lp->d_partitions[i].p_offset + lp->d_partitions[i].p_size);
else
==== //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/btx/Makefile#2 (text+ko) ====
@@ -1,14 +1,10 @@
-# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.12 2005/05/08 14:17:27 nyan Exp $
+# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.13 2008/02/28 17:33:05 nyan Exp $
PROG= btx
INTERNALPROG=
NO_MAN=
SRCS= btx.S
-.if defined(PAGING)
-CFLAGS+=-DPAGING
-.endif
-
.if defined(BOOT_BTX_NOHANG)
BOOT_BTX_FLAGS=0x1
.else
==== //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/btx/btx.S#2 (text+ko) ====
@@ -12,7 +12,7 @@
* warranties of merchantability and fitness for a particular
* purpose.
*
- * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.22 2006/11/09 08:05:51 nyan Exp $
+ * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.23 2008/02/28 17:33:06 nyan Exp $
*/
/*
@@ -25,8 +25,7 @@
.set MEM_IDT,0x1e00 # IDT
.set MEM_TSS,0x1f98 # TSS
.set MEM_MAP,0x2000 # I/O bit map
- .set MEM_DIR,0x4000 # Page directory
- .set MEM_TBL,0x5000 # Page tables
+ .set MEM_TSS_END,0x3fff # Page directory
.set MEM_ORG,0x9000 # BTX code
.set MEM_USR,0xa000 # Start of user memory
/*
@@ -86,7 +85,7 @@
.set _ESP0H,MEM_ESP0>>0x8 # Byte 1 of ESP0
.set _ESP1H,MEM_ESP1>>0x8 # Byte 1 of ESP1
.set _TSSIO,MEM_MAP-MEM_TSS # TSS I/O base
- .set _TSSLM,MEM_DIR-MEM_TSS-1 # TSS limit
+ .set _TSSLM,MEM_TSS_END-MEM_TSS # TSS limit
.set _IDTLM,MEM_TSS-MEM_IDT-1 # IDT limit
/*
* Code segment.
@@ -156,58 +155,15 @@
movb $SEL_SDATA,TSS_SS0(%di) # Set SS0
movb $_ESP1H,TSS_ESP1+1(%di) # Set ESP1
movb $_TSSIO,TSS_MAP(%di) # Set I/O bit map base
-#ifdef PAGING
/*
- * Create page directory.
- */
- xor %edx,%edx # Page
- mov $PAG_SIZ>>0x8,%dh # size
- xor %eax,%eax # Zero
- mov $MEM_DIR,%di # Page directory
- mov $PAG_CNT>>0xa,%cl # Entries
- mov $MEM_TBL|0x7,%ax # First entry
-init.5: stosl # Write entry
- add %dx,%ax # To next
- loop init.5 # Till done
-/*
- * Create page tables.
- */
- mov $MEM_TBL,%di # Page table
- mov $PAG_CNT>>0x8,%ch # Entries
- xor %ax,%ax # Start address
-init.6: mov $0x7,%al # Set U:W:P flags
- cmp btx_hdr+0x8,%cx # Standard user page?
- jb init.7 # Yes
- cmp $PAG_CNT-MEM_BTX>>0xc,%cx # BTX memory?
- jae init.7 # No or first page
- and $~0x2,%al # Clear W flag
- cmp $PAG_CNT-MEM_USR>>0xc,%cx # User page zero?
- jne init.7 # No
- testb $0x80,btx_hdr+0x7 # Unmap it?
- jz init.7 # No
- and $~0x1,%al # Clear P flag
-init.7: stosl # Set entry
- add %edx,%eax # Next address
- loop init.6 # Till done
-#endif
-/*
* Bring up the system.
*/
mov $0x2820,%bx # Set protected mode
callw setpic # IRQ offsets
lidt idtdesc # Set IDT
-#ifdef PAGING
- xor %eax,%eax # Set base
- mov $MEM_DIR>>0x8,%ah # of page
- mov %eax,%cr3 # directory
-#endif
lgdt gdtdesc # Set GDT
mov %cr0,%eax # Switch to protected
-#ifdef PAGING
- or $0x80000001,%eax # mode and enable paging
-#else
inc %ax # mode
-#endif
mov %eax,%cr0 #
ljmp $SEL_SCODE,$init.8 # To 32-bit code
.code32
@@ -882,13 +838,6 @@
movl $MEM_USR,%eax # User base address
addl 0xc(%esp,1),%eax # Change to user
leal 0x4(%eax),%esp # stack
-#ifdef PAGING
- movl %cr0,%eax # Turn
- andl $~0x80000000,%eax # off
- movl %eax,%cr0 # paging
- xorl %eax,%eax # Flush
- movl %eax,%cr3 # TLB
-#endif
popl %eax # Call
call *%eax # program
intx30.1: orb $0x1,%ss:btx_hdr+0x7 # Flag reboot
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list