PERFORCE change 137651 for review
John Baldwin
jhb at FreeBSD.org
Thu Mar 13 21:35:28 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=137651
Change 137651 by jhb at jhb_mutex on 2008/03/13 21:35:00
IFC @137644
Affected files ...
.. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#10 integrate
.. //depot/projects/smpng/sys/amd64/acpica/madt.c#15 integrate
.. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#27 integrate
.. //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#25 integrate
.. //depot/projects/smpng/sys/amd64/amd64/legacy.c#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#69 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mem.c#11 integrate
.. //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#3 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#45 integrate
.. //depot/projects/smpng/sys/amd64/amd64/nexus.c#28 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#78 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#61 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#37 integrate
.. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#9 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#61 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#41 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#16 integrate
.. //depot/projects/smpng/sys/amd64/include/nexusvar.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/pmap.h#28 integrate
.. //depot/projects/smpng/sys/amd64/include/proc.h#6 integrate
.. //depot/projects/smpng/sys/amd64/include/smp.h#17 integrate
.. //depot/projects/smpng/sys/amd64/include/specialreg.h#14 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#26 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#29 integrate
.. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#23 integrate
.. //depot/projects/smpng/sys/arm/arm/dump_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/arm/genassym.c#10 integrate
.. //depot/projects/smpng/sys/arm/arm/locore.S#16 integrate
.. //depot/projects/smpng/sys/arm/arm/nexus.c#11 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap.c#42 integrate
.. //depot/projects/smpng/sys/arm/arm/swtch.S#16 integrate
.. //depot/projects/smpng/sys/arm/arm/trap.c#29 integrate
.. //depot/projects/smpng/sys/arm/arm/uio_machdep.c#5 integrate
.. //depot/projects/smpng/sys/arm/conf/AVILA#4 integrate
.. //depot/projects/smpng/sys/arm/include/_bus.h#2 integrate
.. //depot/projects/smpng/sys/arm/include/asmacros.h#7 integrate
.. //depot/projects/smpng/sys/arm/include/atomic.h#29 integrate
.. //depot/projects/smpng/sys/arm/include/pmap.h#24 integrate
.. //depot/projects/smpng/sys/arm/include/sysarch.h#4 integrate
.. //depot/projects/smpng/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#6 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate
.. //depot/projects/smpng/sys/boot/Makefile#25 integrate
.. //depot/projects/smpng/sys/boot/common/bootstrap.h#12 integrate
.. //depot/projects/smpng/sys/boot/common/dev_net.c#6 integrate
.. //depot/projects/smpng/sys/boot/common/load_elf.c#17 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#33 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#7 integrate
.. //depot/projects/smpng/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#16 integrate
.. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeldr.S#6 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#8 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#9 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.S#7 integrate
.. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#15 integrate
.. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#14 integrate
.. //depot/projects/smpng/sys/boot/powerpc/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/powerpc/ofw/conf.c#2 integrate
.. //depot/projects/smpng/sys/boot/powerpc/uboot/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/powerpc/uboot/conf.c#1 branch
.. //depot/projects/smpng/sys/boot/powerpc/uboot/help.uboot#1 branch
.. //depot/projects/smpng/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch
.. //depot/projects/smpng/sys/boot/powerpc/uboot/metadata.c#1 branch
.. //depot/projects/smpng/sys/boot/powerpc/uboot/start.S#1 branch
.. //depot/projects/smpng/sys/boot/powerpc/uboot/version#1 branch
.. //depot/projects/smpng/sys/boot/uboot/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/uboot/common/Makefile.inc#1 branch
.. //depot/projects/smpng/sys/boot/uboot/common/main.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/api_public.h#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/console.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/copy.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/devicename.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/disk.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/elf_freebsd.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/glue.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/glue.h#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/libuboot.h#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/module.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/net.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/reboot.c#1 branch
.. //depot/projects/smpng/sys/boot/uboot/lib/time.c#1 branch
.. //depot/projects/smpng/sys/cam/cam_periph.c#26 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#49 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#17 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#40 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#40 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#40 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#40 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#44 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_futex.c#6 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#85 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.h#3 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#38 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#23 integrate
.. //depot/projects/smpng/sys/conf/Makefile.arm#28 integrate
.. //depot/projects/smpng/sys/conf/NOTES#147 integrate
.. //depot/projects/smpng/sys/conf/files#211 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#53 integrate
.. //depot/projects/smpng/sys/conf/files.i386#109 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#38 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#64 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#60 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#58 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#67 integrate
.. //depot/projects/smpng/sys/conf/ldscript.powerpc#3 integrate
.. //depot/projects/smpng/sys/conf/options#146 integrate
.. //depot/projects/smpng/sys/conf/options.powerpc#11 integrate
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate
.. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate
.. //depot/projects/smpng/sys/ddb/db_capture.c#2 integrate
.. //depot/projects/smpng/sys/ddb/db_command.c#39 integrate
.. //depot/projects/smpng/sys/ddb/db_examine.c#9 integrate
.. //depot/projects/smpng/sys/ddb/db_input.c#10 integrate
.. //depot/projects/smpng/sys/ddb/db_textdump.c#2 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#104 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#41 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#42 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#68 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_nvidia.c#2 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#27 integrate
.. //depot/projects/smpng/sys/dev/amr/amrreg.h#10 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#83 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#53 integrate
.. //depot/projects/smpng/sys/dev/atkbdc/psm.c#9 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bce.c#19 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#5 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#10 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#28 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#9 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#96 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#57 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#55 integrate
.. //depot/projects/smpng/sys/dev/cmx/cmx.c#1 branch
.. //depot/projects/smpng/sys/dev/cmx/cmx_pccard.c#1 branch
.. //depot/projects/smpng/sys/dev/cmx/cmxreg.h#1 branch
.. //depot/projects/smpng/sys/dev/cmx/cmxvar.h#1 branch
.. //depot/projects/smpng/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/smpng/sys/dev/cpufreq/ichss.c#5 integrate
.. //depot/projects/smpng/sys/dev/cxgb/bin2h.pl#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_regs.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_version.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_ioctl.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_l2t.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_l2t.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#5 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#7 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/sys/cxgb_support.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/sys/mbufq.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/sys/mvec.h#5 integrate
.. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate
.. //depot/projects/smpng/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/smpng/sys/dev/cxgb/t3b_protocol_sram.h#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/smpng/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/t3cdev.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete
.. //depot/projects/smpng/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch
.. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#7 integrate
.. //depot/projects/smpng/sys/dev/em/LICENSE#6 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82540.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82541.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82541.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82542.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82543.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82543.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82571.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82571.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_82575.c#4 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82575.h#4 delete
.. //depot/projects/smpng/sys/dev/em/e1000_api.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_api.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_defines.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_hw.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_mac.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_mac.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_manage.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_manage.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_nvm.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_nvm.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_osdep.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_phy.c#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_phy.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/e1000_regs.h#4 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.c#85 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.h#43 integrate
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#34 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#18 integrate
.. //depot/projects/smpng/sys/dev/hptiop/hptiop.c#3 integrate
.. //depot/projects/smpng/sys/dev/hptiop/hptiop.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/array.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/him.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/himfuncs.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/hptintf.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/hptrr_config.c#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/hptrr_config.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate
.. //depot/projects/smpng/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/ldm.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/list.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/os_bsd.h#2 integrate
.. //depot/projects/smpng/sys/dev/hptrr/osm.h#2 integrate
.. //depot/projects/smpng/sys/dev/ic/quicc.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_82575.c#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_82575.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_api.c#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_api.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_defines.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_hw.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_mac.c#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_mac.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_manage.c#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_manage.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_nvm.c#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_nvm.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_osdep.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_phy.c#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_phy.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/e1000_regs.h#1 branch
.. //depot/projects/smpng/sys/dev/igb/if_igb.c#1 branch
.. //depot/projects/smpng/sys/dev/igb/if_igb.h#1 branch
.. //depot/projects/smpng/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/smpng/sys/dev/lge/if_lge.c#39 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#83 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfi.c#20 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfireg.h#9 integrate
.. //depot/projects/smpng/sys/dev/mii/amphy.c#17 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphy.c#45 integrate
.. //depot/projects/smpng/sys/dev/mii/ciphy.c#8 integrate
.. //depot/projects/smpng/sys/dev/mii/miidevs#27 integrate
.. //depot/projects/smpng/sys/dev/mii/nsphy.c#17 integrate
.. //depot/projects/smpng/sys/dev/mii/nsphyter.c#1 branch
.. //depot/projects/smpng/sys/dev/mii/nsphyterreg.h#1 branch
.. //depot/projects/smpng/sys/dev/mii/rgephy.c#13 integrate
.. //depot/projects/smpng/sys/dev/msk/if_msk.c#10 integrate
.. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#5 integrate
.. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#21 integrate
.. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#10 integrate
.. //depot/projects/smpng/sys/dev/mxge/mxge_lro.c#3 integrate
.. //depot/projects/smpng/sys/dev/mxge/rss_eth_z8e.h#2 integrate
.. //depot/projects/smpng/sys/dev/mxge/rss_ethp_z8e.h#2 integrate
.. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#11 integrate
.. //depot/projects/smpng/sys/dev/nfe/if_nfereg.h#6 integrate
.. //depot/projects/smpng/sys/dev/nfe/if_nfevar.h#4 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#9 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs#58 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#96 integrate
.. //depot/projects/smpng/sys/dev/quicc/quicc_bfe.h#1 branch
.. //depot/projects/smpng/sys/dev/quicc/quicc_bfe_ocp.c#1 branch
.. //depot/projects/smpng/sys/dev/quicc/quicc_bus.h#1 branch
.. //depot/projects/smpng/sys/dev/quicc/quicc_core.c#1 branch
.. //depot/projects/smpng/sys/dev/ral/rt2560.c#11 integrate
.. //depot/projects/smpng/sys/dev/ral/rt2560reg.h#3 integrate
.. //depot/projects/smpng/sys/dev/ral/rt2560var.h#4 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#58 integrate
.. //depot/projects/smpng/sys/dev/rr232x/LICENSE#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/README#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/array.h#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/him.h#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/himfuncs.h#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/hptintf.h#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/ldm.h#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/list.h#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/os_bsd.c#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/os_bsd.h#3 delete
.. //depot/projects/smpng/sys/dev/rr232x/osm.h#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/osm_bsd.c#6 delete
.. //depot/projects/smpng/sys/dev/rr232x/rr232x_config.c#2 delete
.. //depot/projects/smpng/sys/dev/rr232x/rr232x_config.h#2 delete
.. //depot/projects/smpng/sys/dev/scc/scc_bfe.h#4 integrate
.. //depot/projects/smpng/sys/dev/scc/scc_bfe_quicc.c#1 branch
.. //depot/projects/smpng/sys/dev/scc/scc_bus.h#2 integrate
.. //depot/projects/smpng/sys/dev/scc/scc_dev_quicc.c#1 branch
.. //depot/projects/smpng/sys/dev/sk/if_sk.c#15 integrate
.. //depot/projects/smpng/sys/dev/sk/if_skreg.h#8 integrate
.. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#21 integrate
.. //depot/projects/smpng/sys/dev/ti/if_ti.c#10 integrate
.. //depot/projects/smpng/sys/dev/tsec/if_tsec.c#1 branch
.. //depot/projects/smpng/sys/dev/tsec/if_tsec.h#1 branch
.. //depot/projects/smpng/sys/dev/tsec/if_tsecreg.h#1 branch
.. //depot/projects/smpng/sys/dev/twe/twe.c#15 integrate
.. //depot/projects/smpng/sys/dev/uart/uart.h#6 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus_ocp.c#1 branch
.. //depot/projects/smpng/sys/dev/uart/uart_bus_scc.c#2 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_powerpc.c#5 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#18 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_quicc.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/ehci.c#31 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#24 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#33 integrate
.. //depot/projects/smpng/sys/dev/usb/uark.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/ubsa.c#20 integrate
.. //depot/projects/smpng/sys/dev/usb/ucom.c#28 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#64 integrate
.. //depot/projects/smpng/sys/dev/usb/ums.c#29 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#108 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.c#26 integrate
.. //depot/projects/smpng/sys/dev/usb/uscanner.c#37 integrate
.. //depot/projects/smpng/sys/dev/usb/uslcom.c#1 branch
.. //depot/projects/smpng/sys/dev/vr/if_vr.c#1 branch
.. //depot/projects/smpng/sys/dev/vr/if_vrreg.h#1 branch
.. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#3 integrate
.. //depot/projects/smpng/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/smpng/sys/dev/wpi/if_wpivar.h#2 integrate
.. //depot/projects/smpng/sys/fs/coda/TODO#2 integrate
.. //depot/projects/smpng/sys/fs/coda/cnode.h#3 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_fbsd.c#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_io.h#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_kernel.h#2 delete
.. //depot/projects/smpng/sys/fs/coda/coda_namecache.c#2 delete
.. //depot/projects/smpng/sys/fs/coda/coda_namecache.h#3 delete
.. //depot/projects/smpng/sys/fs/coda/coda_opstats.h#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_pioctl.h#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_psdev.c#3 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_psdev.h#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_subr.c#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_subr.h#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_venus.c#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_venus.h#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_vfsops.c#3 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_vfsops.h#2 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_vnops.c#4 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_vnops.h#2 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#67 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#28 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#45 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#56 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#27 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#29 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#34 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#22 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_subr.c#11 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#26 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#17 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#28 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#28 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs.h#11 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#28 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#29 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#39 integrate
.. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#34 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#38 integrate
.. //depot/projects/smpng/sys/gdb/gdb_main.c#8 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#51 integrate
.. //depot/projects/smpng/sys/geom/linux_lvm/g_linux_lvm.c#1 branch
.. //depot/projects/smpng/sys/geom/linux_lvm/g_linux_lvm.h#1 branch
.. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_vtoc8.c#1 branch
.. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#28 integrate
.. //depot/projects/smpng/sys/i386/acpica/madt.c#22 integrate
.. //depot/projects/smpng/sys/i386/conf/DEFAULTS#10 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#92 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#130 integrate
.. //depot/projects/smpng/sys/i386/cpufreq/est.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#44 integrate
.. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#9 integrate
.. //depot/projects/smpng/sys/i386/i386/geode.c#9 integrate
.. //depot/projects/smpng/sys/i386/i386/i686_mem.c#11 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#56 integrate
.. //depot/projects/smpng/sys/i386/i386/initcpu.c#30 integrate
.. //depot/projects/smpng/sys/i386/i386/k6_mem.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/legacy.c#13 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#130 integrate
.. //depot/projects/smpng/sys/i386/i386/minidump_machdep.c#4 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#110 integrate
.. //depot/projects/smpng/sys/i386/i386/nexus.c#29 integrate
.. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#51 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#109 integrate
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#84 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#25 integrate
.. //depot/projects/smpng/sys/i386/include/_types.h#12 integrate
.. //depot/projects/smpng/sys/i386/include/float.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/nexusvar.h#4 branch
.. //depot/projects/smpng/sys/i386/include/proc.h#17 integrate
.. //depot/projects/smpng/sys/i386/include/smp.h#25 integrate
.. //depot/projects/smpng/sys/i386/include/specialreg.h#17 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#48 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#58 integrate
.. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#19 integrate
.. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#10 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#59 integrate
.. //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#9 integrate
.. //depot/projects/smpng/sys/ia64/ia64/locore.S#9 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#113 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#36 integrate
.. //depot/projects/smpng/sys/ia64/ia64/nexus.c#17 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#88 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#94 integrate
.. //depot/projects/smpng/sys/ia64/include/md_var.h#23 integrate
.. //depot/projects/smpng/sys/ia64/include/ucontext.h#7 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#59 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#71 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#82 integrate
.. //depot/projects/smpng/sys/kern/kern_clock.c#58 integrate
.. //depot/projects/smpng/sys/kern/kern_condvar.c#50 integrate
.. //depot/projects/smpng/sys/kern/kern_cpuset.c#1 branch
.. //depot/projects/smpng/sys/kern/kern_descrip.c#110 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#109 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#127 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#111 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#89 integrate
.. //depot/projects/smpng/sys/kern/kern_kse.c#39 delete
.. //depot/projects/smpng/sys/kern/kern_ktrace.c#65 integrate
.. //depot/projects/smpng/sys/kern/kern_lock.c#67 integrate
.. //depot/projects/smpng/sys/kern/kern_mbuf.c#25 integrate
.. //depot/projects/smpng/sys/kern/kern_mib.c#35 integrate
.. //depot/projects/smpng/sys/kern/kern_module.c#26 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#152 integrate
.. //depot/projects/smpng/sys/kern/kern_priv.c#3 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#92 integrate
.. //depot/projects/smpng/sys/kern/kern_resource.c#75 integrate
.. //depot/projects/smpng/sys/kern/kern_rwlock.c#20 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#69 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#136 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#70 integrate
.. //depot/projects/smpng/sys/kern/kern_sx.c#52 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#120 integrate
.. //depot/projects/smpng/sys/kern/kern_tc.c#45 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#104 integrate
.. //depot/projects/smpng/sys/kern/kern_timeout.c#36 integrate
.. //depot/projects/smpng/sys/kern/p1003_1b.c#4 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#70 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#81 integrate
.. //depot/projects/smpng/sys/kern/subr_autoconf.c#11 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#67 integrate
.. //depot/projects/smpng/sys/kern/subr_lock.c#11 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#36 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#48 integrate
.. //depot/projects/smpng/sys/kern/subr_trap.c#86 integrate
.. //depot/projects/smpng/sys/kern/subr_turnstile.c#40 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#166 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#59 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#82 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#88 integrate
.. //depot/projects/smpng/sys/kern/systrace_args.c#9 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#40 integrate
.. //depot/projects/smpng/sys/kern/tty_pty.c#51 integrate
.. //depot/projects/smpng/sys/kern/uipc_cow.c#21 integrate
.. //depot/projects/smpng/sys/kern/uipc_mbuf.c#57 integrate
.. //depot/projects/smpng/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#10 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#108 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#109 integrate
.. //depot/projects/smpng/sys/kern/vfs_aio.c#81 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#107 integrate
.. //depot/projects/smpng/sys/kern/vfs_cache.c#37 integrate
.. //depot/projects/smpng/sys/kern/vfs_default.c#53 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#46 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#77 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#146 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#132 integrate
.. //depot/projects/smpng/sys/kern/vnode_if.src#34 integrate
.. //depot/projects/smpng/sys/libkern/cmpdi2.c#3 branch
.. //depot/projects/smpng/sys/libkern/quad.h#8 integrate
.. //depot/projects/smpng/sys/modules/Makefile#143 integrate
.. //depot/projects/smpng/sys/modules/cmx/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/coda/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/coda5/Makefile#7 integrate
.. //depot/projects/smpng/sys/modules/cxgb/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/cxgb/tom/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/em/Makefile#8 integrate
.. //depot/projects/smpng/sys/modules/geom/Makefile#18 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_apple/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/geom/geom_eli/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_gpt/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/geom/geom_linux_lvm/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_part/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/hwpmc/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/igb/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/ipfw_nat/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/mii/Makefile#12 integrate
.. //depot/projects/smpng/sys/modules/rr232x/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/sound/driver/emu10kx/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/uslcom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/vr/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/zfs/Makefile#4 integrate
.. //depot/projects/smpng/sys/net/bpf.c#72 integrate
.. //depot/projects/smpng/sys/net/bpf_filter.c#13 integrate
.. //depot/projects/smpng/sys/net/if.c#97 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#85 integrate
.. //depot/projects/smpng/sys/net/if_gif.c#41 integrate
.. //depot/projects/smpng/sys/net/route.c#34 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_input.c#39 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#15 integrate
.. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/netgraph.h#29 integrate
.. //depot/projects/smpng/sys/netgraph/ng_base.c#52 integrate
.. //depot/projects/smpng/sys/netgraph/ng_bpf.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_iface.c#27 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#32 integrate
.. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#14 integrate
.. //depot/projects/smpng/sys/netgraph/ng_nat.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_nat.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ppp.c#26 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#33 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pred1.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socket.c#46 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tee.c#14 integrate
.. //depot/projects/smpng/sys/netinet/in.h#40 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#78 integrate
.. //depot/projects/smpng/sys/netinet/in_rmx.c#16 integrate
.. //depot/projects/smpng/sys/netinet/ip_carp.c#24 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#49 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#38 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#89 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw_nat.c#1 branch
.. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#19 integrate
.. //depot/projects/smpng/sys/netinet/ip_id.c#9 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#94 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias.c#6 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias.h#4 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#6 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_ftp.c#5 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_irc.c#5 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_local.h#5 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_old.c#3 delete
.. //depot/projects/smpng/sys/netinet/libalias/alias_proxy.c#7 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_smedia.c#5 integrate
.. //depot/projects/smpng/sys/netinet/sctp_auth.c#12 integrate
.. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#8 integrate
.. //depot/projects/smpng/sys/netinet/sctp_indata.c#16 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#16 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#16 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.c#16 integrate
.. //depot/projects/smpng/sys/netinet/sctp_peeloff.c#11 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#18 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#110 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#53 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#56 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#51 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec.c#22 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec.h#12 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec6.h#4 integrate
.. //depot/projects/smpng/sys/netipsec/key.c#19 integrate
.. //depot/projects/smpng/sys/netipsec/key_debug.c#6 integrate
.. //depot/projects/smpng/sys/netncp/ncp_conn.c#17 integrate
.. //depot/projects/smpng/sys/netncp/ncp_conn.h#5 integrate
.. //depot/projects/smpng/sys/netsmb/smb_conn.c#19 integrate
.. //depot/projects/smpng/sys/netsmb/smb_conn.h#10 integrate
.. //depot/projects/smpng/sys/netsmb/smb_iod.c#17 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#7 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#21 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#25 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#51 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#16 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_node.c#29 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#54 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#33 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#62 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#69 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsm_subs.h#10 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsnode.h#20 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#55 integrate
.. //depot/projects/smpng/sys/pc98/cbus/sio.c#12 integrate
.. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#10 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#73 integrate
.. //depot/projects/smpng/sys/pc98/pc98/machdep.c#26 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#71 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#39 integrate
.. //depot/projects/smpng/sys/pci/if_vr.c#49 delete
.. //depot/projects/smpng/sys/pci/if_vrreg.h#15 delete
.. //depot/projects/smpng/sys/pci/if_wb.c#42 integrate
.. //depot/projects/smpng/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/smpng/sys/powerpc/aim/machdep.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/aim/ofw_machdep.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/aim/swtch.S#2 integrate
.. //depot/projects/smpng/sys/powerpc/aim/trap.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/aim/trap_subr.S#2 integrate
.. //depot/projects/smpng/sys/powerpc/aim/vm_machdep.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/booke/clock.c#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/copyinout.c#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/interrupt.c#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/locore.S#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/machdep.c#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/pmap.c#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/support.S#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/swtch.S#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/trap.c#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/trap_subr.S#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/uio_machdep.c#1 branch
.. //depot/projects/smpng/sys/powerpc/booke/vm_machdep.c#1 branch
.. //depot/projects/smpng/sys/powerpc/conf/DEFAULTS#9 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#46 integrate
.. //depot/projects/smpng/sys/powerpc/conf/MPC85XX#1 branch
.. //depot/projects/smpng/sys/powerpc/conf/NOTES#9 integrate
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_add.c#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_arith.h#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_compare.c#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_div.c#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_emu.c#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_emu.h#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_explode.c#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_extern.h#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_implode.c#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_instr.h#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_mul.c#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_sqrt.c#1 branch
.. //depot/projects/smpng/sys/powerpc/fpu/fpu_subr.c#1 branch
.. //depot/projects/smpng/sys/powerpc/include/bootinfo.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/include/float.h#8 integrate
.. //depot/projects/smpng/sys/powerpc/include/frame.h#11 integrate
.. //depot/projects/smpng/sys/powerpc/include/hid.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#9 integrate
.. //depot/projects/smpng/sys/powerpc/include/kdb.h#5 integrate
.. //depot/projects/smpng/sys/powerpc/include/md_var.h#11 integrate
.. //depot/projects/smpng/sys/powerpc/include/metadata.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/include/mmuvar.h#2 integrate
.. //depot/projects/smpng/sys/powerpc/include/ocpbus.h#1 branch
.. //depot/projects/smpng/sys/powerpc/include/openpicreg.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#7 integrate
.. //depot/projects/smpng/sys/powerpc/include/pcb.h#9 integrate
.. //depot/projects/smpng/sys/powerpc/include/pcpu.h#9 integrate
.. //depot/projects/smpng/sys/powerpc/include/pmap.h#19 integrate
.. //depot/projects/smpng/sys/powerpc/include/psl.h#5 integrate
.. //depot/projects/smpng/sys/powerpc/include/pte.h#6 integrate
.. //depot/projects/smpng/sys/powerpc/include/sf_buf.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/include/spr.h#7 integrate
.. //depot/projects/smpng/sys/powerpc/include/tlb.h#1 branch
.. //depot/projects/smpng/sys/powerpc/include/trap.h#6 integrate
.. //depot/projects/smpng/sys/powerpc/include/trap_aim.h#1 branch
.. //depot/projects/smpng/sys/powerpc/include/trap_booke.h#1 branch
.. //depot/projects/smpng/sys/powerpc/include/vmparam.h#9 integrate
.. //depot/projects/smpng/sys/powerpc/mpc85xx/nexus.c#1 branch
.. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#1 branch
.. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.h#1 branch
.. //depot/projects/smpng/sys/powerpc/mpc85xx/opic.c#1 branch
.. //depot/projects/smpng/sys/powerpc/mpc85xx/pci_ocp.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#10 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#12 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#10 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#13 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#8 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#18 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/gdb_machdep.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#29 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#12 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#12 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pic_if.m#5 integrate
.. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#8 integrate
.. //depot/projects/smpng/sys/security/audit/audit.c#11 integrate
.. //depot/projects/smpng/sys/security/audit/audit_arg.c#12 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm.c#9 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#8 integrate
.. //depot/projects/smpng/sys/security/audit/audit_private.h#9 integrate
.. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#13 integrate
.. //depot/projects/smpng/sys/security/audit/audit_trigger.c#6 integrate
.. //depot/projects/smpng/sys/security/audit/audit_worker.c#7 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#43 integrate
.. //depot/projects/smpng/sys/sparc64/conf/DEFAULTS#8 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#80 integrate
.. //depot/projects/smpng/sys/sparc64/include/md_var.h#15 integrate
.. //depot/projects/smpng/sys/sparc64/include/tlb.h#17 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ata_machdep.c#1 branch
.. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#16 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/cheetah.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#9 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#32 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#31 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#73 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/spitfire.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#9 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#79 integrate
.. //depot/projects/smpng/sys/sun4v/sun4v/dump_machdep.c#2 integrate
.. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#6 integrate
.. //depot/projects/smpng/sys/sys/_types.h#15 integrate
.. //depot/projects/smpng/sys/sys/buf.h#49 integrate
.. //depot/projects/smpng/sys/sys/bufobj.h#9 integrate
.. //depot/projects/smpng/sys/sys/bus.h#30 integrate
.. //depot/projects/smpng/sys/sys/condvar.h#11 integrate
.. //depot/projects/smpng/sys/sys/conf.h#49 integrate
.. //depot/projects/smpng/sys/sys/cpuset.h#1 branch
.. //depot/projects/smpng/sys/sys/disklabel.h#32 integrate
.. //depot/projects/smpng/sys/sys/fcntl.h#8 integrate
.. //depot/projects/smpng/sys/sys/ipc.h#11 integrate
.. //depot/projects/smpng/sys/sys/kse.h#20 delete
.. //depot/projects/smpng/sys/sys/ktrace.h#14 integrate
.. //depot/projects/smpng/sys/sys/lock.h#48 integrate
.. //depot/projects/smpng/sys/sys/lockmgr.h#24 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#74 integrate
.. //depot/projects/smpng/sys/sys/module.h#10 integrate
.. //depot/projects/smpng/sys/sys/mount.h#63 integrate
.. //depot/projects/smpng/sys/sys/param.h#122 integrate
.. //depot/projects/smpng/sys/sys/pcpu.h#21 integrate
.. //depot/projects/smpng/sys/sys/priv.h#10 integrate
.. //depot/projects/smpng/sys/sys/proc.h#183 integrate
.. //depot/projects/smpng/sys/sys/rwlock.h#12 integrate
.. //depot/projects/smpng/sys/sys/sched.h#28 integrate
.. //depot/projects/smpng/sys/sys/shm.h#10 integrate
.. //depot/projects/smpng/sys/sys/sleepqueue.h#13 integrate
.. //depot/projects/smpng/sys/sys/smp.h#18 integrate
.. //depot/projects/smpng/sys/sys/socket.h#33 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#59 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#81 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#81 integrate
.. //depot/projects/smpng/sys/sys/syscallsubr.h#53 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#85 integrate
.. //depot/projects/smpng/sys/sys/systm.h#85 integrate
.. //depot/projects/smpng/sys/sys/types.h#34 integrate
.. //depot/projects/smpng/sys/sys/user.h#30 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#83 integrate
.. //depot/projects/smpng/sys/sys/vtoc.h#1 branch
.. //depot/projects/smpng/sys/tools/embed_mfs.sh#1 branch
.. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#21 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#67 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#98 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#57 integrate
.. //depot/projects/smpng/sys/ufs/ufs/extattr.h#9 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#43 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#70 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#63 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#89 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#37 integrate
.. //depot/projects/smpng/sys/vm/vm_meter.c#34 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#97 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#10 (text+ko) ====
@@ -25,14 +25,18 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.17 2005/09/11 18:39:00 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
#include <contrib/dev/acpica/acpi.h>
#include <dev/acpica/acpivar.h>
+#include <machine/nexusvar.h>
+
static int intr_model = ACPI_INTR_PIC;
int
@@ -67,3 +71,43 @@
{
__asm __volatile("sti; hlt");
}
+
+/*
+ * ACPI nexus(4) driver.
+ */
+static int
+nexus_acpi_probe(device_t dev)
+{
+ int error;
+
+ error = acpi_identify();
+ if (error)
+ return (error);
+
+ return (BUS_PROBE_DEFAULT);
+}
+
+static int
+nexus_acpi_attach(device_t dev)
+{
+
+ nexus_init_resources();
+ bus_generic_probe(dev);
+ if (BUS_ADD_CHILD(dev, 10, "acpi", 0) == NULL)
+ panic("failed to add acpi0 device");
+
+ return (bus_generic_attach(dev));
+}
+
+static device_method_t nexus_acpi_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, nexus_acpi_probe),
+ DEVMETHOD(device_attach, nexus_acpi_attach),
+
+ { 0, 0 }
+};
+
+DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver);
+static devclass_t nexus_devclass;
+
+DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0);
==== //depot/projects/smpng/sys/amd64/acpica/madt.c#15 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.25 2008/01/31 16:51:42 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,9 +109,11 @@
/*
* Code to abuse the crashdump map to map in the tables for the early
* probe. We cheat and make the following assumptions about how we
- * use this KVA: page 0 is used to map in the first page of each table
- * found via the RSDT or XSDT and pages 1 to n are used to map in the
- * RSDT or XSDT. The offset is in pages; the length is in bytes.
+ * use this KVA: pages 0 and 1 are used to map in the header of each
+ * table found via the RSDT or XSDT and pages 2 to n are used to map
+ * in the RSDT or XSDT. We have to use 2 pages for the table headers
+ * in case a header spans a page boundary. The offset is in pages;
+ * the length is in bytes.
*/
static void *
madt_map(vm_paddr_t pa, int offset, vm_offset_t length)
@@ -232,7 +234,7 @@
printf("MADT: RSDP failed extended checksum\n");
return (ENXIO);
}
- xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1,
+ xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 2,
ACPI_SIG_XSDT);
if (xsdt == NULL) {
if (bootverbose)
@@ -246,7 +248,7 @@
break;
madt_unmap_table(xsdt);
} else {
- rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1,
+ rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 2,
ACPI_SIG_RSDT);
if (rsdt == NULL) {
if (bootverbose)
==== //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.29 2008/03/12 22:09:19 jhb Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -47,31 +47,31 @@
static char *mem_owner_bios = "BIOS";
-#define MR686_FIXMTRR (1<<0)
+#define MR686_FIXMTRR (1<<0)
-#define mrwithin(mr, a) \
- (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len)))
-#define mroverlap(mra, mrb) \
- (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base))
+#define mrwithin(mr, a) \
+ (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len)))
+#define mroverlap(mra, mrb) \
+ (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base))
-#define mrvalid(base, len) \
- ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \
- ((len) >= (1 << 12)) && /* length is >= 4k */ \
- powerof2((len)) && /* ... and power of two */ \
- !((base) & ((len) - 1))) /* range is not discontiuous */
+#define mrvalid(base, len) \
+ ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \
+ ((len) >= (1 << 12)) && /* length is >= 4k */ \
+ powerof2((len)) && /* ... and power of two */ \
+ !((base) & ((len) - 1))) /* range is not discontiuous */
-#define mrcopyflags(curr, new) (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK))
+#define mrcopyflags(curr, new) \
+ (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK))
-static int mtrrs_disabled;
+static int mtrrs_disabled;
TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled);
SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN,
- &mtrrs_disabled, 0, "Disable amd64 MTRRs.");
+ &mtrrs_disabled, 0, "Disable amd64 MTRRs.");
-static void amd64_mrinit(struct mem_range_softc *sc);
-static int amd64_mrset(struct mem_range_softc *sc,
- struct mem_range_desc *mrd,
- int *arg);
-static void amd64_mrAPinit(struct mem_range_softc *sc);
+static void amd64_mrinit(struct mem_range_softc *sc);
+static int amd64_mrset(struct mem_range_softc *sc,
+ struct mem_range_desc *mrd, int *arg);
+static void amd64_mrAPinit(struct mem_range_softc *sc);
static struct mem_range_ops amd64_mrops = {
amd64_mrinit,
@@ -80,157 +80,159 @@
};
/* XXX for AP startup hook */
-static u_int64_t mtrrcap, mtrrdef;
+static u_int64_t mtrrcap, mtrrdef;
+
+/* The bitmask for the PhysBase and PhysMask fields of the variable MTRRs. */
+static u_int64_t mtrr_physmask;
-static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc,
- struct mem_range_desc *mrd);
-static void amd64_mrfetch(struct mem_range_softc *sc);
-static int amd64_mtrrtype(int flags);
-static int amd64_mrt2mtrr(int flags, int oldval);
-static int amd64_mtrrconflict(int flag1, int flag2);
-static void amd64_mrstore(struct mem_range_softc *sc);
-static void amd64_mrstoreone(void *arg);
-static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc,
- u_int64_t addr);
-static int amd64_mrsetlow(struct mem_range_softc *sc,
- struct mem_range_desc *mrd,
- int *arg);
-static int amd64_mrsetvariable(struct mem_range_softc *sc,
- struct mem_range_desc *mrd,
- int *arg);
+static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc,
+ struct mem_range_desc *mrd);
+static void amd64_mrfetch(struct mem_range_softc *sc);
+static int amd64_mtrrtype(int flags);
+static int amd64_mrt2mtrr(int flags, int oldval);
+static int amd64_mtrrconflict(int flag1, int flag2);
+static void amd64_mrstore(struct mem_range_softc *sc);
+static void amd64_mrstoreone(void *arg);
+static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc,
+ u_int64_t addr);
+static int amd64_mrsetlow(struct mem_range_softc *sc,
+ struct mem_range_desc *mrd, int *arg);
+static int amd64_mrsetvariable(struct mem_range_softc *sc,
+ struct mem_range_desc *mrd, int *arg);
/* amd64 MTRR type to memory range type conversion */
static int amd64_mtrrtomrt[] = {
- MDF_UNCACHEABLE,
- MDF_WRITECOMBINE,
- MDF_UNKNOWN,
- MDF_UNKNOWN,
- MDF_WRITETHROUGH,
- MDF_WRITEPROTECT,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list