PERFORCE change 126347 for review
Rui Paulo
rpaulo at FreeBSD.org
Wed Sep 12 16:42:38 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=126347
Change 126347 by rpaulo at rpaulo_alpha on 2007/09/12 23:41:37
IFC
Affected files ...
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/cpu_switch.S#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/local_apic.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/support.S#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/include/asm.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/include/asmacros.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/include/endian.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot2/boot2.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#17 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options#14 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/aac/aac_pci.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_cpu.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/an/if_an.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/awi/awi.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/coretemp/coretemp.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_common.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_sge_defs.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_t3_hw.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_vsc7323.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_vsc8211.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_xgmac.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_adapter.h#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_include.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_ioctl.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_l2t.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_l2t.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_lro.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_osdep.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_sge.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/dcons/dcons_os.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/drm/i915_dma.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.c#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ipw/if_ipw.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_freebsd.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_freebsd.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_82598.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_api.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_api.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_common.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_common.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_osdep.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_phy.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_phy.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ixgbe/ixgbe_type.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi_pci.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfireg.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfivar.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/eth_z8e.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/ethp_z8e.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/mxge_mcp.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ral/rt2560.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ral/rt2661.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ray/if_ray.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx-midi.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx-pcm.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_rum.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_zyd.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_zydfw.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_zydreg.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#21 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/wi/if_wi.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/direntry.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/msdosfs_conv.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/msdosfs_lookup.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/msdosfs_vnops.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/geom/eli/g_eli.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/geom/eli/g_eli_crypto.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/acpica/madt.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/local_apic.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/support.s#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/swtch.s#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/include/asm.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/include/asmacros.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/isa/isa.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/linux/syscalls.master#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_acct.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_cpu.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_ktrace.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_switch.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sysctl.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_timeout.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/sched_ule.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_smp.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_syscalls.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_aio.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_mount.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_subr.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/cxgb/Makefile#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/ixgbe/Makefile#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/modules/sound/driver/emu10kx/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/zyd/Makefile#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/net/bpf.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/bridgestp.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.c#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/rtsock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/_ieee80211.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ht.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_input.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ioctl.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ioctl.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_node.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_output.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_var.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_base.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_fw2.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp.h#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_asconf.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_asconf.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_auth.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_bsd_addr.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_cc_functions.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_cc_functions.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_constants.h#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_header.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#15 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#17 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_lock_bsd.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os_bsd.h#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#17 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#17 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.h#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_peeloff.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_structs.h#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_uio.h#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_usrreq.c#16 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_var.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#17 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.h#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#13 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#14 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timer.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timer.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_usrreq.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_var.h#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/udp_usrreq.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#15 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/udp6_usrreq.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_input.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_framework.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_policy.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_vfs.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac_bsdextended/mac_bsdextended.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac_lomac/mac_lomac.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac_mls/mac_mls.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac_stub/mac_stub.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/mac_test/mac_test.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/fhc/fhc.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/bus_common.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/intr_machdep.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psycho.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psychoreg.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sbus/sbus.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sbus/sbusreg.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/exception.S#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/intr_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/tick.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/upa.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/mdesc/mdesc_init.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/mbuf.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/mount.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/device_pager.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/phys_pager.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_mmap.c#6 integrate
Differences ...
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/cpu_switch.S#4 (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/rpaulo-macbook/amd64/amd64/local_apic.c#5 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $");
#include "opt_hwpmc_hooks.h"
@@ -1061,7 +1061,7 @@
printf("%s: Failed to setup the local APIC: returned %d\n",
best_enum->apic_name, retval);
}
-SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL)
+SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL)
/*
* Setup the I/O APICs.
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#8 (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/rpaulo-macbook/amd64/amd64/support.S#3 (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/rpaulo-macbook/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/rpaulo-macbook/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/rpaulo-macbook/amd64/linux32/linux32_proto.h#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $
- * 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_
@@ -734,6 +734,11 @@
char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)];
};
+struct linux_sched_getaffinity_args {
+ char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
+ char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)];
+ char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)];
+};
struct linux_set_thread_area_args {
char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)];
};
@@ -1099,6 +1104,7 @@
int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *);
int linux_tkill(struct thread *, struct linux_tkill_args *);
int linux_sys_futex(struct thread *, struct linux_sys_futex_args *);
+int linux_sched_getaffinity(struct thread *, struct linux_sched_getaffinity_args *);
int linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *);
int linux_fadvise64(struct thread *, struct linux_fadvise64_args *);
int linux_exit_group(struct thread *, struct linux_exit_group_args *);
@@ -1172,6 +1178,13 @@
#endif /* COMPAT_FREEBSD4 */
+
+#ifdef COMPAT_FREEBSD6
+
+#define nosys linux_nosys
+
+#endif /* COMPAT_FREEBSD6 */
+
#define LINUX_SYS_AUE_linux_fork AUE_FORK
#define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC
#define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4
@@ -1346,6 +1359,7 @@
#define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL
#define LINUX_SYS_AUE_linux_tkill AUE_NULL
#define LINUX_SYS_AUE_linux_sys_futex AUE_NULL
+#define LINUX_SYS_AUE_linux_sched_getaffinity AUE_NULL
#define LINUX_SYS_AUE_linux_set_thread_area AUE_NULL
#define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL
#define LINUX_SYS_AUE_linux_exit_group AUE_EXIT
==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_syscall.h#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $
- * 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
@@ -222,6 +222,7 @@
#define LINUX_SYS_linux_fremovexattr 237
#define LINUX_SYS_linux_tkill 238
#define LINUX_SYS_linux_sys_futex 240
+#define LINUX_SYS_linux_sched_getaffinity 242
#define LINUX_SYS_linux_set_thread_area 243
#define LINUX_SYS_linux_fadvise64 250
#define LINUX_SYS_linux_exit_group 252
==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_sysent.c#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $
- * 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>
@@ -262,7 +262,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */
{ AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */
+ { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */
{ AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */
==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/syscalls.master#2 (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).
@@ -408,7 +408,8 @@
240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \
struct l_timespec *timeout, void *uaddr2, int val3); }
241 AUE_NULL UNIMPL linux_sched_setaffinity
-242 AUE_NULL UNIMPL linux_sched_getaffinity
+242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \
+ l_ulong *user_mask_ptr); }
243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); }
244 AUE_NULL UNIMPL linux_get_thread_area
245 AUE_NULL UNIMPL linux_io_setup
==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#6 (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/rpaulo-macbook/arm/include/endian.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
*
* @(#)endian.h 8.1 (Berkeley) 6/10/93
* $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $
*/
#ifndef _ENDIAN_H_
@@ -99,13 +99,15 @@
static __inline __uint16_t
__bswap16_var(__uint16_t v)
{
+ __uint32_t ret = v & 0xffff;
+
__asm __volatile(
"mov %0, %0, ror #8\n"
"orr %0, %0, %0, lsr #16\n"
"bic %0, %0, %0, lsl #16"
- : "+r" (v));
+ : "+r" (ret));
- return (v);
+ return ((__uint16_t)ret);
}
#ifdef __OPTIMIZE__
==== //depot/projects/soc2007/rpaulo-macbook/arm/sa11x0/uart_dev_sa1110.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.8 2007/04/02 22:00:21 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.9 2007/09/12 18:28:09 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@
static void
sa1110_putc(struct uart_bas *bas, int c)
{
- while (!uart_getreg(bas, SACOM_SR1) & SR1_TNF);
+ while (!(uart_getreg(bas, SACOM_SR1) & SR1_TNF));
uart_setreg(bas, SACOM_DR, c);
}
@@ -186,7 +186,7 @@
uart_setreg(&sc->sc_bas, SACOM_CR3, uart_getreg(&sc->sc_bas, SACOM_CR3)
| CR3_TIE);
for (i = 0; i < sc->sc_txdatasz; i++) {
- while (!uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF);
+ while (!(uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF));
uart_setreg(&sc->sc_bas, SACOM_DR, sc->sc_txbuf[i]);
uart_barrier(&sc->sc_bas);
==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/i80321.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.6 2006/07/25 01:08:41 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.7 2007/09/04 18:45:27 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -213,8 +213,6 @@
PCIM_CMD_SERRESPEN;
bus_space_write_4(sc->sc_st, sc->sc_atu_sh,
PCIR_COMMAND, preg);
- preg = bus_space_read_4(sc->sc_st, sc->sc_atu_sh,
- PCIR_COMMAND);
}
/* Initialize the bus space tags. */
i80321_io_bs_init(&sc->sc_pci_iot, sc);
==== //depot/projects/soc2007/rpaulo-macbook/boot/arm/at91/boot2/boot2.c#3 (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/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#6 (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);
- CP(*in, *out, f_syncwrites);
- CP(*in, *out, f_asyncwrites);
+ out->f_syncwrites = MIN(in->f_syncwrites, INT32_MAX);
+ out->f_asyncwrites = MIN(in->f_asyncwrites, INT32_MAX);
strlcpy(out->f_fstypename,
in->f_fstypename, MFSNAMELEN);
strlcpy(out->f_mntonname,
in->f_mntonname, min(MNAMELEN, FREEBSD4_MNAMELEN));
- CP(*in, *out, f_syncreads);
- CP(*in, *out, f_asyncreads);
+ out->f_syncreads = MIN(in->f_syncreads, INT32_MAX);
+ out->f_asyncreads = MIN(in->f_asyncreads, INT32_MAX);
strlcpy(out->f_mntfromname,
in->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN));
}
==== //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.213 2007/06/12 00:11:57 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.214 2007/08/28 12:26:35 kib Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -1713,3 +1713,24 @@
return (error);
}
+
+/*
+ * XXX: fake one.. waiting for real implementation of affinity mask.
+ */
+int
+linux_sched_getaffinity(struct thread *td,
+ struct linux_sched_getaffinity_args *args)
+{
+ int error;
+ cpumask_t i = ~0;
+
+ if (args->len < sizeof(cpumask_t))
+ return (EINVAL);
+
+ error = copyout(&i, args->user_mask_ptr, sizeof(cpumask_t));
+ if (error)
+ return (EFAULT);
+
+ td->td_retval[0] = sizeof(cpumask_t);
+ return (0);
+}
==== //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/proc.h#2 (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/compat/opensolaris/sys/proc.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
+ * $FreeBSD: src/sys/compat/opensolaris/sys/proc.h,v 1.2 2007/08/16 20:33:20 pjd Exp $
*/
#ifndef _OPENSOLARIS_SYS_PROC_H_
@@ -56,6 +56,12 @@
typedef struct thread *kthread_id_t;
typedef struct proc proc_t;
+#if (KSTACK_PAGES * PAGE_SIZE) < 16384
+#define ZFS_KSTACK_PAGES (16384 / PAGE_SIZE)
+#else
+#define ZFS_KSTACK_PAGES 0
+#endif
+
static __inline kthread_t *
thread_create(caddr_t stk, size_t stksize, void (*proc)(void *), void *arg,
size_t len, proc_t *pp, int state, pri_t pri)
@@ -71,7 +77,8 @@
ASSERT(len == 0);
ASSERT(state == TS_RUN);
- error = kthread_create(proc, arg, &p, 0, 0, "solthread %p", proc);
+ error = kthread_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES,
+ "solthread %p", proc);
return (error == 0 ? FIRST_THREAD_IN_PROC(p) : NULL);
}
==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#17 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1449 2007/08/13 17:19:27 emax Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1450 2007/09/12 07:43:42 ariff Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -2043,7 +2043,6 @@
device snd_ds1
device snd_emu10k1
device snd_emu10kx
-options SND_EMU10KX_MULTICHANNEL
device snd_envy24
device snd_envy24ht
device snd_es137x
==== //depot/projects/soc2007/rpaulo-macbook/conf/options#14 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.605 2007/08/06 14:25:59 rwatson Exp $
+# $FreeBSD: src/sys/conf/options,v 1.606 2007/09/12 07:43:42 ariff Exp $
#
# On the handling of kernel options
#
@@ -749,8 +749,5 @@
# XFS
XFS
-# snd_emu10kx sound driver options
-SND_EMU10KX_MULTICHANNEL opt_emu10kx.h
-
# Interrupt filtering
INTR_FILTER opt_global.h
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list