PERFORCE change 65334 for review
John Baldwin
jhb at FreeBSD.org
Wed Nov 17 07:51:26 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=65334
Change 65334 by jhb at jhb_slimer on 2004/11/17 15:50:43
IFC @65327.
Affected files ...
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#44 integrate
.. //depot/projects/smpng/sys/alpha/conf/NOTES#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#13 integrate
.. //depot/projects/smpng/sys/arm/arm/bcopy_page.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/bcopyinout.S#3 integrate
.. //depot/projects/smpng/sys/arm/arm/bcopyinout_xscale.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/blockio.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/bus_space_asm_generic.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/arm/copystr.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc.c#5 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm3.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm67.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/fiq_subr.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/fusu.S#4 integrate
.. //depot/projects/smpng/sys/arm/arm/genassym.c#3 integrate
.. //depot/projects/smpng/sys/arm/arm/in_cksum_arm.S#3 integrate
.. //depot/projects/smpng/sys/arm/arm/intr.c#4 integrate
.. //depot/projects/smpng/sys/arm/arm/irq_dispatch.S#3 integrate
.. //depot/projects/smpng/sys/arm/arm/locore.S#5 integrate
.. //depot/projects/smpng/sys/arm/arm/mem.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/nexus_io_asm.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap.c#9 integrate
.. //depot/projects/smpng/sys/arm/arm/setcpsr.S#2 integrate
.. //depot/projects/smpng/sys/arm/arm/support.S#6 integrate
.. //depot/projects/smpng/sys/arm/arm/swtch.S#4 integrate
.. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/conf/IQ31244#4 integrate
.. //depot/projects/smpng/sys/arm/conf/SIMICS#5 integrate
.. //depot/projects/smpng/sys/arm/include/asm.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/atomic.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/memdev.h#1 branch
.. //depot/projects/smpng/sys/arm/include/pmap.h#5 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/i80321.c#2 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/smpng/sys/boot/common/commands.c#6 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#31 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf.5#9 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#3 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/biossmap.c#3 integrate
.. //depot/projects/smpng/sys/coda/coda_vnops.c#16 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#40 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#15 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#35 integrate
.. //depot/projects/smpng/sys/conf/NOTES#85 integrate
.. //depot/projects/smpng/sys/conf/files#127 integrate
.. //depot/projects/smpng/sys/conf/files.i386#70 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#45 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#40 integrate
.. //depot/projects/smpng/sys/conf/options#89 integrate
.. //depot/projects/smpng/sys/conf/options.arm#3 integrate
.. //depot/projects/smpng/sys/conf/options.i386#43 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#43 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf.c#12 integrate
.. //depot/projects/smpng/sys/crypto/blowfish/arch/i386/bf_enc.S#2 integrate
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#1 branch
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_panasonic.c#1 branch
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#1 branch
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_toshiba.c#1 branch
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#29 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#26 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#16 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#7 integrate
.. //depot/projects/smpng/sys/dev/aha/aha_isa.c#10 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-card.c#22 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-dma.c#41 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#49 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#25 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#10 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.c#40 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.h#23 integrate
.. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#5 integrate
.. //depot/projects/smpng/sys/dev/esp/lsi64854.c#3 delete
.. //depot/projects/smpng/sys/dev/esp/lsi64854reg.h#2 delete
.. //depot/projects/smpng/sys/dev/esp/lsi64854var.h#3 delete
.. //depot/projects/smpng/sys/dev/fdc/fdc.c#14 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwmem.c#18 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#56 integrate
.. //depot/projects/smpng/sys/dev/gx/if_gx.c#17 delete
.. //depot/projects/smpng/sys/dev/gx/if_gxreg.h#2 delete
.. //depot/projects/smpng/sys/dev/gx/if_gxvar.h#6 delete
.. //depot/projects/smpng/sys/dev/lge/if_lge.c#24 integrate
.. //depot/projects/smpng/sys/dev/mc146818/mc146818reg.h#1 branch
.. //depot/projects/smpng/sys/dev/md/md.c#59 integrate
.. //depot/projects/smpng/sys/dev/mk48txx/mk48txx.c#4 integrate
.. //depot/projects/smpng/sys/dev/mk48txx/mk48txxreg.h#3 integrate
.. //depot/projects/smpng/sys/dev/mk48txx/mk48txxvar.h#1 branch
.. //depot/projects/smpng/sys/dev/nge/if_nge.c#36 integrate
.. //depot/projects/smpng/sys/dev/pbio/pbio.c#2 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#46 integrate
.. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#5 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#13 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/maestro_reg.h#2 integrate
.. //depot/projects/smpng/sys/dev/streams/streams.c#20 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus.h#6 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_core.c#6 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#7 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_subr.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci.c#32 integrate
.. //depot/projects/smpng/sys/dev/usb/uhci.c#35 integrate
.. //depot/projects/smpng/sys/dev/usb/uhub.c#21 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#43 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_port.h#22 integrate
.. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#1 branch
.. //depot/projects/smpng/sys/dev/vkbd/vkbd_var.h#1 branch
.. //depot/projects/smpng/sys/fs/autofs/autofs.h#3 delete
.. //depot/projects/smpng/sys/fs/autofs/autofs_util.c#3 delete
.. //depot/projects/smpng/sys/fs/autofs/autofs_vfsops.c#3 delete
.. //depot/projects/smpng/sys/fs/autofs/autofs_vnops.c#3 delete
.. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#9 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#16 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#35 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#15 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#17 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#29 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#24 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#23 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#35 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#27 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#24 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#17 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#14 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#17 integrate
.. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#15 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#25 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#21 integrate
.. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#19 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#19 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#22 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#19 integrate
.. //depot/projects/smpng/sys/geom/geom.h#41 integrate
.. //depot/projects/smpng/sys/geom/geom_event.c#30 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#12 integrate
.. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#7 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#6 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.c#6 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.c#4 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.h#2 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#9 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#8 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#6 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#38 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#26 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#9 delete
.. //depot/projects/smpng/sys/i386/acpica/acpi_panasonic.c#4 delete
.. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#7 delete
.. //depot/projects/smpng/sys/i386/conf/NOTES#92 integrate
.. //depot/projects/smpng/sys/i386/i386/autoconf.c#21 integrate
.. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#31 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#31 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#82 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#76 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#78 integrate
.. //depot/projects/smpng/sys/i386/i386/support.s#17 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#73 integrate
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#55 integrate
.. //depot/projects/smpng/sys/i386/include/atomic.h#21 integrate
.. //depot/projects/smpng/sys/i386/include/cpu.h#13 integrate
.. //depot/projects/smpng/sys/i386/include/endian.h#15 integrate
.. //depot/projects/smpng/sys/i386/include/sysarch.h#8 integrate
.. //depot/projects/smpng/sys/i386/isa/pbio.c#2 delete
.. //depot/projects/smpng/sys/ia64/conf/GENERIC.hints#7 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_bmap.c#6 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#33 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#50 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#71 integrate
.. //depot/projects/smpng/sys/kern/kern_environment.c#15 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#35 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#79 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#87 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#60 integrate
.. //depot/projects/smpng/sys/kern/kern_mac.c#39 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#53 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#100 integrate
.. //depot/projects/smpng/sys/kern/kern_subr.c#38 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#50 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#73 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#46 integrate
.. //depot/projects/smpng/sys/kern/subr_param.c#17 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#123 integrate
.. //depot/projects/smpng/sys/kern/sys_generic.c#36 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#48 integrate
.. //depot/projects/smpng/sys/kern/sys_socket.c#20 integrate
.. //depot/projects/smpng/sys/kern/sysv_msg.c#23 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#28 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#26 integrate
.. //depot/projects/smpng/sys/kern/tty.c#53 integrate
.. //depot/projects/smpng/sys/kern/uipc_cow.c#17 integrate
.. //depot/projects/smpng/sys/kern/uipc_domain.c#12 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#61 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#62 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#42 integrate
.. //depot/projects/smpng/sys/kern/vfs_cluster.c#35 integrate
.. //depot/projects/smpng/sys/kern/vfs_default.c#30 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#37 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#88 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#78 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#53 integrate
.. //depot/projects/smpng/sys/kern/vnode_if.src#19 integrate
.. //depot/projects/smpng/sys/libkern/arm/divsi3.S#3 integrate
.. //depot/projects/smpng/sys/libkern/arm/ffs.S#2 integrate
.. //depot/projects/smpng/sys/modules/Makefile#86 integrate
.. //depot/projects/smpng/sys/modules/acpi/Makefile#23 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_asus/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_panasonic/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_snc/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/acpi/acpi_sony/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/acpi/acpi_toshiba/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/autofs/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/esp/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/gx/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/vkbd/Makefile#1 branch
.. //depot/projects/smpng/sys/net/if_ppp.c#30 integrate
.. //depot/projects/smpng/sys/net/if_pppvar.h#7 integrate
.. //depot/projects/smpng/sys/net/if_sl.c#26 integrate
.. //depot/projects/smpng/sys/net/if_var.h#33 integrate
.. //depot/projects/smpng/sys/net/ppp_tty.c#15 integrate
.. //depot/projects/smpng/sys/net/raw_usrreq.c#18 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#41 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#21 integrate
.. //depot/projects/smpng/sys/netatm/atm_aal5.c#11 integrate
.. //depot/projects/smpng/sys/netatm/atm_usrreq.c#13 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_device.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socket.c#25 integrate
.. //depot/projects/smpng/sys/netinet/in.c#22 integrate
.. //depot/projects/smpng/sys/netinet/ip_divert.c#41 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#14 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#46 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#61 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#58 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#34 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#52 integrate
.. //depot/projects/smpng/sys/netinet6/ah_core.c#8 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#30 integrate
.. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#31 integrate
.. //depot/projects/smpng/sys/netipsec/keysock.c#8 integrate
.. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#16 integrate
.. //depot/projects/smpng/sys/netipx/spx_usrreq.c#15 integrate
.. //depot/projects/smpng/sys/netkey/key.c#27 integrate
.. //depot/projects/smpng/sys/netkey/key.h#5 integrate
.. //depot/projects/smpng/sys/netkey/keydb.h#5 integrate
.. //depot/projects/smpng/sys/netkey/keysock.c#21 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#21 integrate
.. //depot/projects/smpng/sys/netsmb/smb_dev.c#16 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#9 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#42 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#37 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptodev.c#15 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#50 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#32 integrate
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#73 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#40 integrate
.. //depot/projects/smpng/sys/pci/if_de.c#23 integrate
.. //depot/projects/smpng/sys/pci/if_sf.c#31 integrate
.. //depot/projects/smpng/sys/pci/if_sfreg.h#4 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#37 integrate
.. //depot/projects/smpng/sys/pci/if_skreg.h#9 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#51 integrate
.. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#1 branch
.. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#1 branch
.. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#1 branch
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#49 integrate
.. //depot/projects/smpng/sys/sparc64/conf/NOTES#11 integrate
.. //depot/projects/smpng/sys/sparc64/include/eeprom.h#4 integrate
.. //depot/projects/smpng/sys/sparc64/sbus/lsi64854.c#2 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom.c#5 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_ebus.c#7 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_sbus.c#7 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#43 integrate
.. //depot/projects/smpng/sys/sys/_types.h#11 integrate
.. //depot/projects/smpng/sys/sys/buf.h#32 integrate
.. //depot/projects/smpng/sys/sys/conf.h#36 integrate
.. //depot/projects/smpng/sys/sys/fdcio.h#5 integrate
.. //depot/projects/smpng/sys/sys/file.h#19 integrate
.. //depot/projects/smpng/sys/sys/filedesc.h#24 integrate
.. //depot/projects/smpng/sys/sys/kernel.h#27 integrate
.. //depot/projects/smpng/sys/sys/ktr.h#17 integrate
.. //depot/projects/smpng/sys/sys/mac.h#28 integrate
.. //depot/projects/smpng/sys/sys/mac_policy.h#27 integrate
.. //depot/projects/smpng/sys/sys/mdioctl.h#11 integrate
.. //depot/projects/smpng/sys/sys/msg.h#6 integrate
.. //depot/projects/smpng/sys/sys/pbioio.h#2 delete
.. //depot/projects/smpng/sys/sys/protosw.h#13 integrate
.. //depot/projects/smpng/sys/sys/resource.h#13 integrate
.. //depot/projects/smpng/sys/sys/rman.h#10 integrate
.. //depot/projects/smpng/sys/sys/sem.h#7 integrate
.. //depot/projects/smpng/sys/sys/sf_buf.h#5 integrate
.. //depot/projects/smpng/sys/sys/shm.h#6 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#51 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#62 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#13 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#42 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#52 integrate
.. //depot/projects/smpng/sys/vm/uma_core.c#50 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#61 integrate
.. //depot/projects/smpng/sys/vm/vm_object.h#26 integrate
.. //depot/projects/smpng/sys/vm/vm_pager.c#19 integrate
.. //depot/projects/smpng/sys/vm/vm_pager.h#11 integrate
.. //depot/projects/smpng/sys/vm/vm_param.h#6 integrate
.. //depot/projects/smpng/sys/vm/vm_zeroidle.c#24 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#44 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/conf/GENERIC#44 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.181 2004/11/09 22:23:34 wilko Exp $
machine alpha
cpu EV4
@@ -32,7 +32,6 @@
# Platforms supported
options API_UP1000 # UP1000, UP1100 (Nautilus)
-options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName
options DEC_EB164 # EB164, PC164, PC164LX, PC164SX
options DEC_EB64PLUS # EB64+, AlphaPC64, Aspen Alpine, etc
options DEC_2100_A50 # AlphaStation 200, 250, 255, 400
@@ -41,8 +40,6 @@
options DEC_ST550 # Personal Workstation 433, 500, 600
options DEC_ST6600 # XP1000, DP264, DS20, DS10, family
options DEC_1000A # AlphaServer 1000, 1000A, 800
-# TurboLaser support is broken
-# options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser)
options DEC_KN300 # AlphaServer 4100 (Rawhide),
# AlphaServer 1200 (Tincup)
==== //depot/projects/smpng/sys/alpha/conf/NOTES#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.155 2004/08/28 21:47:24 wilko Exp $
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
@@ -27,7 +27,6 @@
# PLATFORM OPTIONS
options API_UP1000 # UP1000, UP1100 (Nautilus)
-options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName
options DEC_EB164 # EB164, PC164, PC164LX, PC164SX
options DEC_EB64PLUS # EB64+, AlphaPC64, Aspen Alpine, etc
options DEC_2100_A50 # AlphaStation 200, 250, 255, 400
@@ -36,8 +35,6 @@
options DEC_ST550 # Personal Workstation 433, 500, 600
options DEC_ST6600 # XP1000, DP264, DS20, DS10, family
options DEC_1000A # AlphaServer 1000, 1000A, 800
-# TurboLaser support is broken
-# options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser)
options DEC_KN300 # AlphaServer 4100 (Rawhide),
# AlphaServer 1200 (Tincup)
==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#13 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.59 2004/11/05 18:24:01 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.60 2004/11/10 03:49:24 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,6 +52,8 @@
#define MAX_BPAGES 512
+struct bounce_zone;
+
struct bus_dma_tag {
bus_dma_tag_t parent;
bus_size_t alignment;
@@ -69,6 +71,7 @@
bus_dma_lock_t *lockfunc;
void *lockfuncarg;
bus_dma_segment_t *segments;
+ struct bounce_zone *bounce_zone;
};
struct bounce_page {
@@ -81,29 +84,32 @@
int busdma_swi_pending;
+struct bounce_zone {
+ STAILQ_ENTRY(bounce_zone) links;
+ STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
+ int free_bpages;
+ int reserved_bpages;
+ int active_bpages;
+ int total_bounced;
+ int total_deferred;
+ bus_size_t alignment;
+ bus_size_t boundary;
+ bus_addr_t lowaddr;
+ char zoneid[8];
+ char lowaddrid[20];
+ struct sysctl_ctx_list sysctl_tree;
+ struct sysctl_oid *sysctl_tree_top;
+};
+
static struct mtx bounce_lock;
-static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
-static int free_bpages;
-static int reserved_bpages;
-static int active_bpages;
static int total_bpages;
-static int total_bounced;
-static int total_deferred;
+static int busdma_zonecount;
+static STAILQ_HEAD(, bounce_zone) bounce_zone_list;
static bus_addr_t bounce_lowaddr = BUS_SPACE_MAXADDR;
SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
-SYSCTL_INT(_hw_busdma, OID_AUTO, free_bpages, CTLFLAG_RD, &free_bpages, 0,
- "Free bounce pages");
-SYSCTL_INT(_hw_busdma, OID_AUTO, reserved_bpages, CTLFLAG_RD, &reserved_bpages,
- 0, "Reserved bounce pages");
-SYSCTL_INT(_hw_busdma, OID_AUTO, active_bpages, CTLFLAG_RD, &active_bpages, 0,
- "Active bounce pages");
SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0,
"Total bounce pages");
-SYSCTL_INT(_hw_busdma, OID_AUTO, total_bounced, CTLFLAG_RD, &total_bounced, 0,
- "Total bounce requests");
-SYSCTL_INT(_hw_busdma, OID_AUTO, total_deferred, CTLFLAG_RD, &total_deferred, 0,
- "Total bounce requests that were deferred");
struct bus_dmamap {
struct bp_list bpages;
@@ -122,6 +128,7 @@
static struct bus_dmamap nobounce_dmamap;
static void init_bounce_pages(void *dummy);
+static struct bounce_zone * alloc_bounce_zone(bus_dma_tag_t dmat);
static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
int commit);
@@ -219,7 +226,8 @@
/* Return a NULL tag on failure */
*dmat = NULL;
- newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT);
+ newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF,
+ M_ZERO | M_NOWAIT);
if (newtag == NULL) {
CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag "
"flags 0x%x error %d", newtag, 0, error);
@@ -376,6 +384,7 @@
*/
if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)
|| dmat->alignment > 1 || dmat->boundary > 0) {
+
/* Must bounce */
int maxpages;
@@ -845,7 +854,7 @@
* want to add support for invalidating
* the caches on broken hardware
*/
- total_bounced++;
+ dmat->bounce_zone->total_bounced++;
CTR3(KTR_BUSDMA, "_bus_dmamap_sync: tag %p tag flags 0x%x "
"op 0x%x performing bounce", op, dmat, dmat->flags);
@@ -873,22 +882,111 @@
init_bounce_pages(void *dummy __unused)
{
- free_bpages = 0;
- reserved_bpages = 0;
- active_bpages = 0;
total_bpages = 0;
- STAILQ_INIT(&bounce_page_list);
+ STAILQ_INIT(&bounce_zone_list);
STAILQ_INIT(&bounce_map_waitinglist);
STAILQ_INIT(&bounce_map_callbacklist);
mtx_init(&bounce_lock, "bounce pages lock", NULL, MTX_DEF);
}
SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_ANY, init_bounce_pages, NULL);
+static struct sysctl_ctx_list *
+busdma_sysctl_tree(struct bounce_zone *bz)
+{
+ return (&bz->sysctl_tree);
+}
+
+static struct sysctl_oid *
+busdma_sysctl_tree_top(struct bounce_zone *bz)
+{
+ return (bz->sysctl_tree_top);
+}
+
+static struct bounce_zone *
+alloc_bounce_zone(bus_dma_tag_t dmat)
+{
+ struct bounce_zone *bz;
+
+ if ((bz = (struct bounce_zone *)malloc(sizeof(*bz), M_DEVBUF,
+ M_NOWAIT | M_ZERO)) == NULL)
+ return (NULL);
+
+ STAILQ_INIT(&bz->bounce_page_list);
+ bz->free_bpages = 0;
+ bz->reserved_bpages = 0;
+ bz->active_bpages = 0;
+ bz->lowaddr = dmat->lowaddr;
+ bz->alignment = dmat->alignment;
+ bz->boundary = dmat->boundary;
+ snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
+ busdma_zonecount++;
+ snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr);
+ STAILQ_INSERT_TAIL(&bounce_zone_list, bz, links);
+
+ sysctl_ctx_init(&bz->sysctl_tree);
+ bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
+ SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
+ CTLFLAG_RD, 0, "");
+ if (bz->sysctl_tree_top == NULL) {
+ sysctl_ctx_free(&bz->sysctl_tree);
+ return (bz);
+ }
+
+ SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+ SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+ "free_bpages", CTLFLAG_RD, &bz->free_bpages, 0,
+ "Free bounce pages");
+ SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+ SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+ "reserved_bpages", CTLFLAG_RD, &bz->reserved_bpages, 0,
+ "Reserved bounce pages");
+ SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+ SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+ "active_bpages", CTLFLAG_RD, &bz->active_bpages, 0,
+ "Active bounce pages");
+ SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+ SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+ "total_bounced", CTLFLAG_RD, &bz->total_bounced, 0,
+ "Total bounce requests");
+ SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+ SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+ "total_deferred", CTLFLAG_RD, &bz->total_deferred, 0,
+ "Total bounce requests that were deferred");
+ SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
+ SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+ "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
+ SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+ SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+ "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
+ SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+ SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+ "boundary", CTLFLAG_RD, &bz->boundary, 0, "");
+
+ return (bz);
+}
+
static int
alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
{
+ struct bounce_zone *bz;
int count;
+ bz = dmat->bounce_zone;
+ if (bz == NULL) {
+ STAILQ_FOREACH(bz, &bounce_zone_list, links) {
+ if ((dmat->alignment <= bz->alignment)
+ && (dmat->boundary <= bz->boundary)
+ && (dmat->lowaddr >= bz->lowaddr))
+ break;
+ }
+
+ if (bz == NULL) {
+ if ((bz = alloc_bounce_zone(dmat)) == NULL)
+ return (ENOMEM);
+ }
+ dmat->bounce_zone = bz;
+ }
+
count = 0;
while (numpages > 0) {
struct bounce_page *bpage;
@@ -900,18 +998,18 @@
break;
bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF,
M_NOWAIT, 0ul,
- dmat->lowaddr,
+ bz->lowaddr,
PAGE_SIZE,
- dmat->boundary);
+ bz->boundary);
if (bpage->vaddr == 0) {
free(bpage, M_DEVBUF);
break;
}
bpage->busaddr = pmap_kextract(bpage->vaddr);
mtx_lock(&bounce_lock);
- STAILQ_INSERT_TAIL(&bounce_page_list, bpage, links);
+ STAILQ_INSERT_TAIL(&bz->bounce_page_list, bpage, links);
total_bpages++;
- free_bpages++;
+ bz->free_bpages++;
mtx_unlock(&bounce_lock);
count++;
numpages--;
@@ -922,14 +1020,16 @@
static int
reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int commit)
{
+ struct bounce_zone *bz;
int pages;
mtx_assert(&bounce_lock, MA_OWNED);
- pages = MIN(free_bpages, map->pagesneeded - map->pagesreserved);
+ bz = dmat->bounce_zone;
+ pages = MIN(bz->free_bpages, map->pagesneeded - map->pagesreserved);
if (commit == 0 && map->pagesneeded > (map->pagesreserved + pages))
return (map->pagesneeded - (map->pagesreserved + pages));
- free_bpages -= pages;
- reserved_bpages += pages;
+ bz->free_bpages -= pages;
+ bz->reserved_bpages += pages;
map->pagesreserved += pages;
pages = map->pagesneeded - map->pagesreserved;
@@ -940,11 +1040,14 @@
add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr,
bus_size_t size)
{
+ struct bounce_zone *bz;
struct bounce_page *bpage;
+ KASSERT(dmat->bounce_zone != NULL, ("no bounce zone in dma tag"));
KASSERT(map != NULL && map != &nobounce_dmamap,
("add_bounce_page: bad map %p", map));
+ bz = dmat->bounce_zone;
if (map->pagesneeded == 0)
panic("add_bounce_page: map doesn't need any pages");
map->pagesneeded--;
@@ -954,13 +1057,13 @@
map->pagesreserved--;
mtx_lock(&bounce_lock);
- bpage = STAILQ_FIRST(&bounce_page_list);
+ bpage = STAILQ_FIRST(&bz->bounce_page_list);
if (bpage == NULL)
panic("add_bounce_page: free page list is empty");
- STAILQ_REMOVE_HEAD(&bounce_page_list, links);
- reserved_bpages--;
- active_bpages++;
+ STAILQ_REMOVE_HEAD(&bz->bounce_page_list, links);
+ bz->reserved_bpages--;
+ bz->active_bpages++;
mtx_unlock(&bounce_lock);
bpage->datavaddr = vaddr;
@@ -973,21 +1076,23 @@
free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage)
{
struct bus_dmamap *map;
+ struct bounce_zone *bz;
+ bz = dmat->bounce_zone;
bpage->datavaddr = 0;
bpage->datacount = 0;
mtx_lock(&bounce_lock);
- STAILQ_INSERT_HEAD(&bounce_page_list, bpage, links);
- free_bpages++;
- active_bpages--;
+ STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links);
+ bz->free_bpages++;
+ bz->active_bpages--;
if ((map = STAILQ_FIRST(&bounce_map_waitinglist)) != NULL) {
if (reserve_bounce_pages(map->dmat, map, 1) == 0) {
STAILQ_REMOVE_HEAD(&bounce_map_waitinglist, links);
STAILQ_INSERT_TAIL(&bounce_map_callbacklist,
map, links);
busdma_swi_pending = 1;
- total_deferred++;
+ bz->total_deferred++;
swi_sched(vm_ih, 0);
}
}
==== //depot/projects/smpng/sys/arm/arm/bcopy_page.S#2 (text+ko) ====
@@ -40,7 +40,7 @@
#include <machine/asm.h>
#include <machine/param.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/bcopy_page.S,v 1.1 2004/05/14 11:46:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopy_page.S,v 1.2 2004/11/09 16:47:47 cognet Exp $");
#ifndef __XSCALE__
/* #define BIG_LOOPS */
@@ -242,7 +242,7 @@
strd r4, [r1], #0x08
bgt 1b
ldmfd sp!, {r4, r5}
- mov pc, lr
+ RET
/*
* XSCALE version of bzero_page
@@ -269,5 +269,5 @@
strd r2, [r0], #8
subs r1, r1, #128
bne 1b
- mov pc, lr
+ RET
#endif /* __XSCALE__ */
==== //depot/projects/smpng/sys/arm/arm/bcopyinout.S#3 (text+ko) ====
@@ -40,7 +40,7 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.2 2004/09/23 21:56:36 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.3 2004/11/09 16:47:47 cognet Exp $");
#ifdef __XSCALE__
#include <arm/arm/bcopyinout_xscale.S>
#else
@@ -80,7 +80,7 @@
/* Quick exit if length is zero */
teq r2, #0
moveq r0, #0
- moveq pc, lr
+ RETEQ
SAVE_REGS
#ifdef MULTIPROCESSOR
@@ -280,14 +280,14 @@
str r5, [r4, #PCB_ONFAULT]
RESTORE_REGS
- mov pc, lr
+ RET
.Lcopyfault:
mov r0, #14 /* EFAULT */
str r5, [r4, #PCB_ONFAULT]
RESTORE_REGS
- mov pc, lr
+ RET
/*
* r0 = kernel space address
@@ -304,7 +304,7 @@
/* Quick exit if length is zero */
teq r2, #0
moveq r0, #0
- moveq pc, lr
+ RETeq
SAVE_REGS
#ifdef MULTIPROCESSOR
@@ -501,7 +501,7 @@
str r5, [r4, #PCB_ONFAULT]
RESTORE_REGS
- mov pc, lr
+ RET
/*
* r0 = kernel space source address
@@ -517,7 +517,7 @@
/* Quick exit if length is zero */
teq r2, #0
moveq r0, #0
- moveq pc, lr
+ RETeq
SAVE_REGS
#ifdef MULTIPROCESSOR
@@ -703,7 +703,7 @@
str r5, [r4, #PCB_ONFAULT]
RESTORE_REGS
- mov pc, lr
+ RET
#endif /* !__XSCALE__ */
/*
@@ -738,7 +738,7 @@
strb r3, [r1]
mov r0, #0 /* No fault */
1: str ip, [r2, #PCB_ONFAULT]
- mov pc, lr
+ RET
/*
* int badaddr_read_2(const uint16_t *src, uint16_t *dest)
@@ -772,7 +772,7 @@
strh r3, [r1]
mov r0, #0 /* No fault */
1: str ip, [r2, #PCB_ONFAULT]
- mov pc, lr
+ RET
/*
* int badaddr_read_4(const uint32_t *src, uint32_t *dest)
@@ -806,5 +806,5 @@
str r3, [r1]
mov r0, #0 /* No fault */
1: str ip, [r2, #PCB_ONFAULT]
- mov pc, lr
+ RET
==== //depot/projects/smpng/sys/arm/arm/bcopyinout_xscale.S#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout_xscale.S,v 1.1 2004/05/14 11:46:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout_xscale.S,v 1.2 2004/11/09 16:47:47 cognet Exp $");
.text
.align 0
@@ -111,7 +111,7 @@
ldrbt ip, [r0], #0x01
strb ip, [r1], #0x01
cmp r2, #0x00 /* All done? */
- moveq pc, lr
+ RETeq
/* Destination buffer is now word aligned */
.Lcopyin_wordaligned:
@@ -193,7 +193,7 @@
.Lcopyin_w_lessthan128:
adds r2, r2, #0x80 /* Adjust for extra sub */
ldmeqfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ RETeq
subs r2, r2, #0x20
blt .Lcopyin_w_lessthan32
@@ -218,7 +218,7 @@
.Lcopyin_w_lessthan32:
adds r2, r2, #0x20 /* Adjust for extra sub */
ldmeqfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
and r4, r2, #0x18
rsb r5, r4, #0x18
@@ -246,14 +246,14 @@
/* Less than 8 bytes remaining */
ldmfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
mov r3, #0x00
.Lcopyin_w_less_than8:
subs r2, r2, #0x04
ldrget ip, [r0], #0x04
strge ip, [r1], #0x04
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
addlt r2, r2, #0x04
ldrbt ip, [r0], #0x01
cmp r2, #0x02
@@ -262,7 +262,7 @@
ldrgtbt ip, [r0]
strgeb r2, [r1], #0x01
strgtb ip, [r1]
- mov pc, lr
+ RET
/*
* At this point, it has not been possible to word align both buffers.
@@ -317,7 +317,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
subs r2, r2, #0x04
sublt r0, r0, #0x03
blt .Lcopyin_l4
@@ -378,7 +378,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
subs r2, r2, #0x04
sublt r0, r0, #0x02
blt .Lcopyin_l4
@@ -439,7 +439,7 @@
adds r2, r2, #0x10
ldmeqfd sp!, {r4-r7}
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
subs r2, r2, #0x04
sublt r0, r0, #0x01
blt .Lcopyin_l4
@@ -465,7 +465,7 @@
ldmfd sp!, {r4-r7}
mov r3, #0x00
adds r2, r2, #0x04
- moveq pc, lr
+ RETeq
.Lcopyin_l4_2:
rsbs r2, r2, #0x03
addne pc, pc, r2, lsl #3
@@ -476,7 +476,7 @@
strb ip, [r1], #0x01
ldrbt ip, [r0]
strb ip, [r1]
- mov pc, lr
+ RET
/*
@@ -541,7 +541,7 @@
ldrb ip, [r0], #0x01
strbt ip, [r1], #0x01
cmp r2, #0x00 /* All done? */
- moveq pc, lr
+ RETeq
/* Destination buffer is now word aligned */
.Lcopyout_wordaligned:
@@ -639,7 +639,7 @@
.Lcopyout_w_lessthan128:
adds r2, r2, #0x80 /* Adjust for extra sub */
ldmeqfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
subs r2, r2, #0x20
blt .Lcopyout_w_lessthan32
@@ -668,7 +668,7 @@
.Lcopyout_w_lessthan32:
adds r2, r2, #0x20 /* Adjust for extra sub */
ldmeqfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
and r4, r2, #0x18
rsb r5, r4, #0x18
@@ -696,14 +696,14 @@
/* Less than 8 bytes remaining */
ldmfd sp!, {r4-r9}
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
mov r3, #0x00
.Lcopyout_w_less_than8:
subs r2, r2, #0x04
ldrge ip, [r0], #0x04
strget ip, [r1], #0x04
- moveq pc, lr /* Return now if done */
+ RETeq /* Return now if done */
addlt r2, r2, #0x04
ldrb ip, [r0], #0x01
cmp r2, #0x02
@@ -712,7 +712,7 @@
ldrgtb ip, [r0]
strgebt r2, [r1], #0x01
strgtbt ip, [r1]
- mov pc, lr
+ RET
/*
* At this point, it has not been possible to word align both buffers.
@@ -767,7 +767,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list