Date: Mon, 11 Jan 2010 17:02:46 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 172973 for review Message-ID: <201001111702.o0BH2kEX096793@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=172973 Change 172973 by hselasky@hselasky_laptop001 on 2010/01/11 17:02:28 IFC @ 172972 Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb20.c#14 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#26 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#34 integrate .. //depot/projects/usb/src/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#34 integrate .. //depot/projects/usb/src/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/common/bootstrap.h#5 integrate .. //depot/projects/usb/src/sys/boot/common/dev_net.c#5 integrate .. //depot/projects/usb/src/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/usb/src/sys/boot/efi/libefi/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/efi/libefi/efifs.c#3 delete .. //depot/projects/usb/src/sys/boot/efi/libefi/efipart.c#1 branch .. //depot/projects/usb/src/sys/boot/ia64/efi/conf.c#3 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/version#3 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/Makefile#4 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#10 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_targ_bh.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#13 integrate .. //depot/projects/usb/src/sys/conf/Makefile.mips#2 integrate .. //depot/projects/usb/src/sys/conf/NOTES#52 integrate .. //depot/projects/usb/src/sys/conf/files#90 integrate .. //depot/projects/usb/src/sys/conf/files.mips#7 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#15 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#11 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips#4 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips.mips64#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.mips.octeon1.32#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.mips.octeon1.64#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.mips.octeon1.n32#1 branch .. //depot/projects/usb/src/sys/conf/makeLINT.mk#2 integrate .. //depot/projects/usb/src/sys/conf/options#45 integrate .. //depot/projects/usb/src/sys/conf/options.mips#4 integrate .. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#3 integrate .. //depot/projects/usb/src/sys/ddb/db_ps.c#8 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#13 integrate .. //depot/projects/usb/src/sys/dev/ae/if_ae.c#8 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#10 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#10 integrate .. //depot/projects/usb/src/sys/dev/amd/amd.c#5 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#13 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#23 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ati.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#5 integrate .. //depot/projects/usb/src/sys/dev/bktr/bktr_i2c.c#6 integrate .. //depot/projects/usb/src/sys/dev/cfe/cfe_env.c#1 branch .. //depot/projects/usb/src/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#14 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#20 integrate .. //depot/projects/usb/src/sys/dev/de/if_de.c#10 integrate .. //depot/projects/usb/src/sys/dev/dpt/dpt.h#4 integrate .. //depot/projects/usb/src/sys/dev/dpt/dpt_scsi.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#15 integrate .. //depot/projects/usb/src/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/usb/src/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/usb/src/sys/dev/fatm/if_fatm.c#6 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/usb/src/sys/dev/flash/mx25l.c#1 branch .. //depot/projects/usb/src/sys/dev/flash/mx25lreg.h#1 branch .. //depot/projects/usb/src/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/usb/src/sys/dev/hptmv/entry.c#7 integrate .. //depot/projects/usb/src/sys/dev/ic/ns16550.h#4 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#25 integrate .. //depot/projects/usb/src/sys/dev/iir/iir.c#8 integrate .. //depot/projects/usb/src/sys/dev/iir/iir_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_sm.c#3 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#11 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_library.c#7 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#14 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwnvar.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#16 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#10 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#14 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo.c#7 integrate .. //depot/projects/usb/src/sys/dev/mge/if_mge.c#9 integrate .. //depot/projects/usb/src/sys/dev/mly/mly.c#7 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#20 integrate .. //depot/projects/usb/src/sys/dev/patm/if_patm_intr.c#4 integrate .. //depot/projects/usb/src/sys/dev/pdq/if_fea.c#4 integrate .. //depot/projects/usb/src/sys/dev/safe/safe.c#6 integrate .. //depot/projects/usb/src/sys/dev/siba/siba_cc.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/usb/src/sys/dev/ste/if_ste.c#7 integrate .. //depot/projects/usb/src/sys/dev/trm/trm.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#31 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#99 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_status.c#7 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_smb.c#4 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#33 integrate .. //depot/projects/usb/src/sys/i386/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/i386/conf/PAE#10 integrate .. //depot/projects/usb/src/sys/i386/i386/locore.s#6 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#15 integrate .. //depot/projects/usb/src/sys/i386/xen/locore.s#5 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#13 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#19 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#10 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/usb/src/sys/ia64/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/isa/pnp.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_clock.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_cpu.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_environment.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_fail.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#23 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#14 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#14 integrate .. //depot/projects/usb/src/sys/kern/subr_firmware.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#11 integrate .. //depot/projects/usb/src/sys/mips/adm5120/adm5120_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/adm5120/files.adm5120#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#8 integrate .. //depot/projects/usb/src/sys/mips/adm5120/obio.c#4 integrate .. //depot/projects/usb/src/sys/mips/adm5120/uart_cpu_adm5120.c#3 integrate .. //depot/projects/usb/src/sys/mips/alchemy/alchemy_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/aureg.h#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/files.alchemy#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/obio.c#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/std.alchemy#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/uart_bus_alchemy.c#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/uart_cpu_alchemy.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/apb.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/apbvar.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_bus_space_reversed.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_bus_space_reversed.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_ehci.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_ohci.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_pci.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_pci_bus_space.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_pci_bus_space.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_spi.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_wdog.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xxreg.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/files.ar71xx#1 branch .. //depot/projects/usb/src/sys/mips/atheros/if_arge.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/if_argevar.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/uart_bus_ar71xx.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/uart_cpu_ar71xx.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/asm_octeon.S#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fpa.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_ipd.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_ipd.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pip.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pko.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pko.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/driveid.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/files.octeon1#1 branch .. //depot/projects/usb/src/sys/mips/cavium/obio.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/obiovar.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_ebt3000_cf.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_ebt3000_cf.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_pcmap_regs.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeonreg.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/std.octeon1#1 branch .. //depot/projects/usb/src/sys/mips/cavium/uart_bus_octeonusart.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/uart_cpu_octeonusart.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/uart_dev_oct16550.c#1 branch .. //depot/projects/usb/src/sys/mips/conf/ALCHEMY#1 branch .. //depot/projects/usb/src/sys/mips/conf/AR71XX#1 branch .. //depot/projects/usb/src/sys/mips/conf/AR71XX.hints#1 branch .. //depot/projects/usb/src/sys/mips/conf/MALTA#6 integrate .. //depot/projects/usb/src/sys/mips/conf/MALTA64#1 branch .. //depot/projects/usb/src/sys/mips/conf/OCTEON1#1 branch .. //depot/projects/usb/src/sys/mips/conf/OCTEON1-32#1 branch .. //depot/projects/usb/src/sys/mips/conf/OCTEON1.hints#1 branch .. //depot/projects/usb/src/sys/mips/conf/SENTRY5#7 integrate .. //depot/projects/usb/src/sys/mips/conf/SWARM#1 branch .. //depot/projects/usb/src/sys/mips/conf/SWARM.hints#1 branch .. //depot/projects/usb/src/sys/mips/conf/XLR#1 branch .. //depot/projects/usb/src/sys/mips/idt/files.idt#3 integrate .. //depot/projects/usb/src/sys/mips/idt/idt_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/idt/obio.c#4 integrate .. //depot/projects/usb/src/sys/mips/idt/uart_bus_rc32434.c#3 integrate .. //depot/projects/usb/src/sys/mips/idt/uart_cpu_rc32434.c#2 integrate .. //depot/projects/usb/src/sys/mips/include/_align.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/_bus.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/_types.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/asm.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/atomic.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/bus.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/bus_octeon.h#2 delete .. //depot/projects/usb/src/sys/mips/include/cache.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cache_mipsNN.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cdefs.h#1 branch .. //depot/projects/usb/src/sys/mips/include/cpu.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cpufunc.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cpuinfo.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cpuregs.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/db_machdep.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/elf.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/endian.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/float.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/fls64.h#1 branch .. //depot/projects/usb/src/sys/mips/include/hwfunc.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/intr.h#2 delete .. //depot/projects/usb/src/sys/mips/include/intr_machdep.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/kdb.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/locore.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/md_var.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/param.h#6 integrate .. //depot/projects/usb/src/sys/mips/include/pcb.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/pltfm.h#2 delete .. //depot/projects/usb/src/sys/mips/include/pmap.h#7 integrate .. //depot/projects/usb/src/sys/mips/include/proc.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/profile.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/psl.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/pte.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/regdef.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/regnum.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/sysarch.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/trap.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/ucontext.h#2 integrate .. //depot/projects/usb/src/sys/mips/malta/files.malta#3 integrate .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#6 integrate .. //depot/projects/usb/src/sys/mips/malta/malta_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/maltareg.h#2 integrate .. //depot/projects/usb/src/sys/mips/malta/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/std.malta#3 integrate .. //depot/projects/usb/src/sys/mips/malta/uart_bus_maltausart.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/uart_cpu_maltausart.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/yamon.h#2 integrate .. //depot/projects/usb/src/sys/mips/mips/bus_space_generic.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/busdma_machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/cache.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/cache_mipsNN.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/cpu.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/db_trace.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#9 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_trampoline.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/exception.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/fp.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/gdb_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/genassym.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/in_cksum.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/inckern.S#1 branch .. //depot/projects/usb/src/sys/mips/mips/intr_machdep.c#5 integrate .. //depot/projects/usb/src/sys/mips/mips/locore.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#9 integrate .. //depot/projects/usb/src/sys/mips/mips/mainbus.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/mem.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/nexus.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/pm_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#15 integrate .. //depot/projects/usb/src/sys/mips/mips/psraccess.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/ptrace_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/support.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/swtch.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/sys_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/tick.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/tlb.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/trap.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/vm_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/Makefile.msgring#1 branch .. //depot/projects/usb/src/sys/mips/rmi/board.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/board.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/bus_space_rmi.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/clock.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/clock.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/debug.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/desc.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmilib.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmilib.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmisec.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/stats.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/atx_cpld.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/xgmac_mdio.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/ehcireg.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/ehcivar.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/files.xlr#1 branch .. //depot/projects/usb/src/sys/mips/rmi/interrupt.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/intr_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/iodi.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/iomap.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring.cfg#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring_xls.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring_xls.cfg#1 branch .. //depot/projects/usb/src/sys/mips/rmi/on_chip.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/pcibus.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/pcibus.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon_kern.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon_percpu.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon_utils.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon_xlrconfig.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/pic.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/rmi_mips_exts.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/rootfs_list.txt#1 branch .. //depot/projects/usb/src/sys/mips/rmi/shared_structs.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/shared_structs_func.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/shared_structs_offsets.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/std.xlr#1 branch .. //depot/projects/usb/src/sys/mips/rmi/tick.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/uart_bus_xlr_iodi.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/uart_cpu_mips_xlr.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_boot1_console.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_csum_nocopy.S#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_i2c.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_pci.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlrconfig.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xls_ehci.c#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/files.sentry5#2 integrate .. //depot/projects/usb/src/sys/mips/sentry5/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/sentry5/s5_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/sentry5/siba_cc.c#2 delete .. //depot/projects/usb/src/sys/mips/sentry5/siba_mips.c#2 delete .. //depot/projects/usb/src/sys/mips/sentry5/siba_sdram.c#2 delete .. //depot/projects/usb/src/sys/mips/sentry5/uart_bus_sbusart.c#3 integrate .. //depot/projects/usb/src/sys/mips/sentry5/uart_cpu_sbusart.c#3 integrate .. //depot/projects/usb/src/sys/mips/sibyte/ata_zbbus.c#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/files.sibyte#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_asm.S#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_scd.c#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_scd.h#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbbus.c#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbpci.c#1 branch .. //depot/projects/usb/src/sys/modules/Makefile#47 integrate .. //depot/projects/usb/src/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/epic/Makefile#1 branch .. //depot/projects/usb/src/sys/net/flowtable.c#15 integrate .. //depot/projects/usb/src/sys/net/if_epair.c#4 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#28 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#14 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#27 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#26 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether.c#17 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#8 integrate .. //depot/projects/usb/src/sys/netinet/in.c#41 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#21 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#27 integrate .. //depot/projects/usb/src/sys/netinet/ip_var.h#16 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#8 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_dynamic.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_private.h#4 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_sockopt.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_table.c#3 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_db.c#10 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_mod.c#4 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#33 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#27 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#32 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#21 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#22 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#33 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs.h#12 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_fha.c#6 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#11 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptosoft.c#9 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#24 integrate .. //depot/projects/usb/src/sys/pc98/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/pci/ncr.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#10 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#9 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#18 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#26 integrate .. //depot/projects/usb/src/sys/powerpc/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/rpc/clnt_dg.c#8 integrate .. //depot/projects/usb/src/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#2 integrate .. //depot/projects/usb/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#26 integrate .. //depot/projects/usb/src/sys/sparc64/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/sparc64/ebus/epic.c#1 branch .. //depot/projects/usb/src/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#18 integrate .. //depot/projects/usb/src/sys/sun4v/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/sys/proc.h#25 integrate .. //depot/projects/usb/src/sys/sys/sleepqueue.h#8 integrate .. //depot/projects/usb/src/sys/sys/socket.h#11 integrate .. //depot/projects/usb/src/sys/sys/systm.h#21 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_dirhash.c#11 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_probe.c#7 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#7 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#18 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#10 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#9 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#21 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb20.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.6 2009/11/20 08:57:25 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.7 2010/01/10 19:18:49 thompsa Exp $ */ /*- * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#26 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.311 2009/11/04 22:39:18 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.312 2010/01/10 21:00:52 alc Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -98,12 +98,6 @@ char *nmi_stack; void *dpcpu; -/* Hotwire a 0->4MB V==P mapping */ -extern pt_entry_t *KPTphys; - -/* SMP page table page */ -extern pt_entry_t *SMPpt; - struct pcb stoppcbs[MAXCPU]; struct xpcb **stopxpcbs = NULL; ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#34 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.676 2009/11/11 14:21:31 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.677 2010/01/11 16:01:20 alc Exp $"); /* * Manages physical address maps. @@ -664,7 +664,6 @@ void pmap_init(void) { - pd_entry_t *pd; vm_page_t mpte; vm_size_t s; int i, pv_npg; @@ -673,18 +672,13 @@ * Initialize the vm page array entries for the kernel pmap's * page table pages. */ - pd = pmap_pde(kernel_pmap, KERNBASE); for (i = 0; i < NKPT; i++) { - if ((pd[i] & (PG_PS | PG_V)) == (PG_PS | PG_V)) - continue; - KASSERT((pd[i] & PG_V) != 0, - ("pmap_init: page table page is missing")); - mpte = PHYS_TO_VM_PAGE(pd[i] & PG_FRAME); + mpte = PHYS_TO_VM_PAGE(KPTphys + (i << PAGE_SHIFT)); KASSERT(mpte >= vm_page_array && mpte < &vm_page_array[vm_page_array_size], ("pmap_init: page table page is out of range")); mpte->pindex = pmap_pde_pindex(KERNBASE) + i; - mpte->phys_addr = pd[i] & PG_FRAME; + mpte->phys_addr = KPTphys + (i << PAGE_SHIFT); } /* ==== //depot/projects/usb/src/sys/amd64/amd64/sys_machdep.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.94 2009/07/09 09:34:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.95 2010/01/09 11:28:01 kib Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -420,13 +420,14 @@ return (pldt); } - mdp->md_ldt = new_ldt; if (pldt != NULL) { bcopy(pldt->ldt_base, new_ldt->ldt_base, max_ldt_segment * sizeof(struct user_segment_descriptor)); user_ldt_derefl(pldt); } ssdtosyssd(&sldt, &p->p_md.md_ldt_sd); + atomic_store_rel_ptr((volatile uintptr_t *)&mdp->md_ldt, + (uintptr_t)new_ldt); if (p == curproc) set_user_ldt(mdp); ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#34 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.535 2010/01/03 20:40:54 brooks Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.536 2010/01/10 17:44:22 imp Exp $ cpu HAMMER ident GENERIC @@ -75,6 +75,7 @@ options FLOWTABLE # per-cpu routing cache #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks +options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/usb/src/sys/amd64/conf/Makefile#2 (text+ko) ==== @@ -1,3 +1,5 @@ -# $FreeBSD: src/sys/amd64/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/Makefile,v 1.10 2010/01/08 18:57:31 bz Exp $ + +TARGET=amd64 .include "${.CURDIR}/../../conf/makeLINT.mk" ==== //depot/projects/usb/src/sys/boot/common/bootstrap.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.46 2008/11/17 20:49:29 pjd Exp $ + * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.47 2010/01/09 22:54:29 marcel Exp $ */ #include <sys/types.h> @@ -45,6 +45,7 @@ #define DEVT_CD 3 #define DEVT_ZFS 4 int d_unit; + void *d_opendata; }; /* Commands and return values; nonzero return sets command_errmsg != NULL */ ==== //depot/projects/usb/src/sys/boot/common/dev_net.c#5 (text+ko) ==== @@ -1,6 +1,4 @@ -/* - * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ - */ +/* $NetBSD: dev_net.c,v 1.23 2008/04/28 20:24:06 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -17,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -39,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.19 2009/12/24 15:16:16 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.21 2010/01/09 21:23:39 marius Exp $"); /*- * This module implements a "raw device" interface suitable for @@ -80,12 +71,14 @@ int debug = 0; #endif +static char *netdev_name; static int netdev_sock = -1; static int netdev_opens; static int net_init(void); static int net_open(struct open_file *, ...); static int net_close(struct open_file *); +static void net_cleanup(void); static int net_strategy(); static void net_print(int); @@ -99,7 +92,8 @@ net_open, net_close, noioctl, - net_print + net_print, + net_cleanup }; static int @@ -125,6 +119,12 @@ devname = va_arg(args, char*); va_end(args); +#ifdef NETIF_OPEN_CLOSE_ONCE + /* Before opening another interface, close the previous one first. */ + if (netdev_sock >= 0 && strcmp(devname, netdev_name) != 0) + net_cleanup(); +#endif + /* On first open, do netif open, mount, etc. */ if (netdev_opens == 0) { /* Find network interface. */ @@ -134,6 +134,7 @@ printf("net_open: netif_open() failed\n"); return (ENXIO); } + netdev_name = strdup(devname); #ifdef NETIF_DEBUG if (debug) printf("net_open: netif_open() succeeded\n"); @@ -144,14 +145,12 @@ error = net_getparams(netdev_sock); if (error) { /* getparams makes its own noise */ + free(netdev_name); netif_close(netdev_sock); netdev_sock = -1; return (error); } } -#if defined(__sparc64__) - netdev_opens++; -#endif } netdev_opens++; f->f_devdata = &netdev_sock; @@ -161,30 +160,46 @@ static int net_close(struct open_file *f) { + #ifdef NETIF_DEBUG if (debug) printf("net_close: opens=%d\n", netdev_opens); #endif - /* On last close, do netif close, etc. */ f->f_devdata = NULL; + +#ifndef NETIF_OPEN_CLOSE_ONCE /* Extra close call? */ if (netdev_opens <= 0) return (0); netdev_opens--; /* Not last close? */ if (netdev_opens > 0) - return(0); - rootip.s_addr = 0; + return (0); + /* On last close, do netif close, etc. */ +#ifdef NETIF_DEBUG + if (debug) + printf("net_close: calling net_cleanup()\n"); +#endif + net_cleanup(); +#endif + return (0); +} + +static void +net_cleanup(void) +{ + if (netdev_sock >= 0) { #ifdef NETIF_DEBUG if (debug) - printf("net_close: calling netif_close()\n"); + printf("net_cleanup: calling netif_close()\n"); #endif + rootip.s_addr = 0; + free(netdev_name); netif_close(netdev_sock); netdev_sock = -1; } - return (0); } static int ==== //depot/projects/usb/src/sys/boot/efi/include/efilib.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.7 2010/01/09 22:54:29 marcel Exp $ */ #include <stand.h> @@ -34,9 +34,7 @@ extern EFI_BOOT_SERVICES *BS; extern EFI_RUNTIME_SERVICES *RS; -extern struct devsw efifs_dev; -extern struct fs_ops efifs_fsops; - +extern struct devsw efipart_dev; extern struct devsw efinet_dev; extern struct netif_driver efinetif; ==== //depot/projects/usb/src/sys/boot/efi/libefi/Makefile#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.18 2010/01/09 22:54:29 marcel Exp $ LIB= efi INTERNALLIB= -SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \ - time.c +SRCS= delay.c efi_console.c efinet.c efipart.c errno.c handles.c \ + libefi.c time.c CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} ==== //depot/projects/usb/src/sys/boot/ia64/efi/conf.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/conf.c,v 1.12 2006/11/05 22:03:04 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/conf.c,v 1.13 2010/01/09 22:54:29 marcel Exp $"); #include <stand.h> #include <efi.h> @@ -49,15 +49,16 @@ /* Exported for libstand */ struct devsw *devsw[] = { - &efifs_dev, + &efipart_dev, &efinet_dev, NULL }; struct fs_ops *file_system[] = { - &efifs_fsops, + &dosfs_fsops, + &ufs_fsops, + &cd9660_fsops, &nfs_fsops, - &ufs_fsops, &gzipfs_fsops, NULL }; ==== //depot/projects/usb/src/sys/boot/ia64/efi/main.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/main.c,v 1.27 2006/11/05 22:03:04 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/main.c,v 1.28 2010/01/10 00:14:04 marcel Exp $"); #include <stand.h> #include <string.h> @@ -127,8 +127,6 @@ /* Get our loaded image protocol interface structure. */ BS->HandleProtocol(IH, &imgid, (VOID**)&img); - printf("Image base: 0x%016lx\n", (u_long)img->ImageBase); - printf("\n"); printf("%s, Revision %s\n", bootprog_name, bootprog_rev); printf("(%s, %s)\n", bootprog_maker, bootprog_date); ==== //depot/projects/usb/src/sys/boot/ia64/efi/version#3 (text+ko) ==== @@ -1,8 +1,11 @@ -$FreeBSD: src/sys/boot/ia64/efi/version,v 1.7 2006/11/05 22:03:04 marcel Exp $ +$FreeBSD: src/sys/boot/ia64/efi/version,v 1.8 2010/01/09 22:54:29 marcel Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +2.0: Provide devices based on the block I/O protocol, rather than the + simple file services protocol. Use the FreeBSD file system code + on top of those devices to access files. 1.2: Restructured. Has some user visible differences. 1.1: Pass the HCDP table address to the kernel via bootinfo if one is present in the EFI system table. ==== //depot/projects/usb/src/sys/boot/sparc64/loader/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.23 2010/01/09 21:23:39 marius Exp $ .include <bsd.own.mk> MK_SSP= no @@ -51,11 +51,15 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif -# Always add MI sources +# Always add MI sources .PATH: ${.CURDIR}/../../common .include "${.CURDIR}/../../common/Makefile.inc" CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. +# Avoid the open-close-dance for every file access as some firmwares perform +# an auto-negotiation on every open of the network interface and thus causes +# netbooting to take horribly long. +CFLAGS+= -DNETIF_OPEN_CLOSE_ONCE CLEANFILES+= vers.c loader.help ==== //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.18 2009/12/07 16:23:25 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.19 2010/01/10 09:20:56 mav Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -1001,7 +1001,6 @@ union ccb *request_ccb; struct ccb_pathinq *cpi; int counter; - int found; } ata_scan_bus_info; /* @@ -1049,14 +1048,11 @@ } scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; - if (scan_info->cpi->transport == XPORT_ATA) - scan_info->found = 0x0003; - else - scan_info->found = 0x8001; - scan_info->counter = 0; /* If PM supported, probe it first. */ if (scan_info->cpi->hba_inquiry & PI_SATAPM) - scan_info->counter = 15; + scan_info->counter = scan_info->cpi->max_target; + else + scan_info->counter = 0; work_ccb = xpt_alloc_ccb_nowait(); if (work_ccb == NULL) { @@ -1073,10 +1069,11 @@ /* Free the current request path- we're done with it. */ xpt_free_path(work_ccb->ccb_h.path); /* If there is PMP... */ - if (scan_info->counter == 15) { + if ((scan_info->cpi->hba_inquiry & PI_SATAPM) && + (scan_info->counter == scan_info->cpi->max_target)) { if (work_ccb->ccb_h.ppriv_field1 != 0) { /* everything else willbe probed by it */ - scan_info->found = 0x8000; + goto done; } else { struct ccb_trans_settings cts; @@ -1091,11 +1088,10 @@ xpt_action((union ccb *)&cts); } } -take_next: - /* Take next device. Wrap from 15 (PM) to 0. */ - scan_info->counter = (scan_info->counter + 1 ) & 0x0f; - if (scan_info->counter > scan_info->cpi->max_target - - ((scan_info->cpi->hba_inquiry & PI_SATAPM) ? 1 : 0)) { + if (scan_info->counter == + ((scan_info->cpi->hba_inquiry & PI_SATAPM) ? + 0 : scan_info->cpi->max_target)) { +done: xpt_free_ccb(work_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; @@ -1104,9 +1100,10 @@ xpt_done(request_ccb); break; } + /* Take next device. Wrap from max (PMP) to 0. */ + scan_info->counter = (scan_info->counter + 1 ) % + (scan_info->cpi->max_target + 1); scan_next: - if ((scan_info->found & (1 << scan_info->counter)) == 0) - goto take_next; status = xpt_create_path(&path, xpt_periph, scan_info->request_ccb->ccb_h.path_id, scan_info->counter, 0); ==== //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.42 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.43 2010/01/07 21:01:37 mbr Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -1555,7 +1555,7 @@ */ static int safte_getconfig(ses_softc_t *); -static int safte_rdstat(ses_softc_t *, int);; +static int safte_rdstat(ses_softc_t *, int); static int set_objstat_sel(ses_softc_t *, ses_objstat *, int); static int wrbuf16(ses_softc_t *, uint8_t, uint8_t, uint8_t, uint8_t, int); static void wrslot_stat(ses_softc_t *, int); @@ -2257,7 +2257,7 @@ ssc->ses_objmap[oid].encstat[0] = SES_OBJSTAT_NOTAVAIL; ssc->ses_objmap[oid].encstat[1] = 0; ssc->ses_objmap[oid].encstat[2] = sdata[r]; - ssc->ses_objmap[oid].encstat[3] = 0;; + ssc->ses_objmap[oid].encstat[3] = 0; ssc->ses_objmap[oid++].svalid = 1; r++; } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_targ_bh.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.26 2009/10/23 08:27:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.27 2010/01/07 21:01:37 mbr Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -429,7 +429,7 @@ switch (softc->init_level) { case 0: - panic("targdtor - impossible init level");; + panic("targdtor - impossible init level"); case 1: /* FALLTHROUGH */ default: ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 (text+ko) ==== @@ -847,6 +847,12 @@ if (err != 0 && err != ENOENT) return (EINVAL); + if (drro->drr_bonuslen) { + data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); + if (ra->err) + return (ra->err); + } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001111702.o0BH2kEX096793>