Date: Tue, 11 Jul 2006 14:33:15 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 101276 for review Message-ID: <200607111433.k6BEXFeJ047364@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101276 Change 101276 by rdivacky@rdivacky_witten on 2006/07/11 14:33:10 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/Makefile#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_pio.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/bsm/audit_record.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/syscalls.master#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.ia64#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/kern.mk#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/kmod.mk#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/asr/MAINTAINER#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/fdc/fdc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ic/nec765.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_pci.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_target.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/ispmbox.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/ispreg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/ispvar.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ispfw/asm_2322.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mfi/mfi.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/acphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/amphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/bmtphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/ciphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/exphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/inphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/lxtphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/mlphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/nsgphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/nsphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/pnaphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/qsphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/rgephy.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/rlphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/ruephy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/tdkphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/tlphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/ukphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/xmphy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/puc/puc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/puc/puc_pci.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/puc/pucdata.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/re/if_re.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sio/sio.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sk/if_sk.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/solo.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/if_aue.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/if_ural.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/uplcom.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/doc/Doxyfile#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/Makefile#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Dependencies#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-cam#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-crypto#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-dev_pci#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-dev_sound#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-dev_usb#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-geom#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-i4b#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-kern#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-libkern#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-linux#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-net80211#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-netgraph#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-netinet#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-netinet6#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-netipsec#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-opencrypto#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Doxyfile-vm#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/Makefile#3 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/README#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/PAE#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/XBOX#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/pmap.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#11 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#11 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#11 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#11 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia64/emulate.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/include/ieeefp.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/include/md_var.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/isa/isahint.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/bus_if.m#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/init_sysent.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_acl.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_descrip.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_environment.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_fork.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_linker.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_prot.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_thr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_thread.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/sched_4bsd.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/sched_core.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_bus.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_hints.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/sys_generic.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.master#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/sysv_sem.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_socket2.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_syscalls.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_mount.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/bktr/bktr_mem/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/netgraph/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/modules/streams/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/svr4/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/bpf.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_atmsubr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_bridge.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_clone.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_clone.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_disc.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_enc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_faith.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_gif.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_gre.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_loop.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_ppp.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_stf.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_tun.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_vlan.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/rtsock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/ng_tag.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/ng_tag.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/if_ether.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/in_pcb.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/in_rmx.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_carp.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_divert.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_fw2.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_ipsec.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_output.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/libalias/libalias.3#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_input.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/in6.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/in6_cksum.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/in6_pcb.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/in6_rmx.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/in6_var.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/ipsec.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pc98/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/agp_i810.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/if_rlreg.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/posix4/ksched.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/posix4/p1003_1b.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/posix4/posix4.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/security/audit/audit.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/security/audit/audit_arg.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/security/audit/audit_bsm.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sparc64/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/bus.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sockio.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscall.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscall.mk#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscallsubr.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sysproto.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/systm.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/thr.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_meter.c#3 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/Makefile#3 (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/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.560 2006/06/27 04:28:22 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); @@ -490,8 +490,7 @@ * (physical) address starting relative to 0] */ void -pmap_bootstrap(firstaddr) - vm_paddr_t *firstaddr; +pmap_bootstrap(vm_paddr_t *firstaddr) { vm_offset_t va; pt_entry_t *pte, *unused; @@ -1132,8 +1131,7 @@ } void -pmap_pinit0(pmap) - struct pmap *pmap; +pmap_pinit0(pmap_t pmap) { PMAP_LOCK_INIT(pmap); @@ -1148,8 +1146,7 @@ * such as one in a vmspace structure. */ void -pmap_pinit(pmap) - register struct pmap *pmap; +pmap_pinit(pmap_t pmap) { vm_page_t pml4pg; static vm_pindex_t color; @@ -1611,9 +1608,9 @@ vm_page_flag_clear(m, PG_WRITEABLE); m->md.pv_list_count--; pmap_unuse_pt(pmap, va, ptepde); + free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); - free_pv_entry(locked_pmap, pv); } } } @@ -1979,7 +1976,7 @@ void pmap_remove_all(vm_page_t m) { - register pv_entry_t pv; + pv_entry_t pv; pmap_t pmap; pt_entry_t *pte, tpte; pd_entry_t ptepde; @@ -2145,7 +2142,7 @@ { vm_paddr_t pa; pd_entry_t *pde; - register pt_entry_t *pte; + pt_entry_t *pte; vm_paddr_t opa; pt_entry_t origpte, newpte; vm_page_t mpte, om; @@ -2582,12 +2579,9 @@ * The mapping must already exist in the pmap. */ void -pmap_change_wiring(pmap, va, wired) - register pmap_t pmap; - vm_offset_t va; - boolean_t wired; +pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired) { - register pt_entry_t *pte; + pt_entry_t *pte; /* * Wiring is not a hardware characteristic so there is no need to @@ -2796,9 +2790,7 @@ * subset of pmaps for proper page aging. */ boolean_t -pmap_page_exists_quick(pmap, m) - pmap_t pmap; - vm_page_t m; +pmap_page_exists_quick(pmap_t pmap, vm_page_t m) { pv_entry_t pv; int loops = 0; @@ -2977,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) { - register pv_entry_t pv; + 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); } /* @@ -3030,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); } @@ -3052,45 +3033,33 @@ int pmap_ts_referenced(vm_page_t m) { - register pv_entry_t pv, pvf, pvn; + pv_entry_t pv, pvf, pvn; pmap_t pmap; pt_entry_t *pte; - pt_entry_t v; int rtval = 0; if (m->flags & PG_FICTITIOUS) return (rtval); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { - pvf = pv; - do { pvn = TAILQ_NEXT(pv, pv_list); - TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); - - if (pte && ((v = pte_load(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); } - return (rtval); } @@ -3100,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); + } } /* @@ -3111,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); + } } /* @@ -3125,9 +3126,7 @@ * NOT real memory. */ void * -pmap_mapdev(pa, size) - vm_paddr_t pa; - vm_size_t size; +pmap_mapdev(vm_paddr_t pa, vm_size_t size) { vm_offset_t va, tmpva, offset; @@ -3151,9 +3150,7 @@ } void -pmap_unmapdev(va, size) - vm_offset_t va; - vm_size_t size; +pmap_unmapdev(vm_offset_t va, vm_size_t size) { vm_offset_t base, offset, tmpva; @@ -3173,9 +3170,7 @@ * perform the pmap work for mincore */ int -pmap_mincore(pmap, addr) - pmap_t pmap; - vm_offset_t addr; +pmap_mincore(pmap_t pmap, vm_offset_t addr) { pt_entry_t *ptep, pte; vm_page_t m; ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/GENERIC#4 (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/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#7 (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.14 2006/06/26 18:37:35 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.17 2006/07/06 21:43:14 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#7 (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.14 2006/06/26 18:37:35 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.17 2006/07/06 21:43:14 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#7 (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.14 2006/06/26 18:37:35 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.17 2006/07/06 21:43:14 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp */ #include <bsm/audit_kevents.h> @@ -41,8 +41,8 @@ { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { SYF_MPSAFE | AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { SYF_MPSAFE | AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ @@ -72,9 +72,9 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ + { 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 */ @@ -137,7 +137,7 @@ { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ + { SYF_MPSAFE | AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -75,10 +75,10 @@ 19 AUE_LSEEK MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } 20 AUE_GETPID MSTD { int linux_getpid(void); } -21 AUE_MOUNT STD { int linux_mount(char *specialfile, \ +21 AUE_MOUNT MSTD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -22 AUE_UMOUNT STD { int linux_oldumount(char *path); } +22 AUE_UMOUNT MSTD { int linux_oldumount(char *path); } 23 AUE_SETUID MSTD { int linux_setuid16(l_uid16_t uid); } 24 AUE_GETUID MSTD { int linux_getuid16(void); } 25 AUE_SETTIMEOFDAY MSTD { int linux_stime(void); } @@ -111,9 +111,9 @@ 49 AUE_GETEUID MSTD { int linux_geteuid16(void); } 50 AUE_GETEGID MSTD { int linux_getegid16(void); } 51 AUE_ACCT MNOPROTO { int acct(char *path); } -52 AUE_UMOUNT STD { int linux_umount(char *path, l_int flags); } +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); } @@ -212,7 +212,7 @@ struct l_rusage *rusage); } 115 AUE_SWAPOFF MSTD { int linux_swapoff(void); } 116 AUE_NULL MSTD { int linux_sysinfo(struct l_sysinfo *info); } -117 AUE_NULL STD { int linux_ipc(l_uint what, l_int arg1, \ +117 AUE_NULL MSTD { int linux_ipc(l_uint what, l_int arg1, \ l_int arg2, l_int arg3, void *ptr, \ l_long arg5); } 118 AUE_FSYNC MNOPROTO { int fsync(int fd); } ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/pmap.c#3 (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) { @@ -3306,7 +3306,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); } @@ -3316,7 +3316,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; @@ -3347,10 +3347,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; @@ -3557,7 +3569,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); @@ -3578,7 +3590,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/soc2006/rdivacky_linuxolator/arm/at91/at91_pio.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.1 2006/03/24 07:39:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.2 2006/07/02 03:50:44 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,7 +38,9 @@ #include <sys/rman.h> #include <machine/bus.h> +#include <arm/at91/at91rm92reg.h> #include <arm/at91/at91_pioreg.h> +#include <arm/at91/at91_piovar.h> struct at91_pio_softc { @@ -103,7 +105,26 @@ static int at91_pio_probe(device_t dev) { - device_set_desc(dev, "PIO"); + const char *name; + + switch (device_get_unit(dev)) { + case 0: + name = "PIOA"; + break; + case 1: + name = "PIOB"; + break; + case 2: + name = "PIOC"; + break; + case 3: + name = "PIOD"; + break; + default: + name = "PIO"; + break; + } + device_set_desc(dev, name); return (0); } @@ -118,6 +139,9 @@ if (err) goto out; + device_printf(dev, "ABSR: %#x OSR: %#x PSR:%#x ODSR: %#x\n", + RD4(sc, PIO_ABSR), RD4(sc, PIO_OSR), RD4(sc, PIO_PSR), + RD4(sc, PIO_ODSR)); AT91_PIO_LOCK_INIT(sc); /* @@ -250,6 +274,69 @@ return (ENXIO); } +/* + * The following functions are called early in the boot process, so + * don't use bus_space, as that isn't yet available when we need to use + * them. + */ +void +at91_pio_use_periph_a(uint32_t pio, uint32_t periph_a_mask) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + PIO[PIO_ASR / 4] = periph_a_mask; + PIO[PIO_PDR / 4] = periph_a_mask; +} + +void +at91_pio_use_periph_b(uint32_t pio, uint32_t periph_b_mask) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + PIO[PIO_BSR / 4] = periph_b_mask; + PIO[PIO_PDR / 4] = periph_b_mask; +} + +void +at91_pio_use_gpio(uint32_t pio, uint32_t gpio_mask) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + PIO[PIO_PER / 4] = gpio_mask; +} + +void +at91_pio_gpio_input(uint32_t pio, uint32_t input_enable_mask) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + PIO[PIO_ODR / 4] = input_enable_mask; +} + +void +at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + PIO[PIO_OER / 4] = output_enable_mask; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607111433.k6BEXFeJ047364>