Date: Mon, 11 Aug 2008 16:11:16 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 147158 for review Message-ID: <200808111611.m7BGBG6u033861@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147158 Change 147158 by hselasky@hselasky_laptop001 on 2008/08/11 16:11:10 IFC @ 147147 Affected files ... .. //depot/projects/usb/src/sys/Makefile#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/usb/src/sys/amd64/amd64/support.S#7 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC.hints#4 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/usb/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/usb/src/sys/arm/arm/intr.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#7 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#7 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#12 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU#1 branch .. //depot/projects/usb/src/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/usb/src/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/pxa/pxa_machdep.c#3 integrate .. //depot/projects/usb/src/sys/boot/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/common/misc.c#2 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/usb/src/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#6 integrate .. //depot/projects/usb/src/sys/bsm/audit_internal.h#6 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#6 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/usb/src/sys/conf/NOTES#17 integrate .. //depot/projects/usb/src/sys/conf/files#33 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#9 integrate .. //depot/projects/usb/src/sys/conf/files.i386#11 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#8 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/usb/src/sys/conf/options#10 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_nat.h#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#8 integrate .. //depot/projects/usb/src/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/usb/src/sys/ddb/db_run.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#3 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/usb/src/sys/dev/aha/aha.c#5 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfereg.h#4 integrate .. //depot/projects/usb/src/sys/dev/bktr/bktr_i2c.c#5 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#11 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissio.h#2 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_tn1010.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/LICENSE#1 branch .. //depot/projects/usb/src/sys/dev/e1000/README#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82540.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82542.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#1 branch .. //depot/projects/usb/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/usb/src/sys/dev/em/LICENSE#4 delete .. //depot/projects/usb/src/sys/dev/em/README#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82540.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82541.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82541.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82542.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82543.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82543.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82571.c#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82571.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_api.c#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_api.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_defines.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_hw.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.c#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_mac.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_mac.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_manage.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_manage.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_osdep.c#2 delete .. //depot/projects/usb/src/sys/dev/em/e1000_osdep.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_phy.c#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_phy.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_regs.h#4 delete .. //depot/projects/usb/src/sys/dev/em/if_em.c#10 delete .. //depot/projects/usb/src/sys/dev/em/if_em.h#8 delete .. //depot/projects/usb/src/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/usb/src/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/usb/src/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/et/if_et.c#2 integrate .. //depot/projects/usb/src/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/usb/src/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/usb/src/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/usb/src/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/usb/src/sys/dev/ie/if_ie_isa.c#4 integrate .. //depot/projects/usb/src/sys/dev/ie/if_ievar.h#3 integrate .. //depot/projects/usb/src/sys/dev/igb/e1000_82575.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_82575.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_api.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_api.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_defines.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_hw.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_mac.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_mac.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_manage.c#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_manage.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_nvm.c#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_nvm.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_osdep.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_osdep.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_phy.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_phy.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_regs.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/if_igb.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/if_igb.h#3 delete .. //depot/projects/usb/src/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/ds1339.c#1 branch .. //depot/projects/usb/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbb.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.h#4 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iiconf.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/usb/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.h#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#4 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/usb/src/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#6 integrate .. //depot/projects/usb/src/sys/dev/led/led.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/usb/src/sys/dev/nvram/nvram.c#3 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/usb/src/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/usb/src/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/usb/src/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/usb/src/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/usb/src/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#9 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#9 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#10 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/usb/src/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/usb/src/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/usb/src/sys/dev/snc/dp83932var.h#3 integrate .. //depot/projects/usb/src/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/usb/src/sys/dev/snc/if_snc_cbus.c#3 integrate .. //depot/projects/usb/src/sys/dev/snc/if_snc_pccard.c#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/usb/src/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#37 integrate .. //depot/projects/usb/src/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#61 integrate .. //depot/projects/usb/src/sys/dev/usb/ohci.c#66 integrate .. //depot/projects/usb/src/sys/dev/usb/ugen.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/uhid.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#4 edit .. //depot/projects/usb/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/usb/src/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wireg.h#3 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wivar.h#5 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/usb/src/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/usb/src/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/usb/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.c#6 integrate .. //depot/projects/usb/src/sys/geom/geom_kern.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_slice.c#4 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#6 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#8 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#8 integrate .. //depot/projects/usb/src/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#12 integrate .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#8 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/support.s#7 integrate .. //depot/projects/usb/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/usb/src/sys/i386/include/profile.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#8 integrate .. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_condvar.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_environment.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_kthread.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/usb/src/sys/kern/link_elf.c#10 integrate .. //depot/projects/usb/src/sys/kern/link_elf_obj.c#10 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_clist.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_lock.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_stack.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty.c#8 integrate .. //depot/projects/usb/src/sys/kern/tty_info.c#1 branch .. //depot/projects/usb/src/sys/kern/tty_pts.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/usb/src/sys/libkern/arc4random.c#2 integrate .. //depot/projects/usb/src/sys/libkern/memset.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/tick.c#2 integrate .. //depot/projects/usb/src/sys/modules/Makefile#19 integrate .. //depot/projects/usb/src/sys/modules/accf_dns/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/em/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/et/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/mem/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/socket/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/upgt/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/usb/src/sys/net/bpf.c#10 integrate .. //depot/projects/usb/src/sys/net/bpf_buffer.c#2 integrate .. //depot/projects/usb/src/sys/net/bpfdesc.h#7 integrate .. //depot/projects/usb/src/sys/net/if.h#6 integrate .. //depot/projects/usb/src/sys/net/if_gre.c#8 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#9 integrate .. //depot/projects/usb/src/sys/net/if_media.h#8 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#6 integrate .. //depot/projects/usb/src/sys/net/route.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/common/ng_bluetooth.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/TODO#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#29 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#12 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/include/ng_btsocket_sco.h#1 branch .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/usb/src/sys/netinet/accf_dns.c#1 branch .. //depot/projects/usb/src/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_var.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_offload.c#2 integrate .. //depot/projects/usb/src/sys/netinet/tcp_offload.h#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.h#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/usb/src/sys/netinet/toedev.h#2 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/usb/src/sys/netinet6/in6_src.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec6.h#4 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#5 integrate .. //depot/projects/usb/src/sys/netipx/ipx_input.c#5 integrate .. //depot/projects/usb/src/sys/netipx/ipx_usrreq.c#6 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_socket.c#2 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/usb/src/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/usb/src/sys/pci/if_sis.c#6 delete .. //depot/projects/usb/src/sys/pci/if_sisreg.h#4 delete .. //depot/projects/usb/src/sys/pci/if_xl.c#8 delete .. //depot/projects/usb/src/sys/pci/if_xlreg.h#6 delete .. //depot/projects/usb/src/sys/pci/viapm.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#11 integrate .. //depot/projects/usb/src/sys/rpc/auth_unix.c#3 integrate .. //depot/projects/usb/src/sys/rpc/rpcclnt.c#6 integrate .. //depot/projects/usb/src/sys/security/audit/audit.c#9 integrate .. //depot/projects/usb/src/sys/security/audit/audit.h#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_pipe.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_private.h#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_trigger.c#6 integrate .. //depot/projects/usb/src/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/usb/src/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/usb/src/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#8 integrate .. //depot/projects/usb/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/usb/src/sys/sys/_task.h#2 integrate .. //depot/projects/usb/src/sys/sys/callout.h#5 integrate .. //depot/projects/usb/src/sys/sys/cpuctl.h#1 branch .. //depot/projects/usb/src/sys/sys/elf_common.h#6 integrate .. //depot/projects/usb/src/sys/sys/eventhandler.h#6 integrate .. //depot/projects/usb/src/sys/sys/imgact.h#4 integrate .. //depot/projects/usb/src/sys/sys/interrupt.h#6 integrate .. //depot/projects/usb/src/sys/sys/ioctl_compat.h#4 integrate .. //depot/projects/usb/src/sys/sys/kernel.h#9 integrate .. //depot/projects/usb/src/sys/sys/libkern.h#5 integrate .. //depot/projects/usb/src/sys/sys/link_elf.h#3 integrate .. //depot/projects/usb/src/sys/sys/param.h#12 integrate .. //depot/projects/usb/src/sys/sys/priv.h#7 integrate .. //depot/projects/usb/src/sys/sys/proc.h#9 integrate .. //depot/projects/usb/src/sys/sys/procfs.h#2 integrate .. //depot/projects/usb/src/sys/sys/refcount.h#2 integrate .. //depot/projects/usb/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/usb/src/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/usb/src/sys/sys/sockbuf.h#1 branch .. //depot/projects/usb/src/sys/sys/socket.h#9 integrate .. //depot/projects/usb/src/sys/sys/socketvar.h#8 integrate .. //depot/projects/usb/src/sys/sys/sockio.h#3 integrate .. //depot/projects/usb/src/sys/sys/sockopt.h#1 branch .. //depot/projects/usb/src/sys/sys/sockstate.h#1 branch .. //depot/projects/usb/src/sys/sys/sysctl.h#9 integrate .. //depot/projects/usb/src/sys/sys/taskqueue.h#3 integrate .. //depot/projects/usb/src/sys/sys/termios.h#3 integrate .. //depot/projects/usb/src/sys/sys/ttycom.h#4 integrate .. //depot/projects/usb/src/sys/sys/vmmeter.h#6 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#8 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_balloc.c#4 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/ufs/ufs/quota.h#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#7 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/usb/src/sys/vm/swap_pager.c#10 integrate .. //depot/projects/usb/src/sys/vm/vm_glue.c#8 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.c#8 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#9 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#10 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/usb/src/sys/vm/vm_zeroidle.c#9 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#10 integrate Differences ... ==== //depot/projects/usb/src/sys/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.49 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/Makefile,v 1.52 2008/08/08 18:00:33 philip Exp $ .include <bsd.own.mk> @@ -8,14 +8,17 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \ - gnu isa kern libkern modules net net80211 netatalk \ +CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ + geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ - pci rpc security sys ufs vm ${ARCHDIR} + netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + pccard pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} +.if defined(ALL_ARCH) +CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v +.else +CSCOPE_ARCHDIR ?= ${MACHINE} +.endif -ARCHDIR ?= ${MACHINE} - # Loadable kernel modules .if defined(MODULES_WITH_WORLD) @@ -41,4 +44,11 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include <bsd.subdir.mk> ==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.85 2008/02/12 16:24:30 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.86 2008/07/15 03:34:49 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -480,8 +480,6 @@ mflags = M_NOWAIT; else mflags = M_WAITOK; - if (flags & BUS_DMA_ZERO) - mflags |= M_ZERO; /* If we succeed, no mapping/bouncing will be required */ *mapp = NULL; @@ -489,13 +487,15 @@ if (dmat->segments == NULL) { dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, - M_NOWAIT); + mflags); if (dmat->segments == NULL) { CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } } + if (flags & BUS_DMA_ZERO) + mflags |= M_ZERO; /* * XXX: @@ -531,7 +531,7 @@ pmap_change_attr((vm_offset_t)*vaddr, dmat->maxsize, PAT_UNCACHEABLE); CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", - __func__, dmat, dmat->flags, ENOMEM); + __func__, dmat, dmat->flags, 0); return (0); } ==== //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.161 2008/03/23 23:09:06 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ */ #include <machine/asmacros.h> @@ -113,8 +113,8 @@ movq PCB_GSBASE(%r8),%r10 testl $PCB_32BIT,PCB_FLAGS(%r8) - jnz store_gs /* static predict not taken */ -done_store_gs: + jnz store_seg +done_store_seg: testl $PCB_DBREGS,PCB_FLAGS(%r8) jnz store_dr /* static predict not taken */ @@ -176,6 +176,10 @@ testl $TDP_KTHREAD,TD_PFLAGS(%rsi) jnz do_kthread + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz load_seg +done_load_seg: + cmpq PCB_FSBASE(%r8),%r9 jz 1f /* Restore userland %fs */ @@ -184,7 +188,6 @@ movl PCB_FSBASE+4(%r8),%edx wrmsr 1: - cmpq PCB_GSBASE(%r8),%r10 jz 2f /* Restore userland %gs */ @@ -193,8 +196,8 @@ movl PCB_GSBASE+4(%r8),%edx wrmsr 2: + do_tss: - /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax movq %r8, PCPU(RSP0) @@ -208,10 +211,6 @@ jnz load_dr /* static predict not taken */ done_load_dr: - testl $PCB_32BIT,PCB_FLAGS(%r8) - jnz load_gs /* static predict not taken */ -done_load_gs: - /* Restore context. */ movq PCB_R15(%r8),%r15 movq PCB_R14(%r8),%r14 @@ -243,23 +242,35 @@ movq %r10,PCB_GSBASE(%r8) jmp do_tss -store_gs: +store_seg: movl %gs,PCB_GS(%r8) - movq PCB_GS32P(%r8),%rax + testl $PCB_GS32BIT,PCB_FLAGS(%r8) + jnz 2f +1: movl %ds,PCB_DS(%r8) + movl %es,PCB_ES(%r8) + movl %fs,PCB_FS(%r8) + jmp done_store_seg +2: movq PCB_GS32P(%r8),%rax movq (%rax),%rax movq %rax,PCB_GS32SD(%r8) - jmp done_store_gs + jmp 1b -load_gs: +load_seg: + testl $PCB_GS32BIT,PCB_FLAGS(%r8) + jnz 2f +1: movl $MSR_GSBASE,%ecx + rdmsr + movl PCB_GS(%r8),%gs + wrmsr + movl PCB_DS(%r8),%ds + movl PCB_ES(%r8),%es + movl PCB_FS(%r8),%fs + jmp done_load_seg /* Restore userland %gs while preserving kernel gsbase */ - movq PCB_GS32P(%r8),%rax +2: movq PCB_GS32P(%r8),%rax movq PCB_GS32SD(%r8),%rcx movq %rcx,(%rax) - movl $MSR_GSBASE,%ecx - rdmsr - movl PCB_GS(%r8),%gs - wrmsr - jmp done_load_gs + jmp 1b store_dr: movq %dr7,%rax /* yes, do the save */ ==== //depot/projects/usb/src/sys/amd64/amd64/genassym.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.168 2008/05/16 13:23:47 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -140,6 +140,7 @@ ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_32BIT, PCB_32BIT); +ASSYM(PCB_GS32BIT, PCB_GS32BIT); ASSYM(PCB_FULLCTX, PCB_FULLCTX); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#13 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.628 2008/07/09 06:04:10 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.645 2008/08/09 05:46:13 alc Exp $"); /* * Manages physical address maps. @@ -221,17 +221,24 @@ vm_offset_t va); static int pmap_pvh_wired_mappings(struct md_page *pvh, int count); +static int pmap_change_attr_locked(vm_offset_t va, vm_size_t size, int mode); static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +static boolean_t pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, + vm_offset_t va); static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); +static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte); static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); static boolean_t pmap_is_modified_pvh(struct md_page *pvh); +static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va); +static void pmap_pde_attr(pd_entry_t *pde, int cache_bits); static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot); +static void pmap_pte_attr(pt_entry_t *pte, int cache_bits); static int pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, vm_page_t *free); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -465,11 +472,12 @@ } /* Now set up the direct map space using either 2MB or 1GB pages */ + /* Preset PG_M and PG_A because demotion expects it */ if ((amd_feature & AMDID_PAGE1GB) == 0) { for (i = 0; i < NPDEPG * ndmpdp; i++) { ((pd_entry_t *)DMPDphys)[i] = (vm_paddr_t)i << PDRSHIFT; ((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS | - PG_G; + PG_G | PG_M | PG_A; } /* And the direct map space's PDP */ for (i = 0; i < ndmpdp; i++) { @@ -482,7 +490,7 @@ ((pdp_entry_t *)DMPDPphys)[i] = (vm_paddr_t)i << PDPSHIFT; ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_PS | - PG_G; + PG_G | PG_M | PG_A; } } @@ -737,6 +745,13 @@ SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, promotions, CTLFLAG_RD, &pmap_pde_promotions, 0, "2MB page promotions"); +SYSCTL_NODE(_vm_pmap, OID_AUTO, pdpe, CTLFLAG_RD, 0, + "1GB page mapping counters"); + +static u_long pmap_pdpe_demotions; +SYSCTL_ULONG(_vm_pmap_pdpe, OID_AUTO, demotions, CTLFLAG_RD, + &pmap_pdpe_demotions, 0, "1GB page demotions"); + /*************************************************** * Low level helper routines..... @@ -984,13 +999,12 @@ if (pdep != NULL) { pde = *pdep; if (pde) { - if ((pde & PG_PS) != 0) { + if ((pde & PG_PS) != 0) rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); - PMAP_UNLOCK(pmap); - return rtval; + else { + pte = pmap_pde_to_pte(pdep, va); + rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); } - pte = pmap_pde_to_pte(pdep, va); - rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); } } PMAP_UNLOCK(pmap); @@ -1039,17 +1053,25 @@ vm_paddr_t pmap_kextract(vm_offset_t va) { - pd_entry_t *pde; + pd_entry_t pde; vm_paddr_t pa; if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) { pa = DMAP_TO_PHYS(va); } else { - pde = vtopde(va); - if (*pde & PG_PS) { - pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); + pde = *vtopde(va); + if (pde & PG_PS) { + pa = (pde & PG_PS_FRAME) | (va & PDRMASK); } else { - pa = *vtopte(va); + /* + * Beware of a concurrent promotion that changes the + * PDE at this point! For example, vtopte() must not + * be used to access the PTE because it would use the + * new PDE. It is, however, safe to use the old PDE + * because the page table page is preserved by the + * promotion. + */ + pa = *pmap_pde_to_pte(&pde, va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); } } @@ -1073,7 +1095,7 @@ pte_store(pte, pa | PG_RW | PG_V | PG_G); } -PMAP_INLINE void +static __inline void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) { pt_entry_t *pte; @@ -2197,58 +2219,88 @@ } /* - * Tries to demote a 2MB page mapping. + * Fills a page table page with mappings to consecutive physical pages. + */ +static void +pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte) +{ + pt_entry_t *pte; + + for (pte = firstpte; pte < firstpte + NPTEPG; pte++) { + *pte = newpte; + newpte += PAGE_SIZE; + } +} + +/* + * Tries to demote a 2MB page mapping. If demotion fails, the 2MB page + * mapping is invalidated. */ static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde, oldpde; - pt_entry_t *firstpte, newpte, *pte; + pt_entry_t *firstpte, newpte; vm_paddr_t mptepa; vm_page_t free, mpte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + oldpde = *pde; + KASSERT((oldpde & (PG_PS | PG_V)) == (PG_PS | PG_V), + ("pmap_demote_pde: oldpde is missing PG_PS and/or PG_V")); mpte = pmap_lookup_pt_page(pmap, va); if (mpte != NULL) pmap_remove_pt_page(pmap, mpte); else { - KASSERT((*pde & PG_W) == 0, + KASSERT((oldpde & PG_W) == 0, ("pmap_demote_pde: page table page for a wired mapping" " is missing")); - free = NULL; - pmap_remove_pde(pmap, pde, trunc_2mpage(va), &free); - pmap_invalidate_page(pmap, trunc_2mpage(va)); - pmap_free_zero_pages(free); - CTR2(KTR_PMAP, "pmap_demote_pde: failure for va %#lx" - " in pmap %p", va, pmap); - return (FALSE); + + /* + * Invalidate the 2MB page mapping and return "failure" if the + * mapping was never accessed or the allocation of the new + * page table page fails. + */ + if ((oldpde & PG_A) == 0 || (mpte = vm_page_alloc(NULL, + pmap_pde_pindex(va), VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL | + VM_ALLOC_WIRED)) == NULL) { + free = NULL; + pmap_remove_pde(pmap, pde, trunc_2mpage(va), &free); + pmap_invalidate_page(pmap, trunc_2mpage(va)); + pmap_free_zero_pages(free); + CTR2(KTR_PMAP, "pmap_demote_pde: failure for va %#lx" + " in pmap %p", va, pmap); + return (FALSE); + } } mptepa = VM_PAGE_TO_PHYS(mpte); firstpte = (pt_entry_t *)PHYS_TO_DMAP(mptepa); - oldpde = *pde; newpde = mptepa | PG_M | PG_A | (oldpde & PG_U) | PG_RW | PG_V; - KASSERT((oldpde & (PG_A | PG_V)) == (PG_A | PG_V), - ("pmap_demote_pde: oldpde is missing PG_A and/or PG_V")); + KASSERT((oldpde & PG_A) != 0, + ("pmap_demote_pde: oldpde is missing PG_A")); KASSERT((oldpde & (PG_M | PG_RW)) != PG_RW, ("pmap_demote_pde: oldpde is missing PG_M")); - KASSERT((oldpde & PG_PS) != 0, - ("pmap_demote_pde: oldpde is missing PG_PS")); newpte = oldpde & ~PG_PS; if ((newpte & PG_PDE_PAT) != 0) newpte ^= PG_PDE_PAT | PG_PTE_PAT; /* - * If the mapping has changed attributes, update the page table - * entries. + * If the page table page is new, initialize it. */ + if (mpte->wire_count == 1) { + mpte->wire_count = NPTEPG; + pmap_fill_ptp(firstpte, newpte); + } KASSERT((*firstpte & PG_FRAME) == (newpte & PG_FRAME), ("pmap_demote_pde: firstpte and newpte map different physical" " addresses")); + + /* + * If the mapping has changed attributes, update the page table + * entries. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808111611.m7BGBG6u033861>