PERFORCE change 101595 for review
Warner Losh
imp at FreeBSD.org
Fri Jul 14 20:23:33 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=101595
Change 101595 by imp at imp_harmony on 2006/07/14 20:22:32
IFC @101584
Affected files ...
.. //depot/projects/arm/src/sys/Makefile#7 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/db_trace.c#7 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#7 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#6 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#10 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#18 integrate
.. //depot/projects/arm/src/sys/amd64/conf/GENERIC#14 integrate
.. //depot/projects/arm/src/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#10 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#10 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#10 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#10 integrate
.. //depot/projects/arm/src/sys/arm/arm/db_trace.c#3 integrate
.. //depot/projects/arm/src/sys/arm/arm/gdb_machdep.c#1 branch
.. //depot/projects/arm/src/sys/arm/arm/pmap.c#21 integrate
.. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#30 integrate
.. //depot/projects/arm/src/sys/arm/at91/std.at91#2 integrate
.. //depot/projects/arm/src/sys/arm/at91/std.kb920x#4 integrate
.. //depot/projects/arm/src/sys/arm/conf/KB920X#37 integrate
.. //depot/projects/arm/src/sys/arm/include/gdb_machdep.h#1 branch
.. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_timer.c#6 integrate
.. //depot/projects/arm/src/sys/bsm/audit_kevents.h#6 integrate
.. //depot/projects/arm/src/sys/bsm/audit_record.h#4 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_cd.c#5 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#10 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#12 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.c#7 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_ipc.c#5 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#9 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_ipc.c#4 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#5 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_proto.h#5 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_stream.c#4 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_syscall.h#5 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_syscallnames.c#5 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_sysent.c#5 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_util.h#3 integrate
.. //depot/projects/arm/src/sys/compat/svr4/syscalls.master#5 integrate
.. //depot/projects/arm/src/sys/conf/NOTES#26 integrate
.. //depot/projects/arm/src/sys/conf/files#36 integrate
.. //depot/projects/arm/src/sys/conf/files.arm#4 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src.diff#2 delete
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/Makefile#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate
.. //depot/projects/arm/src/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.c#5 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.c#5 integrate
.. //depot/projects/arm/src/sys/crypto/via/padlock.c#5 integrate
.. //depot/projects/arm/src/sys/ddb/db_command.c#5 integrate
.. //depot/projects/arm/src/sys/ddb/db_output.c#3 integrate
.. //depot/projects/arm/src/sys/ddb/db_output.h#2 integrate
.. //depot/projects/arm/src/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/arm/src/sys/ddb/db_thread.c#3 integrate
.. //depot/projects/arm/src/sys/ddb/ddb.h#5 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/arm/src/sys/dev/asr/MAINTAINER#2 delete
.. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#19 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#9 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#10 integrate
.. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc_isa.c#4 integrate
.. //depot/projects/arm/src/sys/dev/bce/if_bce.c#4 integrate
.. //depot/projects/arm/src/sys/dev/fdc/fdc.c#5 integrate
.. //depot/projects/arm/src/sys/dev/ic/nec765.h#2 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp.c#7 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#11 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#10 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#10 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#6 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_target.c#5 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispmbox.h#6 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispreg.h#4 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispvar.h#9 integrate
.. //depot/projects/arm/src/sys/dev/ispfw/asm_1040.h#2 integrate
.. //depot/projects/arm/src/sys/dev/ispfw/asm_1080.h#2 integrate
.. //depot/projects/arm/src/sys/dev/ispfw/asm_12160.h#2 integrate
.. //depot/projects/arm/src/sys/dev/ispfw/asm_2322.h#1 branch
.. //depot/projects/arm/src/sys/dev/ispfw/ispfw.c#3 integrate
.. //depot/projects/arm/src/sys/dev/mii/brgphy.c#8 integrate
.. //depot/projects/arm/src/sys/dev/mii/mii_physubr.c#4 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt.c#16 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt.h#16 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#19 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#10 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#14 integrate
.. //depot/projects/arm/src/sys/dev/ncv/ncr53c500_pccard.c#3 integrate
.. //depot/projects/arm/src/sys/dev/pccard/pccarddevs#5 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci.c#12 integrate
.. //depot/projects/arm/src/sys/dev/random/probe.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sk/if_sk.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/midi/sequencer.c#4 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/solo.c#5 integrate
.. //depot/projects/arm/src/sys/dev/stg/tmc18c30_subr.c#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_aue.c#4 integrate
.. //depot/projects/arm/src/sys/doc/Doxyfile#2 delete
.. //depot/projects/arm/src/sys/doc/Makefile#2 delete
.. //depot/projects/arm/src/sys/doc/subsys/Dependencies#2 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-cam#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-crypto#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-dev_pci#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-dev_sound#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-dev_usb#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-geom#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-i4b#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-kern#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-libkern#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-linux#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-net80211#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-netgraph#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-netinet#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-netinet6#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-netipsec#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-opencrypto#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-vm#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/Makefile#3 delete
.. //depot/projects/arm/src/sys/doc/subsys/README#2 delete
.. //depot/projects/arm/src/sys/doc/subsys/common-Doxyfile#2 delete
.. //depot/projects/arm/src/sys/doc/subsys/notreviewed.dox#2 delete
.. //depot/projects/arm/src/sys/fs/devfs/devfs_vfsops.c#3 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#7 integrate
.. //depot/projects/arm/src/sys/fs/portalfs/portal_vnops.c#3 integrate
.. //depot/projects/arm/src/sys/fs/unionfs/union_vnops.c#4 integrate
.. //depot/projects/arm/src/sys/geom/geom.h#5 integrate
.. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#14 integrate
.. //depot/projects/arm/src/sys/geom/mirror/g_mirror_ctl.c#7 integrate
.. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#17 integrate
.. //depot/projects/arm/src/sys/geom/raid3/g_raid3_ctl.c#7 integrate
.. //depot/projects/arm/src/sys/i386/conf/GENERIC#13 integrate
.. //depot/projects/arm/src/sys/i386/conf/PAE#6 integrate
.. //depot/projects/arm/src/sys/i386/i386/db_trace.c#6 integrate
.. //depot/projects/arm/src/sys/i386/i386/identcpu.c#14 integrate
.. //depot/projects/arm/src/sys/i386/i386/initcpu.c#4 integrate
.. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#6 integrate
.. //depot/projects/arm/src/sys/i386/i386/local_apic.c#9 integrate
.. //depot/projects/arm/src/sys/i386/i386/machdep.c#14 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_ipc.c#3 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_msg.c#3 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_other.c#2 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_poll.h#2 delete
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_proto.h#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_syscall.h#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysent.c#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_util.h#2 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix.h#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/imgact_coff.c#3 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.isc#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.master#4 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.xenix#4 integrate
.. //depot/projects/arm/src/sys/i386/include/i4b_ioctl.h#2 integrate
.. //depot/projects/arm/src/sys/i386/include/md_var.h#5 integrate
.. //depot/projects/arm/src/sys/i386/include/specialreg.h#5 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#11 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#11 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#11 integrate
.. //depot/projects/arm/src/sys/i386/linux/syscalls.master#11 integrate
.. //depot/projects/arm/src/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate
.. //depot/projects/arm/src/sys/ia64/conf/GENERIC#9 integrate
.. //depot/projects/arm/src/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/arm/src/sys/ia64/include/ieeefp.h#2 integrate
.. //depot/projects/arm/src/sys/isa/isahint.c#3 integrate
.. //depot/projects/arm/src/sys/kern/bus_if.m#4 integrate
.. //depot/projects/arm/src/sys/kern/init_sysent.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_acl.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_descrip.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_environment.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_intr.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_ktr.c#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_linker.c#7 integrate
.. //depot/projects/arm/src/sys/kern/kern_lock.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_prot.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_thr.c#7 integrate
.. //depot/projects/arm/src/sys/kern/subr_acl_posix1e.c#1 branch
.. //depot/projects/arm/src/sys/kern/subr_bus.c#13 integrate
.. //depot/projects/arm/src/sys/kern/subr_hints.c#4 integrate
.. //depot/projects/arm/src/sys/kern/subr_prf.c#5 integrate
.. //depot/projects/arm/src/sys/kern/subr_turnstile.c#7 integrate
.. //depot/projects/arm/src/sys/kern/sys_generic.c#5 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.c#11 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.master#14 integrate
.. //depot/projects/arm/src/sys/kern/sysv_sem.c#5 integrate
.. //depot/projects/arm/src/sys/kern/uipc_domain.c#4 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#15 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket2.c#12 integrate
.. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#12 integrate
.. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#13 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#20 integrate
.. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#15 integrate
.. //depot/projects/arm/src/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/arm/src/sys/modules/ispfw/isp_1000/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_1040/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_1040_it/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_1080/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_1080_it/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_12160/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_12160_it/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_2100/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_2200/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_2300/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/isp_2322/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ispfw/ispfw/Makefile#1 branch
.. //depot/projects/arm/src/sys/net/bpf.c#10 integrate
.. //depot/projects/arm/src/sys/net/if.c#13 integrate
.. //depot/projects/arm/src/sys/net/if_bridge.c#16 integrate
.. //depot/projects/arm/src/sys/net/if_clone.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_clone.h#3 integrate
.. //depot/projects/arm/src/sys/net/if_disc.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_enc.c#2 integrate
.. //depot/projects/arm/src/sys/net/if_faith.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_gif.c#7 integrate
.. //depot/projects/arm/src/sys/net/if_gre.c#7 integrate
.. //depot/projects/arm/src/sys/net/if_loop.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_ppp.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_stf.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_vlan.c#12 integrate
.. //depot/projects/arm/src/sys/net/rtsock.c#6 integrate
.. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate
.. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate
.. //depot/projects/arm/src/sys/netinet/in_rmx.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/ip_carp.c#7 integrate
.. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/libalias/libalias.3#3 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_rmx.c#3 integrate
.. //depot/projects/arm/src/sys/nfs4client/nfs4_vnops.c#6 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#11 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#10 integrate
.. //depot/projects/arm/src/sys/pc98/conf/GENERIC#8 integrate
.. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#8 integrate
.. //depot/projects/arm/src/sys/posix4/ksched.c#5 integrate
.. //depot/projects/arm/src/sys/posix4/p1003_1b.c#6 integrate
.. //depot/projects/arm/src/sys/posix4/posix4.h#2 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/db_trace.c#4 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_oea.c#6 integrate
.. //depot/projects/arm/src/sys/security/audit/audit.h#4 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_arg.c#4 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#5 integrate
.. //depot/projects/arm/src/sys/security/mac_biba/mac_biba.c#4 integrate
.. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#16 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/db_trace.c#4 integrate
.. //depot/projects/arm/src/sys/sys/bus.h#7 integrate
.. //depot/projects/arm/src/sys/sys/protosw.h#7 integrate
.. //depot/projects/arm/src/sys/sys/sockio.h#5 integrate
.. //depot/projects/arm/src/sys/sys/syscall.h#11 integrate
.. //depot/projects/arm/src/sys/sys/syscall.mk#11 integrate
.. //depot/projects/arm/src/sys/sys/syscallsubr.h#8 integrate
.. //depot/projects/arm/src/sys/sys/sysproto.h#12 integrate
.. //depot/projects/arm/src/sys/sys/systm.h#11 integrate
.. //depot/projects/arm/src/sys/sys/thr.h#4 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#15 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_lookup.c#4 integrate
.. //depot/projects/arm/src/sys/vm/vm_meter.c#5 integrate
Differences ...
==== //depot/projects/arm/src/sys/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.36 2006/05/29 19:29:41 maxim Exp $
+# $FreeBSD: src/sys/Makefile,v 1.37 2006/07/04 14:14:16 maxim Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@
.endif
# Directories to include in cscope name file and TAGS.
-CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \
+CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \
isofs kern libkern modules net net80211 netatalk netatm \
netgraph netinet netinet6 netipx netkey netnatm netncp \
netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \
==== //depot/projects/arm/src/sys/amd64/amd64/db_trace.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -390,16 +390,14 @@
long *argp;
db_expr_t offset;
c_db_sym_t sym;
- int narg, quit;
+ int narg;
boolean_t first;
if (count == -1)
count = 1024;
first = TRUE;
- quit = 0;
- db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
- while (count-- && !quit) {
+ while (count-- && !db_pager_quit) {
sym = db_search_symbol(pc, DB_STGY_ANY, &offset);
db_symbol_values(sym, &name, NULL);
==== //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 jkim Exp $");
#include "opt_cpu.h"
@@ -306,8 +306,8 @@
"\020"
"\001LAHF" /* LAHF/SAHF in long mode */
"\002CMP" /* CMP legacy */
- "\003<b2>"
- "\004<b3>"
+ "\003SVM" /* Secure Virtual Mode */
+ "\004ExtAPIC" /* Extended APIC register */
"\005CR8" /* CR8 in legacy mode */
"\006<b5>"
"\007<b6>"
==== //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#6 (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/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $
*/
/*
@@ -338,16 +338,14 @@
DB_SHOW_COMMAND(irqs, db_show_irqs)
{
struct intsrc **isrc;
- int i, quit, verbose;
+ int i, verbose;
- quit = 0;
if (strcmp(modif, "v") == 0)
verbose = 1;
else
verbose = 0;
isrc = interrupt_sources;
- db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
- for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++)
+ for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++)
if (*isrc != NULL)
db_dump_intr_event((*isrc)->is_event, verbose);
}
==== //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#10 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $");
#include "opt_hwpmc_hooks.h"
@@ -755,18 +755,16 @@
DB_SHOW_COMMAND(apic, db_show_apic)
{
struct intsrc *isrc;
- int quit, i, verbose;
+ int i, verbose;
u_int irq;
- quit = 0;
if (strcmp(modif, "vv") == 0)
verbose = 2;
else if (strcmp(modif, "v") == 0)
verbose = 1;
else
verbose = 0;
- db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
- for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) {
+ for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) {
irq = ioint_irqs[i];
if (irq != 0 && irq != IRQ_SYSCALL) {
db_printf("vec 0x%2x -> ", i + APIC_IO_INTS);
==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#18 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.563 2006/07/02 18:22:46 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.565 2006/07/06 06:17:08 alc Exp $");
/*
* Manages physical address maps.
@@ -207,7 +207,7 @@
static void free_pv_entry(pmap_t pmap, pv_entry_t pv);
static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try);
-static void pmap_clear_ptes(vm_page_t m, long bit);
+static void pmap_clear_write(vm_page_t m);
static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va,
vm_page_t m, vm_prot_t prot, vm_page_t mpte);
@@ -2969,47 +2969,36 @@
}
/*
- * Clear the given bit in each of the given page's ptes.
+ * Clear the write and modified bits in each of the given page's mappings.
*/
static __inline void
-pmap_clear_ptes(vm_page_t m, long bit)
+pmap_clear_write(vm_page_t m)
{
pv_entry_t pv;
pmap_t pmap;
- pt_entry_t pbits, *pte;
+ pt_entry_t oldpte, *pte;
- if ((m->flags & PG_FICTITIOUS) ||
- (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0))
+ if ((m->flags & PG_FICTITIOUS) != 0 ||
+ (m->flags & PG_WRITEABLE) == 0)
return;
-
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
- /*
- * Loop over all current mappings setting/clearing as appropos If
- * setting RO do we need to clear the VAC?
- */
TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
pmap = PV_PMAP(pv);
PMAP_LOCK(pmap);
pte = pmap_pte(pmap, pv->pv_va);
retry:
- pbits = *pte;
- if (pbits & bit) {
- if (bit == PG_RW) {
- if (!atomic_cmpset_long(pte, pbits,
- pbits & ~(PG_RW | PG_M)))
- goto retry;
- if (pbits & PG_M) {
- vm_page_dirty(m);
- }
- } else {
- atomic_clear_long(pte, bit);
- }
+ oldpte = *pte;
+ if (oldpte & PG_RW) {
+ if (!atomic_cmpset_long(pte, oldpte, oldpte &
+ ~(PG_RW | PG_M)))
+ goto retry;
+ if ((oldpte & PG_M) != 0)
+ vm_page_dirty(m);
pmap_invalidate_page(pmap, pv->pv_va);
}
PMAP_UNLOCK(pmap);
}
- if (bit == PG_RW)
- vm_page_flag_clear(m, PG_WRITEABLE);
+ vm_page_flag_clear(m, PG_WRITEABLE);
}
/*
@@ -3022,7 +3011,7 @@
{
if ((prot & VM_PROT_WRITE) == 0) {
if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) {
- pmap_clear_ptes(m, PG_RW);
+ pmap_clear_write(m);
} else {
pmap_remove_all(m);
}
@@ -3061,14 +3050,12 @@
pmap = PV_PMAP(pv);
PMAP_LOCK(pmap);
pte = pmap_pte(pmap, pv->pv_va);
- if (pte != NULL && (*pte & PG_A) != 0) {
+ if ((*pte & PG_A) != 0) {
atomic_clear_long(pte, PG_A);
pmap_invalidate_page(pmap, pv->pv_va);
rtval++;
- if (rtval > 4) {
- PMAP_UNLOCK(pmap);
- break;
- }
+ if (rtval > 4)
+ pvn = NULL;
}
PMAP_UNLOCK(pmap);
} while ((pv = pvn) != NULL && pv != pvf);
@@ -3082,7 +3069,23 @@
void
pmap_clear_modify(vm_page_t m)
{
- pmap_clear_ptes(m, PG_M);
+ pv_entry_t pv;
+ pmap_t pmap;
+ pt_entry_t *pte;
+
+ if ((m->flags & PG_FICTITIOUS) != 0)
+ return;
+ mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
+ pmap = PV_PMAP(pv);
+ PMAP_LOCK(pmap);
+ pte = pmap_pte(pmap, pv->pv_va);
+ if (*pte & PG_M) {
+ atomic_clear_long(pte, PG_M);
+ pmap_invalidate_page(pmap, pv->pv_va);
+ }
+ PMAP_UNLOCK(pmap);
+ }
}
/*
@@ -3093,7 +3096,23 @@
void
pmap_clear_reference(vm_page_t m)
{
- pmap_clear_ptes(m, PG_A);
+ pv_entry_t pv;
+ pmap_t pmap;
+ pt_entry_t *pte;
+
+ if ((m->flags & PG_FICTITIOUS) != 0)
+ return;
+ mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
+ pmap = PV_PMAP(pv);
+ PMAP_LOCK(pmap);
+ pte = pmap_pte(pmap, pv->pv_va);
+ if (*pte & PG_A) {
+ atomic_clear_long(pte, PG_A);
+ pmap_invalidate_page(pmap, pv->pv_va);
+ }
+ PMAP_UNLOCK(pmap);
+ }
}
/*
==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#14 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.464 2006/07/09 16:39:21 mjacob Exp $
cpu HAMMER
ident GENERIC
@@ -28,7 +28,6 @@
#options SCHED_ULE # ULE scheduler
options SCHED_4BSD # 4BSD scheduler
-#options SCHED_CORE # CORE scheduler
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
@@ -252,6 +251,7 @@
device md # Memory "disks"
device gif # IPv6 and IPv4 tunneling
device faith # IPv6-to-IPv4 relaying (translation)
+device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
==== //depot/projects/arm/src/sys/amd64/include/specialreg.h#4 (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.33 2006/05/01 22:07:00 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -109,16 +109,18 @@
#define CPUID_SS 0x08000000
#define CPUID_HTT 0x10000000
#define CPUID_TM 0x20000000
-#define CPUID_B30 0x40000000
+#define CPUID_IA64 0x40000000
#define CPUID_PBE 0x80000000
#define CPUID2_SSE3 0x00000001
#define CPUID2_MON 0x00000008
#define CPUID2_DS_CPL 0x00000010
+#define CPUID2_VMX 0x00000020
#define CPUID2_EST 0x00000080
#define CPUID2_TM2 0x00000100
#define CPUID2_CNTXID 0x00000400
#define CPUID2_CX16 0x00002000
+#define CPUID2_XTPR 0x00004000
/*
* Important bits in the AMD extended cpuid flags
@@ -135,6 +137,8 @@
#define AMDID2_LAHF 0x00000001
#define AMDID2_CMP 0x00000002
+#define AMDID2_SVM 0x00000004
+#define AMDID2_EXT_APIC 0x00000008
#define AMDID2_CR8 0x00000010
/*
@@ -188,6 +192,7 @@
#define MSR_THERM_CONTROL 0x19a
#define MSR_THERM_INTERRUPT 0x19b
#define MSR_THERM_STATUS 0x19c
+#define MSR_IA32_MISC_ENABLE 0x1a0
#define MSR_DEBUGCTLMSR 0x1d9
#define MSR_LASTBRANCHFROMIP 0x1db
#define MSR_LASTBRANCHTOIP 0x1dc
@@ -356,7 +361,7 @@
#define AMD_WT_ALLOC_PRE 0x20000 /* programmable range enable */
#define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */
-/* X86-64 MSR's */
+/* AMD64 MSR's */
#define MSR_EFER 0xc0000080 /* extended features */
#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target/cs/ss */
#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target rip */
==== //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#10 (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.16 2006/06/27 18:32:16 jhb Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.18 2006/07/11 20:55:22 jhb Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp
*/
#ifndef _LINUX_SYSPROTO_H_
==== //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#10 (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.16 2006/06/27 18:32:16 jhb Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.18 2006/07/11 20:55:22 jhb Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp
*/
#define LINUX_SYS_exit 1
==== //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#10 (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.16 2006/06/27 18:32:16 jhb Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.18 2006/07/11 20:55:22 jhb Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp
*/
#include <bsm/audit_kevents.h>
@@ -74,7 +74,7 @@
{ SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */
{ SYF_MPSAFE | AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */
- { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */
+ { SYF_MPSAFE | AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */
{ SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */
{ SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */
@@ -109,7 +109,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */
{ SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */
{ SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */
- { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */
+ { SYF_MPSAFE | AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */
{ SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */
{ SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */
{ SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */
@@ -161,7 +161,7 @@
{ SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */
{ SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */
{ SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */
- { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */
+ { SYF_MPSAFE | AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */
{ SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */
{ SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */
{ SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */
@@ -240,7 +240,7 @@
{ SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */
{ SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */
{ SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */
- { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */
+ { SYF_MPSAFE | AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */
{ SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */
==== //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#10 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -113,7 +113,7 @@
51 AUE_ACCT MNOPROTO { int acct(char *path); }
52 AUE_UMOUNT MSTD { int linux_umount(char *path, l_int flags); }
53 AUE_NULL UNIMPL lock
-54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \
+54 AUE_IOCTL MSTD { int linux_ioctl(l_uint fd, l_uint cmd, \
uintptr_t arg); }
55 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \
uintptr_t arg); }
@@ -169,7 +169,7 @@
87 AUE_SWAPON MNOPROTO { int swapon(char *name); }
88 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \
l_int magic2, l_uint cmd, void *arg); }
-89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \
+89 AUE_O_GETDENTS MSTD { int linux_readdir(l_uint fd, \
struct l_dirent *dent, l_uint count); }
90 AUE_MMAP MSTD { int linux_mmap(struct l_mmap_argv *ptr); }
91 AUE_MUNMAP MNOPROTO { int munmap(caddr_t addr, int len); }
@@ -246,7 +246,7 @@
140 AUE_LSEEK MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \
l_ulong olow, l_loff_t *res, \
l_uint whence); }
-141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \
+141 AUE_O_GETDENTS MSTD { int linux_getdents(l_uint fd, void *dent, \
l_uint count); }
142 AUE_SELECT MSTD { int linux_select(l_int nfds, \
l_fd_set *readfds, l_fd_set *writefds, \
@@ -381,7 +381,7 @@
l_size_t len, u_char *vec); }
219 AUE_MADVISE MNOPROTO { int madvise(void *addr, size_t len, \
int behav); }
-220 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, \
+220 AUE_O_GETDENTS MSTD { int linux_getdents64(l_uint fd, \
void *dirent, l_uint count); }
221 AUE_FCNTL MSTD { int linux_fcntl64(l_uint fd, l_uint cmd, \
uintptr_t arg); }
==== //depot/projects/arm/src/sys/arm/arm/db_trace.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.12 2005/09/10 03:01:24 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.13 2006/07/12 21:22:42 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,15 +93,13 @@
db_expr_t value;
db_expr_t offset;
boolean_t kernel_only = TRUE;
- int scp_offset, quit;
+ int scp_offset;
frame = (u_int32_t *)addr;
lastframe = NULL;
scp_offset = -(get_pc_str_offset() >> 2);
- quit = 0;
- db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
- while (count-- && frame != NULL && !quit) {
+ while (count-- && frame != NULL && !db_pager_quit) {
db_addr_t scp;
u_int32_t savecode;
int r;
==== //depot/projects/arm/src/sys/arm/arm/pmap.c#21 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.64 2006/06/15 01:01:05 ups Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.65 2006/07/11 11:22:06 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -199,7 +199,7 @@
static pv_entry_t pmap_get_pv_entry(void);
static void pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t,
- vm_prot_t, boolean_t);
+ vm_prot_t, boolean_t, int);
static void pmap_vac_me_harder(struct vm_page *, pmap_t,
vm_offset_t);
static void pmap_vac_me_kpmap(struct vm_page *, pmap_t,
@@ -373,7 +373,7 @@
* L2 allocation.
*/
#define pmap_alloc_l2_dtable() \
- (void*)uma_zalloc(l2table_zone, M_NOWAIT)
+ (void*)uma_zalloc(l2table_zone, M_NOWAIT|M_USE_RESERVE)
#define pmap_free_l2_dtable(l2) \
uma_zfree(l2table_zone, l2)
@@ -952,7 +952,7 @@
again_ptep:
PMAP_UNLOCK(pm);
vm_page_unlock_queues();
- ptep = (void*)uma_zalloc(l2zone, M_NOWAIT);
+ ptep = (void*)uma_zalloc(l2zone, M_NOWAIT|M_USE_RESERVE);
vm_page_lock_queues();
PMAP_LOCK(pm);
if (l2b->l2b_kva != 0) {
@@ -3312,7 +3312,7 @@
vm_page_lock_queues();
PMAP_LOCK(pmap);
- pmap_enter_locked(pmap, va, m, prot, wired);
+ pmap_enter_locked(pmap, va, m, prot, wired, M_WAITOK);
vm_page_unlock_queues();
PMAP_UNLOCK(pmap);
}
@@ -3322,7 +3322,7 @@
*/
static void
pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
- boolean_t wired)
+ boolean_t wired, int flags)
{
struct l2_bucket *l2b = NULL;
struct vm_page *opg;
@@ -3353,10 +3353,22 @@
l2b = pmap_get_l2_bucket(pmap, va);
if (l2b == NULL)
l2b = pmap_grow_l2_bucket(pmap, va);
- } else
+ } else {
+do_l2b_alloc:
l2b = pmap_alloc_l2_bucket(pmap, va);
- KASSERT(l2b != NULL,
- ("pmap_enter: failed to allocate l2 bucket"));
+ if (l2b == NULL) {
+ if (flags & M_WAITOK) {
+ PMAP_UNLOCK(pmap);
+ vm_page_unlock_queues();
+ VM_WAIT;
+ vm_page_lock_queues();
+ PMAP_LOCK(pmap);
+ goto do_l2b_alloc;
+ }
+ return;
+ }
+ }
+
ptep = &l2b->l2b_kva[l2pte_index(va)];
opte = *ptep;
@@ -3563,7 +3575,7 @@
PMAP_LOCK(pmap);
while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
pmap_enter_locked(pmap, start + ptoa(diff), m, prot &
- (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
+ (VM_PROT_READ | VM_PROT_EXECUTE), FALSE, M_NOWAIT);
m = TAILQ_NEXT(m, listq);
}
PMAP_UNLOCK(pmap);
@@ -3584,7 +3596,7 @@
PMAP_LOCK(pmap);
pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE),
- FALSE);
+ FALSE, M_NOWAIT);
PMAP_UNLOCK(pmap);
}
==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#30 (text+ko) ====
@@ -48,7 +48,7 @@
#include "opt_at91.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.8 2006/06/20 23:40:04 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.9 2006/07/12 00:48:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -159,6 +159,7 @@
VM_PROT_READ|VM_PROT_WRITE,
PTE_NOCACHE,
},
+#if 0
{
/*
* Add the ohci controller, and anything else that might be
@@ -170,6 +171,7 @@
VM_PROT_READ|VM_PROT_WRITE,
PTE_NOCACHE,
},
+#endif
{
0,
0,
==== //depot/projects/arm/src/sys/arm/at91/std.at91#2 (text) ====
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/arm/at91/std.at91,v 1.1 2006/02/17 22:33:13 imp Exp $
+# $FreeBSD: src/sys/arm/at91/std.at91,v 1.2 2006/07/14 15:20:31 imp Exp $
files "../at91/files.at91"
cpu CPU_ARM9
+makeoptions CONF_CFLAGS=-mcpu=arm9
==== //depot/projects/arm/src/sys/arm/at91/std.kb920x#4 (text+ko) ====
@@ -1,6 +1,10 @@
-#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.2 2006/02/17 22:33:13 imp Exp $
+#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.3 2006/07/14 15:20:31 imp Exp $
include "../at91/std.at91"
files "../at91/files.kb920x"
makeoptions KERNPHYSADDR=0x20000000
makeoptions KERNVIRTADDR=0xc0000000
+options KERNPHYSADDR=0x20000000
+options KERNVIRTADDR=0xc0000000
+options PHYSADDR=0x20000000
+options STARTUP_PAGETABLE_ADDR=0x20800000
==== //depot/projects/arm/src/sys/arm/conf/KB920X#37 (text+ko) ====
@@ -16,15 +16,11 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/KB920X,v 1.7 2006/06/17 23:34:59 imp Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.8 2006/07/14 15:20:31 imp Exp $
machine arm
ident KB920X
-options KERNPHYSADDR=0x20000000
-options KERNVIRTADDR=0xc0000000
-options PHYSADDR=0x20000000
-options STARTUP_PAGETABLE_ADDR=0x20800000
options AT91_KWIKBYTE
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list