Date: Sat, 12 Feb 2011 08:33:43 GMT From: Zheng Liu <lz@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 188744 for review Message-ID: <201102120833.p1C8XhPN087587@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@188744?ac=10 Change 188744 by lz@gnehzuil-freebsd on 2011/02/12 08:33:31 IFC. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/include/fdt.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/include/proc.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/gpio.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/ic.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/mv_pci.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/timer.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/s3c2xx0/std.ln2410sbc#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/fdt/dts/db78100.dts#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/pc98/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/pc98/pc98boot/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/NOTES#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/files#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/options#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/changes.txt#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslbtypes.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslmessages.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslpredef.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/asltree.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslwalks.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtcompile.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtcompiler.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtexpress.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtfield.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtio.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dttable.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtutils.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbdisply.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbinput.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbmethod.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbnames.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dsargs.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dscontrol.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dswload2.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/events/evgpe.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/events/evregion.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/events/evxfregn.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/executer/exfldio.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acdebug.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acdisasm.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acdispat.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acglobal.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/aclocal.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acoutput.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acpixf.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/actbl.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/tables/tbfadt.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/utilities/utdecode.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/utilities/utglobal.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/alc/if_alc.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_debug.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9280.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9280.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285v2.ini#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/sample/tx_schedules.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_debug.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_debug.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_misc.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx_ht.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx_ht.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cs/if_csreg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_80003es2lan.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82571.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82575.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82575.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_api.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_api.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_defines.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_hw.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_mac.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_manage.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_mbx.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_nvm.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_nvm.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_phy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_phy.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_regs.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_vf.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_vf.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/if_igb.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/fdt/fdt_common.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/fdt/fdt_pci.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/fdt/fdtbus.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/flash/mx25l.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/md/md.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/siis/siis.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/siis/siis.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/tsec/if_tsec_fdt.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/controller/ehci_mv.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_pf.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_pf.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_run.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_runvar.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_alloc.c#10 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_mount.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#18 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#16 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/procfs/procfs_fpregs.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/procfs/procfs_regs.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_pc98.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/uio_machdep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/uio_machdep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_context.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_lock.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_module.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_smp.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_uio.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/if_octm.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/octe/ethernet-common.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/octeon_mp.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_inttypes.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_limits.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_stdint.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_types.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/cpufunc.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/sf_buf.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/mp_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/uio_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/rmi/xlr_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/sibyte/sb_scd.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/ath/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/cc/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/cc/cc_chd/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/modules/cc/cc_hd/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/modules/cc/cc_vegas/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/net/if.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/netisr.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/rtsock.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/vnet.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc/cc_chd.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc/cc_hd.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc/cc_newreno.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc/cc_vegas.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_dn_io.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_cc_functions.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_dtrace_declare.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_dtrace_define.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_indata.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_peeloff.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_ss_functions.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctputil.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/include/fdt.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mambo/mambo_openpic.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/atpic.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/isa.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/nexus.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/openpic_fdt.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/pci_fdt.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/ofw/ofw_pcibus.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/cpcht.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/grackle.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/macgpio.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/uninorthpci.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/exec_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/pic_if.m#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/ps3/ps3pic.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sparc64/sparc64/uio_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/diskmbr.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/gpt.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/linker.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/param.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/proc.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/ptrace.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/sysctl.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/sysent.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/taskqueue.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/uio.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/sys/vnode.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_meter.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_object.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_phys.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_reserv.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/x86/x86/mca.c#2 integrate Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.739 2011/01/21 10:26:26 pluknet Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.741 2011/02/05 15:10:27 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -331,6 +331,9 @@ fpstate_drop(td); sf.sf_uc.uc_mcontext.mc_fsbase = pcb->pcb_fsbase; sf.sf_uc.uc_mcontext.mc_gsbase = pcb->pcb_gsbase; + bzero(sf.sf_uc.uc_mcontext.mc_spare, + sizeof(sf.sf_uc.uc_mcontext.mc_spare)); + bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__)); /* Allocate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && @@ -352,6 +355,7 @@ /* Build the argument list for the signal handler. */ regs->tf_rdi = sig; /* arg 1 in %rdi */ regs->tf_rdx = (register_t)&sfp->sf_uc; /* arg 3 in %rdx */ + bzero(&sf.sf_si, sizeof(sf.sf_si)); if (SIGISMEMBER(psp->ps_siginfo, sig)) { /* Signal handler installed with SA_SIGINFO. */ regs->tf_rsi = (register_t)&sfp->sf_si; /* arg 2 in %rsi */ @@ -1527,12 +1531,14 @@ struct nmi_pcpu *np; u_int64_t msr; char *env; + size_t kstack0_sz; thread0.td_kstack = physfree + KERNBASE; - bzero((void *)thread0.td_kstack, KSTACK_PAGES * PAGE_SIZE); - physfree += KSTACK_PAGES * PAGE_SIZE; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + thread0.td_kstack_pages = KSTACK_PAGES; + kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE; + bzero((void *)thread0.td_kstack, kstack0_sz); + physfree += kstack0_sz; + thread0.td_pcb = (struct pcb *)(thread0.td_kstack + kstack0_sz) - 1; /* * This may be done better later if it gets more high level @@ -1674,8 +1680,8 @@ initializecpucache(); /* make an initial tss so cpu can get interrupt stack on syscall! */ - common_tss[0].tss_rsp0 = thread0.td_kstack + \ - KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb); + common_tss[0].tss_rsp0 = thread0.td_kstack + + kstack0_sz - sizeof(struct pcb); /* Ensure the stack is aligned to 16 bytes */ common_tss[0].tss_rsp0 &= ~0xFul; PCPU_SET(rsp0, common_tss[0].tss_rsp0); @@ -2041,6 +2047,7 @@ get_fpcontext(td, mcp); mcp->mc_fsbase = pcb->pcb_fsbase; mcp->mc_gsbase = pcb->pcb_gsbase; + bzero(mcp->mc_spare, sizeof(mcp->mc_spare)); return (0); } ==== //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/uio_machdep.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.6 2005/01/05 20:17:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.7 2011/02/02 16:35:10 mdf Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -88,8 +88,7 @@ page_offset; switch (uio->uio_segflg) { case UIO_USERSPACE: - if (ticks - PCPU_GET(switchticks) >= hogticks) - uio_yield(); + maybe_yield(); if (uio->uio_rw == UIO_READ) error = copyout(cp, iov->iov_base, cnt); else ==== //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.274 2010/12/22 00:18:42 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.275 2011/01/26 20:03:58 dchagin Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -445,7 +445,7 @@ cpu_thread_clean(td); #ifdef COMPAT_FREEBSD32 - if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { + if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { /* * Set the trap frame to point at the beginning of the uts * function. @@ -498,7 +498,7 @@ pcb = td->td_pcb; #ifdef COMPAT_FREEBSD32 - if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { + if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { pcb->pcb_gsbase = (register_t)tls_base; return (0); } ==== //depot/projects/soc2010/ext4fs/src/sys/amd64/ia32/ia32_signal.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.36 2011/01/14 21:09:01 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.37 2011/02/05 15:10:27 kib Exp $"); #include "opt_compat.h" @@ -167,6 +167,8 @@ ia32_get_fpcontext(td, mcp); mcp->mc_fsbase = pcb->pcb_fsbase; mcp->mc_gsbase = pcb->pcb_gsbase; + bzero(mcp->mc_spare1, sizeof(mcp->mc_spare1)); + bzero(mcp->mc_spare2, sizeof(mcp->mc_spare2)); set_pcb_flags(pcb, PCB_FULL_IRET); return (0); } @@ -233,6 +235,7 @@ PROC_LOCK(td->td_proc); uc.uc_sigmask = td->td_sigmask; PROC_UNLOCK(td->td_proc); + bzero(&uc.__spare__, sizeof(uc.__spare__)); ret = copyout(&uc, uap->ucp, UC_COPY_SIZE); } return (ret); @@ -348,6 +351,11 @@ sf.sf_uc.uc_mcontext.mc_es = regs->tf_es; sf.sf_uc.uc_mcontext.mc_fs = regs->tf_fs; sf.sf_uc.uc_mcontext.mc_gs = regs->tf_gs; + bzero(sf.sf_uc.uc_mcontext.mc_fpregs, + sizeof(sf.sf_uc.uc_mcontext.mc_fpregs)); + bzero(sf.sf_uc.uc_mcontext.__spare__, + sizeof(sf.sf_uc.uc_mcontext.__spare__)); + bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__)); /* Allocate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && @@ -365,6 +373,7 @@ /* Build the argument list for the signal handler. */ sf.sf_signum = sig; sf.sf_ucontext = (register_t)&sfp->sf_uc; + bzero(&sf.sf_si, sizeof(sf.sf_si)); if (SIGISMEMBER(psp->ps_siginfo, sig)) { /* Signal handler installed with SA_SIGINFO. */ sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si; @@ -468,6 +477,7 @@ fpstate_drop(td); sf.sf_uc.uc_mcontext.mc_fsbase = td->td_pcb->pcb_fsbase; sf.sf_uc.uc_mcontext.mc_gsbase = td->td_pcb->pcb_gsbase; + bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__)); /* Allocate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && @@ -487,6 +497,7 @@ /* Build the argument list for the signal handler. */ sf.sf_signum = sig; sf.sf_ucontext = (register_t)&sfp->sf_uc; + bzero(&sf.sf_si, sizeof(sf.sf_si)); if (SIGISMEMBER(psp->ps_siginfo, sig)) { /* Signal handler installed with SA_SIGINFO. */ sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si; ==== //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.30 2010/03/28 13:13:22 ed Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.31 2011/01/27 21:45:38 kib Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -370,28 +370,28 @@ /* The Linux sigcontext, pretty much a standard 386 trapframe. */ struct l_sigcontext { - l_int sc_gs; - l_int sc_fs; - l_int sc_es; - l_int sc_ds; - l_int sc_edi; - l_int sc_esi; - l_int sc_ebp; - l_int sc_esp; - l_int sc_ebx; - l_int sc_edx; - l_int sc_ecx; - l_int sc_eax; - l_int sc_trapno; - l_int sc_err; - l_int sc_eip; - l_int sc_cs; - l_int sc_eflags; - l_int sc_esp_at_signal; - l_int sc_ss; - l_int sc_387; - l_int sc_mask; - l_int sc_cr2; + l_uint sc_gs; + l_uint sc_fs; + l_uint sc_es; + l_uint sc_ds; + l_uint sc_edi; + l_uint sc_esi; + l_uint sc_ebp; + l_uint sc_esp; + l_uint sc_ebx; + l_uint sc_edx; + l_uint sc_ecx; + l_uint sc_eax; + l_uint sc_trapno; + l_uint sc_err; + l_uint sc_eip; + l_uint sc_cs; + l_uint sc_eflags; + l_uint sc_esp_at_signal; + l_uint sc_ss; + l_uint sc_387; + l_uint sc_mask; + l_uint sc_cr2; } __packed; struct l_ucontext { ==== //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.59 2010/12/22 00:18:42 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.64 2011/01/30 18:17:38 dchagin Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -51,6 +51,7 @@ #include <sys/syscallsubr.h> #include <sys/sysproto.h> #include <sys/unistd.h> +#include <sys/wait.h> #include <machine/frame.h> #include <machine/pcb.h> @@ -66,6 +67,7 @@ #include <amd64/linux32/linux.h> #include <amd64/linux32/linux32_proto.h> #include <compat/linux/linux_ipc.h> +#include <compat/linux/linux_misc.h> #include <compat/linux/linux_signal.h> #include <compat/linux/linux_util.h> #include <compat/linux/linux_emul.h> @@ -106,6 +108,30 @@ return (lsa); } +static void +bsd_to_linux_rusage(struct rusage *ru, struct l_rusage *lru) +{ + + lru->ru_utime.tv_sec = ru->ru_utime.tv_sec; + lru->ru_utime.tv_usec = ru->ru_utime.tv_usec; + lru->ru_stime.tv_sec = ru->ru_stime.tv_sec; + lru->ru_stime.tv_usec = ru->ru_stime.tv_usec; + lru->ru_maxrss = ru->ru_maxrss; + lru->ru_ixrss = ru->ru_ixrss; + lru->ru_idrss = ru->ru_idrss; + lru->ru_isrss = ru->ru_isrss; + lru->ru_minflt = ru->ru_minflt; + lru->ru_majflt = ru->ru_majflt; + lru->ru_nswap = ru->ru_nswap; + lru->ru_inblock = ru->ru_inblock; + lru->ru_oublock = ru->ru_oublock; + lru->ru_msgsnd = ru->ru_msgsnd; + lru->ru_msgrcv = ru->ru_msgrcv; + lru->ru_nsignals = ru->ru_nsignals; + lru->ru_nvcsw = ru->ru_nvcsw; + lru->ru_nivcsw = ru->ru_nivcsw; +} + int linux_execve(struct thread *td, struct linux_execve_args *args) { @@ -131,7 +157,7 @@ * linux_proc_init, this leads to a panic on KASSERT * because such process has p->p_emuldata == NULL. */ - if (td->td_proc->p_sysent == &elf_linux_sysvec) + if (SV_PROC_ABI(td->td_proc) == SV_ABI_LINUX) error = linux_proc_init(td, 0, 0); return (error); } @@ -1126,24 +1152,7 @@ if (error != 0) return (error); if (uap->rusage != NULL) { - s32.ru_utime.tv_sec = s.ru_utime.tv_sec; - s32.ru_utime.tv_usec = s.ru_utime.tv_usec; - s32.ru_stime.tv_sec = s.ru_stime.tv_sec; - s32.ru_stime.tv_usec = s.ru_stime.tv_usec; - s32.ru_maxrss = s.ru_maxrss; - s32.ru_ixrss = s.ru_ixrss; - s32.ru_idrss = s.ru_idrss; - s32.ru_isrss = s.ru_isrss; - s32.ru_minflt = s.ru_minflt; - s32.ru_majflt = s.ru_majflt; - s32.ru_nswap = s.ru_nswap; - s32.ru_inblock = s.ru_inblock; - s32.ru_oublock = s.ru_oublock; - s32.ru_msgsnd = s.ru_msgsnd; - s32.ru_msgrcv = s.ru_msgrcv; - s32.ru_nsignals = s.ru_nsignals; - s32.ru_nvcsw = s.ru_nvcsw; - s32.ru_nivcsw = s.ru_nivcsw; + bsd_to_linux_rusage(&s, &s32); error = copyout(&s32, uap->rusage, sizeof(s32)); } return (error); @@ -1267,3 +1276,37 @@ return (0); } + +int +linux_wait4(struct thread *td, struct linux_wait4_args *args) +{ + int error, options; + struct rusage ru, *rup; + struct l_rusage lru; + +#ifdef DEBUG + if (ldebug(wait4)) + printf(ARGS(wait4, "%d, %p, %d, %p"), + args->pid, (void *)args->status, args->options, + (void *)args->rusage); +#endif + + options = (args->options & (WNOHANG | WUNTRACED)); + /* WLINUXCLONE should be equal to __WCLONE, but we make sure */ + if (args->options & __WCLONE) + options |= WLINUXCLONE; + + if (args->rusage != NULL) + rup = &ru; + else + rup = NULL; + error = linux_common_wait(td, args->pid, args->status, options, rup); + if (error) + return (error); + if (args->rusage != NULL) { + bsd_to_linux_rusage(rup, &lru); + error = copyout(&lru, args->rusage, sizeof(lru)); + } + + return (error); +} ==== //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.42 2010/10/08 07:19:05 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.43 2011/01/30 20:38:26 dchagin Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib */ @@ -734,10 +734,10 @@ struct linux_sys_futex_args { char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; - char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)]; + char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)]; char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; - char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; - char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; + char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)]; + char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)]; }; struct linux_sched_setaffinity_args { char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)]; ==== //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.38 2010/10/08 07:18:44 kib Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.39 2011/01/30 20:31:43 dchagin Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -405,8 +405,8 @@ 237 AUE_NULL STD { int linux_fremovexattr(void); } 238 AUE_NULL STD { int linux_tkill(int tid, int sig); } 239 AUE_SENDFILE UNIMPL linux_sendfile64 -240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \ - struct l_timespec *timeout, void *uaddr2, int val3); } +240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, uint32_t val, \ + struct l_timespec *timeout, uint32_t *uaddr2, uint32_t val3); } 241 AUE_NULL STD { int linux_sched_setaffinity(l_pid_t pid, l_uint len, \ l_ulong *user_mask_ptr); } 242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \ ==== //depot/projects/soc2010/ext4fs/src/sys/arm/arm/locore.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include <machine/asm.h> #include <machine/armreg.h> #include <machine/pte.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.23 2009/06/09 17:21:47 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.24 2011/02/03 17:35:16 marcel Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -65,14 +65,20 @@ ENTRY_NP(btext) -ASENTRY_NP(_start) - /* - * Move metadata ptr to r12 (ip) + * On entry: + * r0 - metadata pointer or 0 + * r1 - if (r0 == 0) then metadata pointer */ +ASENTRY_NP(_start) + /* Move metadata ptr to r12 (ip) */ mov ip, r0 - + ldr r0, =0 + cmp ip, r0 + bne 1f + mov ip, r1 +1: /* Make sure interrupts are disabled. */ mrs r7, cpsr orr r7, r7, #(I32_bit|F32_bit) ==== //depot/projects/soc2010/ext4fs/src/sys/arm/arm/sys_machdep.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.5 2007/02/14 01:25:41 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.6 2011/02/05 03:30:29 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -85,7 +85,7 @@ arm32_set_tp(struct thread *td, void *args) { - td->td_md.md_tp = args; + td->td_md.md_tp = (register_t)args; return (0); } @@ -93,7 +93,7 @@ arm32_get_tp(struct thread *td, void *args) { - td->td_retval[0] = (uint32_t)td->td_md.md_tp; + td->td_retval[0] = td->td_md.md_tp; return (0); } ==== //depot/projects/soc2010/ext4fs/src/sys/arm/arm/uio_machdep.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.6 2008/03/06 22:27:35 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.7 2011/02/02 16:35:10 mdf Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -94,8 +94,7 @@ cp = (char*)sf_buf_kva(sf) + page_offset; switch (uio->uio_segflg) { case UIO_USERSPACE: - if (ticks - PCPU_GET(switchticks) >= hogticks) - uio_yield(); + maybe_yield(); if (uio->uio_rw == UIO_READ) error = copyout(cp, iov->iov_base, cnt); else ==== //depot/projects/soc2010/ext4fs/src/sys/arm/arm/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.46 2011/01/18 21:57:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.47 2011/02/05 03:30:29 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,7 +146,7 @@ /* Setup to release spin count in fork_exit(). */ td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_cspr = 0; - td2->td_md.md_tp = *(uint32_t **)ARM_TP_ADDRESS; + td2->td_md.md_tp = *(register_t *)ARM_TP_ADDRESS; } void @@ -370,10 +370,10 @@ { if (td != curthread) - td->td_md.md_tp = tls_base; + td->td_md.md_tp = (register_t)tls_base; else { critical_enter(); - *(void **)ARM_TP_ADDRESS = tls_base; + *(register_t *)ARM_TP_ADDRESS = (register_t)tls_base; critical_exit(); } return (0); ==== //depot/projects/soc2010/ext4fs/src/sys/arm/at91/if_ate.c#3 (text) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.49 2010/10/15 15:16:36 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.50 2011/02/07 01:13:57 ticso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -433,6 +433,16 @@ bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTWRITE); } +static uint32_t +ate_mac_hash(const uint8_t *buf) +{ + uint32_t index = 0; + for (int i = 0; i < 48; i++) { + index ^= ((buf[i >> 3] >> (i & 7)) & 1) << (i % 6); + } + return (index); +} + /* * Compute the multicast filter for this device. */ @@ -462,8 +472,8 @@ TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - index = ether_crc32_be(LLADDR((struct sockaddr_dl *) - ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; + index = ate_mac_hash(LLADDR((struct sockaddr_dl *) + ifma->ifma_addr)); af[index >> 3] |= 1 << (index & 7); } if_maddr_runlock(ifp); ==== //depot/projects/soc2010/ext4fs/src/sys/arm/include/fdt.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102120833.p1C8XhPN087587>