PERFORCE change 125832 for review
Roman Divacky
rdivacky at FreeBSD.org
Wed Aug 29 14:33:59 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=125832
Change 125832 by rdivacky at rdivacky_witten on 2007/08/29 21:33:36
IFC
Affected files ...
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/amd64/support.S#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/include/asm.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/include/asmacros.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/linux32/syscalls.master#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/boot/arm/at91/boot2/boot2.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/boot/arm/at91/libat91/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/linux/linux_misc.c#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/conf/files#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/conf/files.amd64#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/conf/files.i386#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/conf/options#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/aac/aac_pci.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/ata/ata-raid.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/coretemp/coretemp.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_l2t.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_l2t.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/ichwd/ichwd.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/ichwd/ichwd.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/isp/isp_freebsd.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mfi/mfi.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mfi/mfi_disk.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mfi/mfi_pci.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mfi/mfivar.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mxge/eth_z8e.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mxge/ethp_z8e.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/usb/ehci.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/usb/if_axe.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/usb/if_axereg.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/usb/if_zyd.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/usb/if_zydfw.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/usb/if_zydreg.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/tmpfs/tmpfs.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/i386/support.s#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/i386/swtch.s#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/include/asm.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/include/asmacros.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/include/cpufunc.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/kern_lockf.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/syscalls.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/syscalls.master#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/uipc_domain.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/modules/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/modules/coretemp/Makefile#1 branch
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/modules/netgraph/bluetooth/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/modules/zyd/Makefile#1 branch
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/net/bpf.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/net/bridgestp.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/net/netisr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_header.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_os.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_peeloff.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_sysctl.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/nfsserver/nfs_syscalls.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/pci/if_xl.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/include/interruptvar.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/include/intr_machdep.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/include/md_var.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/include/openpicvar.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/include/trap.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powermac/hrowpicvar.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powerpc/autoconf.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powerpc/interrupt.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powerpc/nexus.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powerpc/pic_if.m#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/powerpc/trap.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/sys/ata.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/sys/mbuf.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/sys/mount.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/sys/mutex.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/sys/syscall.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/sys/syscall.mk#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/sys/sysproto.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/sys/thr.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/vm/device_pager.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/vm/phys_pager.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/vm/vm_map.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/vm/vm_map.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_fixes/sys/vm/vm_mmap.c#2 integrate
Differences ...
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/amd64/cpu_switch.S#2 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.160 2007/08/22 05:06:14 jkoshy Exp $
*/
#include <machine/asmacros.h>
@@ -81,6 +81,7 @@
movq PCB_CR3(%rdx),%rdx
movq %rdx,%cr3 /* new address space */
jmp swact
+END(cpu_throw)
/*
* cpu_switch(old, new, mtx)
@@ -256,7 +257,8 @@
movq %rax,%dr7
1:
ret
-
+END(cpu_switch)
+
/*
* savectx(pcb)
* Update pcb, saving current processor state.
@@ -314,3 +316,4 @@
popfq
ret
+END(savectx)
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/amd64/pmap.c#2 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $");
/*
* Manages physical address maps.
@@ -1722,7 +1722,7 @@
static const struct timeval printinterval = { 60, 0 };
static struct timeval lastprint;
static vm_pindex_t colour;
- int bit, field, page_req;
+ int bit, field;
pv_entry_t pv;
struct pv_chunk *pc;
vm_page_t m;
@@ -1755,8 +1755,7 @@
}
}
/* No free items, allocate another chunk */
- page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM;
- m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ);
if (m == NULL) {
if (try) {
pv_entry_count--;
@@ -1775,7 +1774,7 @@
PV_STAT(pmap_collect_inactive++);
pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]);
m = vm_page_alloc(NULL, colour,
- VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ);
+ VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ);
if (m == NULL) {
PV_STAT(pmap_collect_active++);
pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]);
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/amd64/support.S#2 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.128 2007/08/22 05:06:14 jkoshy Exp $
*/
#include "opt_ddb.h"
@@ -69,7 +69,8 @@
rep
stosb
ret
-
+END(bzero)
+
/* Address: %rdi */
ENTRY(pagezero)
movq $-PAGE_SIZE,%rdx
@@ -84,6 +85,7 @@
jne 1b
sfence
ret
+END(pagezero)
ENTRY(bcmp)
movq %rdx,%rcx
@@ -101,6 +103,7 @@
setne %al
movsbl %al,%eax
ret
+END(bcmp)
/*
* bcopy(src, dst, cnt)
@@ -144,7 +147,8 @@
movsq
cld
ret
-
+END(bcopy)
+
/*
* Note: memcpy does not support overlapping copies
*/
@@ -159,6 +163,7 @@
rep
movsb
ret
+END(memcpy)
/*
* pagecopy(%rdi=from, %rsi=to)
@@ -185,6 +190,7 @@
jne 2b
sfence
ret
+END(pagecopy)
/* fillw(pat, base, cnt) */
/* %rdi,%rsi, %rdx */
@@ -196,6 +202,7 @@
rep
stosw
ret
+END(fillw)
/*****************************************************************************/
/* copyout and fubyte family */
@@ -267,6 +274,7 @@
movq $0,PCB_ONFAULT(%rdx)
movq $EFAULT,%rax
ret
+END(copyout)
/*
* copyin(from_user, to_kernel, len) - MP SAFE
@@ -312,6 +320,7 @@
movq $0,PCB_ONFAULT(%rdx)
movq $EFAULT,%rax
ret
+END(copyin)
/*
* casuword32. Compare and set user integer. Returns -1 or the current value.
@@ -340,6 +349,7 @@
movq PCPU(CURPCB),%rcx
movq $0,PCB_ONFAULT(%rcx)
ret
+END(casuword32)
/*
* casuword. Compare and set user word. Returns -1 or the current value.
@@ -369,6 +379,7 @@
movq $fusufault,PCB_ONFAULT(%rcx)
movq $0,PCB_ONFAULT(%rcx)
ret
+END(casuword)
/*
* Fetch (load) a 64-bit word, a 32-bit word, a 16-bit word, or an 8-bit
@@ -388,6 +399,8 @@
movq (%rdi),%rax
movq $0,PCB_ONFAULT(%rcx)
ret
+END(fuword64)
+END(fuword)
ENTRY(fuword32)
movq PCPU(CURPCB),%rcx
@@ -400,6 +413,7 @@
movl (%rdi),%eax
movq $0,PCB_ONFAULT(%rcx)
ret
+END(fuword32)
/*
* fuswintr() and suswintr() are specialized variants of fuword16() and
@@ -412,6 +426,8 @@
ENTRY(fuswintr)
movq $-1,%rax
ret
+END(suswintr)
+END(fuswintr)
ENTRY(fuword16)
movq PCPU(CURPCB),%rcx
@@ -424,6 +440,7 @@
movzwl (%rdi),%eax
movq $0,PCB_ONFAULT(%rcx)
ret
+END(fuword16)
ENTRY(fubyte)
movq PCPU(CURPCB),%rcx
@@ -436,6 +453,7 @@
movzbl (%rdi),%eax
movq $0,PCB_ONFAULT(%rcx)
ret
+END(fubyte)
ALIGN_TEXT
fusufault:
@@ -464,6 +482,8 @@
movq PCPU(CURPCB),%rcx
movq %rax,PCB_ONFAULT(%rcx)
ret
+END(suword64)
+END(suword)
ENTRY(suword32)
movq PCPU(CURPCB),%rcx
@@ -478,6 +498,7 @@
movq PCPU(CURPCB),%rcx
movq %rax,PCB_ONFAULT(%rcx)
ret
+END(suword32)
ENTRY(suword16)
movq PCPU(CURPCB),%rcx
@@ -492,6 +513,7 @@
movq PCPU(CURPCB),%rcx /* restore trashed register */
movq %rax,PCB_ONFAULT(%rcx)
ret
+END(suword16)
ENTRY(subyte)
movq PCPU(CURPCB),%rcx
@@ -507,6 +529,7 @@
movq PCPU(CURPCB),%rcx /* restore trashed register */
movq %rax,PCB_ONFAULT(%rcx)
ret
+END(subyte)
/*
* copyinstr(from, to, maxlen, int *lencopied) - MP SAFE
@@ -575,7 +598,7 @@
movq %r8,(%r9)
1:
ret
-
+END(copyinstr)
/*
* copystr(from, to, maxlen, int *lencopied) - MP SAFE
@@ -612,6 +635,7 @@
movq %r8,(%rcx)
7:
ret
+END(copystr)
/*
* Handling of special amd64 registers and descriptor tables etc
@@ -639,6 +663,7 @@
pushq %rax
MEXITCOUNT
lretq
+END(lgdt)
/*****************************************************************************/
/* setjump, longjump */
@@ -656,6 +681,7 @@
movq %rdx,56(%rdi) /* save rip */
xorl %eax,%eax /* return(0); */
ret
+END(setjmp)
ENTRY(longjmp)
movq 0(%rdi),%rbx /* restore rbx */
@@ -670,6 +696,7 @@
xorl %eax,%eax /* return(1); */
incl %eax
ret
+END(longjmp)
/*
* Support for BB-profiling (gcc -a). The kernbb program will extract
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/conf/NOTES#2 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.68 2007/07/04 00:18:38 bz Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69 2007/08/15 19:26:02 des Exp $
#
#
@@ -446,6 +446,13 @@
#
device ichwd
+#
+# Temperature sensors:
+#
+# coretemp: on-die sensor on Intel Core and newer CPUs
+#
+device coretemp
+
#---------------------------------------------------------------------------
# ISDN4BSD
#
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/include/asm.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90
- * $FreeBSD: src/sys/amd64/include/asm.h,v 1.17 2005/04/10 20:49:21 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/asm.h,v 1.18 2007/08/22 04:26:07 jkoshy Exp $
*/
#ifndef _MACHINE_ASM_H_
@@ -77,6 +77,8 @@
#define ENTRY(x) _ENTRY(x)
#endif
+#define END(x) .size x, . - x
+
#define RCSID(x) .text; .asciz x
#undef __FBSDID
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/include/asmacros.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.32 2006/10/28 06:04:29 bde Exp $
+ * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.33 2007/08/22 04:26:07 jkoshy Exp $
*/
#ifndef _MACHINE_ASMACROS_H_
@@ -57,6 +57,8 @@
#define NON_GPROF_ENTRY(name) GEN_ENTRY(name)
#define NON_GPROF_RET .byte 0xc3 /* opcode for `ret' */
+#define END(name) .size name, . - name
+
#ifdef GPROF
/*
* __mcount is like [.]mcount except that doesn't require its caller to set
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/include/specialreg.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.39 2007/05/31 11:26:44 des Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.40 2007/08/15 19:26:01 des Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -179,6 +179,7 @@
#define MSR_BIOS_SIGN 0x08b
#define MSR_PERFCTR0 0x0c1
#define MSR_PERFCTR1 0x0c2
+#define MSR_IA32_EXT_CONFIG 0x0ee /* Undocumented. Core Solo/Duo only */
#define MSR_MTRRcap 0x0fe
#define MSR_BBL_CR_ADDR 0x116
#define MSR_BBL_CR_DECC 0x118
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
#ifndef _LINUX_SYSPROTO_H_
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/linux32/linux32_syscall.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
#define LINUX_SYS_exit 1
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/linux32/linux32_sysent.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
#include <bsm/audit_kevents.h>
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/amd64/linux32/syscalls.master#4 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/arm/arm/busdma_machdep.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.34 2007/07/27 14:46:43 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.35 2007/08/18 16:47:28 cognet Exp $");
/*
* ARM bus dma support routines
@@ -1091,13 +1091,19 @@
{
char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align];
- if (op & BUS_DMASYNC_PREWRITE) {
+ if ((op & BUS_DMASYNC_PREWRITE) && !(op & BUS_DMASYNC_PREREAD)) {
cpu_dcache_wb_range((vm_offset_t)buf, len);
cpu_l2cache_wb_range((vm_offset_t)buf, len);
}
if (op & BUS_DMASYNC_PREREAD) {
- cpu_idcache_wbinv_range((vm_offset_t)buf, len);
- cpu_l2cache_wbinv_range((vm_offset_t)buf, len);
+ if ((op & BUS_DMASYNC_PREWRITE) ||
+ ((((vm_offset_t)(buf) | len) & arm_dcache_align_mask) == 0)) {
+ cpu_dcache_inv_range((vm_offset_t)buf, len);
+ cpu_l2cache_inv_range((vm_offset_t)buf, len);
+ } else {
+ cpu_dcache_wbinv_range((vm_offset_t)buf, len);
+ cpu_l2cache_wbinv_range((vm_offset_t)buf, len);
+ }
}
if (op & BUS_DMASYNC_POSTREAD) {
if ((vm_offset_t)buf & arm_dcache_align_mask) {
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/arm/arm/cpufunc.c#2 (text+ko) ====
@@ -45,7 +45,7 @@
* Created : 30/01/97
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.17 2007/07/27 14:39:41 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.18 2007/08/07 18:37:21 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,9 +148,9 @@
arm7tdmi_cache_flushID, /* idcache_wbinv_all */
(void *)arm7tdmi_cache_flushID, /* idcache_wbinv_range */
cpufunc_nullop, /* l2cache_wbinv_all */
- cpufunc_nullop, /* l2cache_wbinv_range */
- cpufunc_nullop, /* l2cache_inv_range */
- cpufunc_nullop, /* l2cache_wb_range */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -210,9 +210,9 @@
arm8_cache_purgeID, /* idcache_wbinv_all */
(void *)arm8_cache_purgeID, /* idcache_wbinv_range */
cpufunc_nullop, /* l2cache_wbinv_all */
- cpufunc_nullop, /* l2cache_wbinv_range */
- cpufunc_nullop, /* l2cache_inv_range */
- cpufunc_nullop, /* l2cache_wb_range */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -271,9 +271,9 @@
arm9_idcache_wbinv_all, /* idcache_wbinv_all */
arm9_idcache_wbinv_range, /* idcache_wbinv_range */
cpufunc_nullop, /* l2cache_wbinv_all */
- cpufunc_nullop, /* l2cache_wbinv_range */
- cpufunc_nullop, /* l2cache_inv_range */
- cpufunc_nullop, /* l2cache_wb_range */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -333,9 +333,9 @@
arm10_idcache_wbinv_all, /* idcache_wbinv_all */
arm10_idcache_wbinv_range, /* idcache_wbinv_range */
cpufunc_nullop, /* l2cache_wbinv_all */
- cpufunc_nullop, /* l2cache_wbinv_range */
- cpufunc_nullop, /* l2cache_inv_range */
- cpufunc_nullop, /* l2cache_wb_range */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -395,9 +395,9 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
cpufunc_nullop, /* l2cache_wbinv_all */
- cpufunc_nullop, /* l2cache_wbinv_range */
- cpufunc_nullop, /* l2cache_inv_range */
- cpufunc_nullop, /* l2cache_wb_range */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -456,9 +456,9 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
cpufunc_nullop, /* l2cache_wbinv_all */
- cpufunc_nullop, /* l2cache_wbinv_range */
- cpufunc_nullop, /* l2cache_inv_range */
- cpufunc_nullop, /* l2cache_wb_range */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -517,9 +517,9 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
cpufunc_nullop, /* l2cache_wbinv_all */
- cpufunc_nullop, /* l2cache_wbinv_range */
- cpufunc_nullop, /* l2cache_inv_range */
- cpufunc_nullop, /* l2cache_wb_range */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -581,9 +581,9 @@
xscale_cache_purgeID, /* idcache_wbinv_all */
xscale_cache_purgeID_rng, /* idcache_wbinv_range */
cpufunc_nullop, /* l2cache_wbinv_all */
- cpufunc_nullop, /* l2cache_wbinv_range */
- cpufunc_nullop, /* l2cache_inv_range */
- cpufunc_nullop, /* l2cache_wb_range */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/arm/arm/genassym.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.9 2007/05/23 13:21:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.10 2007/08/08 09:27:52 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/assym.h>
@@ -92,6 +92,7 @@
ASSYM(TD_PROC, offsetof(struct thread, td_proc));
ASSYM(TD_FRAME, offsetof(struct thread, td_frame));
ASSYM(TD_MD, offsetof(struct thread, td_md));
+ASSYM(TD_LOCK, offsetof(struct thread, td_lock));
ASSYM(MD_TP, offsetof(struct mdthread, md_tp));
ASSYM(TF_R0, offsetof(struct trapframe, tf_r0));
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/arm/arm/swtch.S#2 (text+ko) ====
@@ -83,7 +83,7 @@
#include <machine/asm.h>
#include <machine/asmacros.h>
#include <machine/armreg.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.19 2006/04/09 20:16:47 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.20 2007/08/07 18:20:55 cognet Exp $");
/*
@@ -127,6 +127,8 @@
.word _C_LABEL(block_userspace_access)
.Lcpu_do_powersave:
.word _C_LABEL(cpu_do_powersave)
+.Lblocked_lock:
+ .word _C_LABEL(blocked_lock)
ENTRY(cpu_throw)
mov r5, r1
@@ -214,6 +216,7 @@
ENTRY(cpu_switch)
stmfd sp!, {r4-r7, lr}
+ mov r6, r2 /* Save the mutex */
.Lswitch_resume:
/* rem: r0 = old lwp */
@@ -241,10 +244,11 @@
/* Stage two : Save old context */
- /* Get the user structure for the old lwp. */
+ /* Get the user structure for the old thread. */
ldr r2, [r0, #(TD_PCB)]
+ mov r4, r0 /* Save the old thread. */
- /* Save all the registers in the old lwp's pcb */
+ /* Save all the registers in the old thread's pcb */
#ifndef __XSCALE__
add r7, r2, #(PCB_R8)
stmia r7, {r8-r13}
@@ -324,8 +328,7 @@
mov lr, pc
ldr pc, [r1, #CF_IDCACHE_WBINV_ALL]
.Lcs_cache_purge_skipped:
- /* rem: r4 = &block_userspace_access */
- /* rem: r6 = new lwp */
+ /* rem: r6 = lock */
/* rem: r9 = new PCB */
/* rem: r10 = old L1 */
/* rem: r11 = new L1 */
@@ -389,6 +392,17 @@
.Lcs_context_switched:
+ /* Release the old thread */
+ str r6, [r4, #TD_LOCK]
+ ldr r6, .Lblocked_lock
+ ldr r3, .Lcurthread
+ ldr r3, [r3]
+
+1:
+ ldr r4, [r3, #TD_LOCK]
+ cmp r4, r6
+ beq 1b
+
/* XXXSCW: Safe to re-enable FIQs here */
/* rem: r9 = new PCB */
@@ -419,7 +433,7 @@
ldr r13, [r7, #(PCB_SP)]
#endif
- /* rem: r6 = new lwp */
+ /* rem: r6 = lock */
/* rem: r7 = new pcb */
#ifdef ARMFPE
@@ -429,7 +443,7 @@
#endif
/* rem: r5 = new lwp's proc */
- /* rem: r6 = new lwp */
+ /* rem: r6 = lock */
/* rem: r7 = new PCB */
.Lswitch_return:
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/boot/arm/at91/boot2/boot2.c#2 (text+ko) ====
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.6 2007/07/13 14:27:04 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.7 2007/08/17 18:22:31 imp Exp $");
#include <sys/param.h>
#include <sys/disklabel.h>
@@ -216,7 +216,7 @@
return;
}
addr = eh.e_entry;
- ((void(*)(int))addr)(RB_BOOTINFO | (opts & RBX_MASK));
+ ((void(*)(int))addr)(opts & RBX_MASK);
}
static int
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/boot/arm/at91/libat91/Makefile#2 (text) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.9 2007/07/13 14:27:04 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.10 2007/08/09 05:16:55 imp Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -8,7 +8,7 @@
putchar.c printf.c reset.c spi_flash.c xmodem.c \
sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \
memset.c memcmp.c
-SRCS+=ashldi3.c divsi3.c
+SRCS+=ashldi3.c divsi3.S
NO_MAN=
.if ${MK_TAG_LIST} != "no"
==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.66 2007/07/04 23:04:41 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.67 2007/08/28 20:28:11 jhb Exp $");
#include "opt_compat.h"
@@ -135,28 +135,28 @@
static void
copy_statfs(struct statfs *in, struct statfs32 *out)
{
-
+
+ statfs_scale_blocks(in, INT32_MAX);
bzero(out, sizeof(*out));
CP(*in, *out, f_bsize);
- CP(*in, *out, f_iosize);
+ out->f_iosize = MIN(in->f_iosize, INT32_MAX);
CP(*in, *out, f_blocks);
CP(*in, *out, f_bfree);
CP(*in, *out, f_bavail);
- CP(*in, *out, f_files);
- CP(*in, *out, f_ffree);
+ out->f_files = MIN(in->f_files, INT32_MAX);
+ out->f_ffree = MIN(in->f_ffree, INT32_MAX);
CP(*in, *out, f_fsid);
CP(*in, *out, f_owner);
CP(*in, *out, f_type);
CP(*in, *out, f_flags);
- CP(*in, *out, f_flags);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list