Date: Tue, 6 Sep 2011 01:33:20 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r225407 - in projects/altix/sys: amd64/amd64 amd64/conf amd64/include amd64/linux32 arm/arm arm/at91 arm/conf arm/include arm/sa11x0 boot/forth boot/i386 boot/i386/boot2 boot/i386/zfsbo... Message-ID: <201109060133.p861XKnO062151@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Tue Sep 6 01:33:20 2011 New Revision: 225407 URL: http://svn.freebsd.org/changeset/base/225407 Log: Sync with head@225405 Added: projects/altix/sys/kern/sys_procdesc.c - copied unchanged from r225405, head/sys/kern/sys_procdesc.c projects/altix/sys/mips/nlm/bus_space_rmi_pci.c - copied unchanged from r225405, head/sys/mips/nlm/bus_space_rmi_pci.c projects/altix/sys/mips/nlm/hal/haldefs.h - copied unchanged from r225405, head/sys/mips/nlm/hal/haldefs.h projects/altix/sys/mips/nlm/hal/pcibus.h - copied unchanged from r225405, head/sys/mips/nlm/hal/pcibus.h projects/altix/sys/mips/nlm/hal/usb.h - copied unchanged from r225405, head/sys/mips/nlm/hal/usb.h projects/altix/sys/mips/nlm/intern_dev.c - copied unchanged from r225405, head/sys/mips/nlm/intern_dev.c projects/altix/sys/mips/nlm/uart_cpu_xlp.c - copied unchanged from r225405, head/sys/mips/nlm/uart_cpu_xlp.c projects/altix/sys/mips/nlm/uart_pci_xlp.c - copied unchanged from r225405, head/sys/mips/nlm/uart_pci_xlp.c projects/altix/sys/mips/nlm/usb_init.c - copied unchanged from r225405, head/sys/mips/nlm/usb_init.c projects/altix/sys/mips/nlm/xlp_pci.c - copied unchanged from r225405, head/sys/mips/nlm/xlp_pci.c projects/altix/sys/powerpc/ps3/ps3cdrom.c - copied unchanged from r225405, head/sys/powerpc/ps3/ps3cdrom.c projects/altix/sys/sys/procdesc.h - copied unchanged from r225405, head/sys/sys/procdesc.h Modified: projects/altix/sys/amd64/amd64/genassym.c projects/altix/sys/amd64/amd64/intr_machdep.c projects/altix/sys/amd64/amd64/machdep.c projects/altix/sys/amd64/amd64/minidump_machdep.c projects/altix/sys/amd64/amd64/pmap.c projects/altix/sys/amd64/amd64/support.S projects/altix/sys/amd64/conf/GENERIC projects/altix/sys/amd64/conf/NOTES projects/altix/sys/amd64/include/param.h projects/altix/sys/amd64/linux32/linux32_machdep.c projects/altix/sys/arm/arm/irq_dispatch.S projects/altix/sys/arm/arm/pmap.c projects/altix/sys/arm/at91/uart_dev_at91usart.c projects/altix/sys/arm/conf/AVILA projects/altix/sys/arm/conf/BWCT projects/altix/sys/arm/conf/CAMBRIA projects/altix/sys/arm/conf/CNS11XXNAS projects/altix/sys/arm/conf/CRB projects/altix/sys/arm/conf/DB-78XXX projects/altix/sys/arm/conf/DB-88F5XXX projects/altix/sys/arm/conf/DB-88F6XXX projects/altix/sys/arm/conf/DOCKSTAR projects/altix/sys/arm/conf/EP80219 projects/altix/sys/arm/conf/GUMSTIX projects/altix/sys/arm/conf/HL200 projects/altix/sys/arm/conf/HL201 projects/altix/sys/arm/conf/IQ31244 projects/altix/sys/arm/conf/KB920X projects/altix/sys/arm/conf/LN2410SBC projects/altix/sys/arm/conf/NSLU projects/altix/sys/arm/conf/QILA9G20 projects/altix/sys/arm/conf/SAM9G20EK projects/altix/sys/arm/conf/SHEEVAPLUG projects/altix/sys/arm/conf/SIMICS projects/altix/sys/arm/conf/TS7800 projects/altix/sys/arm/include/param.h projects/altix/sys/arm/sa11x0/sa11x0_irq.S projects/altix/sys/boot/forth/loader.conf projects/altix/sys/boot/forth/loader.conf.5 projects/altix/sys/boot/i386/Makefile.inc projects/altix/sys/boot/i386/boot2/Makefile projects/altix/sys/boot/i386/zfsboot/Makefile projects/altix/sys/cam/ata/ata_da.c projects/altix/sys/cam/cam_periph.c projects/altix/sys/cam/cam_xpt.c projects/altix/sys/cam/cam_xpt.h projects/altix/sys/cddl/compat/opensolaris/sys/file.h projects/altix/sys/cddl/contrib/opensolaris/common/acl/acl_common.c projects/altix/sys/cddl/contrib/opensolaris/common/acl/acl_common.h projects/altix/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/altix/sys/compat/freebsd32/freebsd32.h projects/altix/sys/compat/freebsd32/freebsd32_ioctl.c projects/altix/sys/compat/linprocfs/linprocfs.c projects/altix/sys/compat/linux/linux_file.c projects/altix/sys/compat/linux/linux_fork.c projects/altix/sys/compat/linux/linux_ioctl.c projects/altix/sys/compat/linux/linux_ipc.c projects/altix/sys/compat/linux/linux_socket.c projects/altix/sys/compat/linux/linux_stats.c projects/altix/sys/compat/svr4/svr4_fcntl.c projects/altix/sys/compat/svr4/svr4_filio.c projects/altix/sys/compat/svr4/svr4_ioctl.c projects/altix/sys/compat/svr4/svr4_misc.c projects/altix/sys/compat/svr4/svr4_stream.c projects/altix/sys/conf/NOTES projects/altix/sys/conf/files projects/altix/sys/conf/files.i386 projects/altix/sys/conf/files.powerpc projects/altix/sys/conf/kern.pre.mk projects/altix/sys/conf/newvers.sh projects/altix/sys/conf/options projects/altix/sys/conf/options.amd64 projects/altix/sys/contrib/pf/net/if_pfsync.c projects/altix/sys/contrib/pf/net/pf.c projects/altix/sys/ddb/db_break.c projects/altix/sys/dev/aac/aac_linux.c projects/altix/sys/dev/acpica/acpi_hpet.c projects/altix/sys/dev/acpica/acpi_hpet.h projects/altix/sys/dev/acpica/acpi_pcib_acpi.c projects/altix/sys/dev/adb/adb_kbd.c projects/altix/sys/dev/ahci/ahci.c projects/altix/sys/dev/ahci/ahci.h projects/altix/sys/dev/alc/if_alc.c projects/altix/sys/dev/amr/amr_linux.c projects/altix/sys/dev/arcmsr/arcmsr.c projects/altix/sys/dev/ata/ata-pci.c projects/altix/sys/dev/ata/ata-pci.h projects/altix/sys/dev/ata/chipsets/ata-acard.c projects/altix/sys/dev/ata/chipsets/ata-acerlabs.c projects/altix/sys/dev/ata/chipsets/ata-intel.c projects/altix/sys/dev/ata/chipsets/ata-nvidia.c projects/altix/sys/dev/ata/chipsets/ata-promise.c projects/altix/sys/dev/ath/ath_dfs/null/dfs_null.c projects/altix/sys/dev/ath/ath_hal/ah.c projects/altix/sys/dev/ath/ath_hal/ah.h projects/altix/sys/dev/ath/ath_hal/ah_desc.h projects/altix/sys/dev/ath/ath_hal/ah_eeprom.h projects/altix/sys/dev/ath/ath_hal/ah_eeprom_9287.c projects/altix/sys/dev/ath/ath_hal/ah_eeprom_v14.c projects/altix/sys/dev/ath/ath_hal/ah_eeprom_v14.h projects/altix/sys/dev/ath/ath_hal/ah_eeprom_v4k.c projects/altix/sys/dev/ath/ath_hal/ah_internal.h projects/altix/sys/dev/ath/ath_hal/ah_regdomain.c projects/altix/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h projects/altix/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h projects/altix/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/altix/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/altix/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/altix/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416reg.h projects/altix/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c projects/altix/sys/dev/ath/ath_hal/ar9002/ar9280.c projects/altix/sys/dev/ath/ath_hal/ar9002/ar9280.h projects/altix/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/altix/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c projects/altix/sys/dev/ath/if_ath.c projects/altix/sys/dev/ath/if_ath_sysctl.c projects/altix/sys/dev/ath/if_athdfs.h projects/altix/sys/dev/ath/if_athioctl.h projects/altix/sys/dev/ath/if_athvar.h projects/altix/sys/dev/atkbdc/atkbd.c projects/altix/sys/dev/cfe/cfe_console.c projects/altix/sys/dev/coretemp/coretemp.c projects/altix/sys/dev/dcons/dcons_os.c projects/altix/sys/dev/hptiop/hptiop.c projects/altix/sys/dev/hwpmc/hwpmc_logging.c projects/altix/sys/dev/ichwd/ichwd.c projects/altix/sys/dev/ipmi/ipmi_linux.c projects/altix/sys/dev/iscsi/initiator/iscsi.c projects/altix/sys/dev/isp/isp.c projects/altix/sys/dev/isp/isp_freebsd.c projects/altix/sys/dev/isp/isp_freebsd.h projects/altix/sys/dev/isp/isp_pci.c projects/altix/sys/dev/isp/ispvar.h projects/altix/sys/dev/ixgbe/ixgbe.c projects/altix/sys/dev/kbd/kbd.c projects/altix/sys/dev/kbdmux/kbdmux.c projects/altix/sys/dev/mfi/mfi_linux.c projects/altix/sys/dev/mii/brgphy.c projects/altix/sys/dev/mii/mii_physubr.c projects/altix/sys/dev/mmc/mmcsd.c projects/altix/sys/dev/mps/mps_sas.c projects/altix/sys/dev/mpt/mpilib/mpi_ioc.h projects/altix/sys/dev/mpt/mpt.c projects/altix/sys/dev/mpt/mpt.h projects/altix/sys/dev/mpt/mpt_cam.c projects/altix/sys/dev/mpt/mpt_debug.c projects/altix/sys/dev/mpt/mpt_pci.c projects/altix/sys/dev/mpt/mpt_raid.c projects/altix/sys/dev/mpt/mpt_raid.h projects/altix/sys/dev/mpt/mpt_user.c projects/altix/sys/dev/ofw/ofw_console.c projects/altix/sys/dev/pci/pci.c projects/altix/sys/dev/puc/pucdata.c projects/altix/sys/dev/re/if_re.c projects/altix/sys/dev/sio/sio.c projects/altix/sys/dev/smc/if_smc.c projects/altix/sys/dev/snp/snp.c projects/altix/sys/dev/sound/pci/hda/hdac.c projects/altix/sys/dev/streams/streams.c projects/altix/sys/dev/syscons/syscons.c projects/altix/sys/dev/syscons/syscons.h projects/altix/sys/dev/tdfx/tdfx_linux.c projects/altix/sys/dev/uart/uart_core.c projects/altix/sys/dev/uart/uart_kbd_sun.c projects/altix/sys/dev/usb/input/ukbd.c projects/altix/sys/dev/usb/input/ums.c projects/altix/sys/dev/usb/net/if_aue.c projects/altix/sys/dev/usb/net/if_axe.c projects/altix/sys/dev/usb/net/if_mos.c projects/altix/sys/dev/usb/net/if_rue.c projects/altix/sys/dev/usb/net/if_udav.c projects/altix/sys/dev/usb/net/uhso.c projects/altix/sys/dev/usb/quirk/usb_quirk.c projects/altix/sys/dev/usb/serial/u3g.c projects/altix/sys/dev/usb/storage/umass.c projects/altix/sys/dev/usb/usb_dev.c projects/altix/sys/dev/usb/usb_device.c projects/altix/sys/dev/usb/usb_device.h projects/altix/sys/dev/usb/usb_dynamic.c projects/altix/sys/dev/usb/usb_dynamic.h projects/altix/sys/dev/usb/usb_freebsd.h projects/altix/sys/dev/usb/usb_msctest.c projects/altix/sys/dev/usb/usb_msctest.h projects/altix/sys/dev/usb/usb_request.c projects/altix/sys/dev/usb/usbdevs projects/altix/sys/dev/usb/usbdi.h projects/altix/sys/dev/vkbd/vkbd.c projects/altix/sys/dev/xen/console/console.c projects/altix/sys/fs/cd9660/iso.h projects/altix/sys/fs/coda/coda_psdev.c projects/altix/sys/fs/devfs/devfs_devs.c projects/altix/sys/fs/devfs/devfs_vnops.c projects/altix/sys/fs/fdescfs/fdesc_vnops.c projects/altix/sys/fs/fifofs/fifo_vnops.c projects/altix/sys/fs/msdosfs/msdosfsmount.h projects/altix/sys/fs/nfs/nfs_commonport.c projects/altix/sys/fs/nfs/nfs_commonsubs.c projects/altix/sys/fs/nfsclient/nfs_clnode.c projects/altix/sys/fs/nfsclient/nfs_clport.c projects/altix/sys/fs/nfsclient/nfs_clvnops.c projects/altix/sys/fs/nfsclient/nfsnode.h projects/altix/sys/fs/nfsserver/nfs_nfsdport.c projects/altix/sys/fs/nfsserver/nfs_nfsdserv.c projects/altix/sys/fs/ntfs/ntfs.h projects/altix/sys/fs/portalfs/portal_vfsops.c projects/altix/sys/fs/portalfs/portal_vnops.c projects/altix/sys/fs/procfs/procfs.c projects/altix/sys/fs/smbfs/smbfs.h projects/altix/sys/geom/geom.h projects/altix/sys/gnu/fs/xfs/xfs_dfrag.c projects/altix/sys/i386/conf/GENERIC projects/altix/sys/i386/conf/XBOX projects/altix/sys/i386/conf/XEN projects/altix/sys/i386/i386/genassym.c projects/altix/sys/i386/i386/intr_machdep.c projects/altix/sys/i386/i386/machdep.c projects/altix/sys/i386/i386/pmap.c projects/altix/sys/i386/i386/support.s projects/altix/sys/i386/ibcs2/ibcs2_fcntl.c projects/altix/sys/i386/ibcs2/ibcs2_ioctl.c projects/altix/sys/i386/ibcs2/ibcs2_misc.c projects/altix/sys/i386/ibcs2/imgact_coff.c projects/altix/sys/i386/include/param.h projects/altix/sys/i386/linux/linux_machdep.c projects/altix/sys/i386/xen/mptable.c projects/altix/sys/i386/xen/pmap.c projects/altix/sys/ia64/conf/DEFAULTS projects/altix/sys/ia64/ia64/dump_machdep.c projects/altix/sys/ia64/ia64/locore.S projects/altix/sys/ia64/ia64/nexus.c projects/altix/sys/ia64/ia64/pmap.c projects/altix/sys/ia64/include/param.h projects/altix/sys/kern/capabilities.conf projects/altix/sys/kern/init_main.c projects/altix/sys/kern/init_sysent.c projects/altix/sys/kern/kern_clock.c projects/altix/sys/kern/kern_conf.c projects/altix/sys/kern/kern_descrip.c projects/altix/sys/kern/kern_event.c projects/altix/sys/kern/kern_exec.c projects/altix/sys/kern/kern_exit.c projects/altix/sys/kern/kern_fork.c projects/altix/sys/kern/kern_intr.c projects/altix/sys/kern/kern_jail.c projects/altix/sys/kern/kern_kthread.c projects/altix/sys/kern/kern_linker.c projects/altix/sys/kern/kern_lock.c projects/altix/sys/kern/kern_mib.c projects/altix/sys/kern/kern_proc.c projects/altix/sys/kern/kern_racct.c projects/altix/sys/kern/kern_rctl.c projects/altix/sys/kern/kern_resource.c projects/altix/sys/kern/kern_shutdown.c projects/altix/sys/kern/kern_sig.c projects/altix/sys/kern/kern_sysctl.c projects/altix/sys/kern/kern_timeout.c projects/altix/sys/kern/posix4_mib.c projects/altix/sys/kern/sched_4bsd.c projects/altix/sys/kern/sched_ule.c projects/altix/sys/kern/subr_kdb.c projects/altix/sys/kern/subr_pcpu.c projects/altix/sys/kern/subr_sbuf.c projects/altix/sys/kern/subr_smp.c projects/altix/sys/kern/sys_capability.c projects/altix/sys/kern/sys_generic.c projects/altix/sys/kern/sys_pipe.c projects/altix/sys/kern/sys_socket.c projects/altix/sys/kern/syscalls.c projects/altix/sys/kern/syscalls.master projects/altix/sys/kern/systrace_args.c projects/altix/sys/kern/tty.c projects/altix/sys/kern/tty_pts.c projects/altix/sys/kern/uipc_mqueue.c projects/altix/sys/kern/uipc_sem.c projects/altix/sys/kern/uipc_shm.c projects/altix/sys/kern/uipc_sockbuf.c projects/altix/sys/kern/uipc_socket.c projects/altix/sys/kern/uipc_syscalls.c projects/altix/sys/kern/uipc_usrreq.c projects/altix/sys/kern/vfs_acl.c projects/altix/sys/kern/vfs_aio.c projects/altix/sys/kern/vfs_extattr.c projects/altix/sys/kern/vfs_lookup.c projects/altix/sys/kern/vfs_mount.c projects/altix/sys/kern/vfs_subr.c projects/altix/sys/kern/vfs_syscalls.c projects/altix/sys/kern/vfs_vnops.c projects/altix/sys/mips/cavium/asm_octeon.S projects/altix/sys/mips/cavium/octeon_mp.c projects/altix/sys/mips/conf/XLP projects/altix/sys/mips/conf/XLP64 projects/altix/sys/mips/conf/XLPN32 projects/altix/sys/mips/include/param.h projects/altix/sys/mips/mips/cache.c projects/altix/sys/mips/mips/dump_machdep.c projects/altix/sys/mips/mips/exception.S projects/altix/sys/mips/mips/pmap.c projects/altix/sys/mips/nlm/board.c projects/altix/sys/mips/nlm/board.h projects/altix/sys/mips/nlm/bus_space_rmi.c projects/altix/sys/mips/nlm/clock.h projects/altix/sys/mips/nlm/cms.c projects/altix/sys/mips/nlm/files.xlp projects/altix/sys/mips/nlm/hal/bridge.h projects/altix/sys/mips/nlm/hal/cop2.h projects/altix/sys/mips/nlm/hal/cpucontrol.h projects/altix/sys/mips/nlm/hal/fmn.c projects/altix/sys/mips/nlm/hal/fmn.h projects/altix/sys/mips/nlm/hal/iomap.h projects/altix/sys/mips/nlm/hal/mips-extns.h projects/altix/sys/mips/nlm/hal/mmu.h projects/altix/sys/mips/nlm/hal/pic.h projects/altix/sys/mips/nlm/hal/sys.h projects/altix/sys/mips/nlm/hal/uart.h projects/altix/sys/mips/nlm/interrupt.h projects/altix/sys/mips/nlm/intr_machdep.c projects/altix/sys/mips/nlm/mpreset.S projects/altix/sys/mips/nlm/msgring.h projects/altix/sys/mips/nlm/uart_bus_xlp_iodi.c projects/altix/sys/mips/nlm/xlp.h projects/altix/sys/mips/nlm/xlp_machdep.c projects/altix/sys/modules/dcons/Makefile projects/altix/sys/modules/portalfs/Makefile projects/altix/sys/modules/sio/Makefile projects/altix/sys/net/bpf.c projects/altix/sys/net/if_bridge.c projects/altix/sys/net/if_ethersubr.c projects/altix/sys/net/if_lagg.c projects/altix/sys/net/if_tap.c projects/altix/sys/net/if_tun.c projects/altix/sys/net/if_var.h projects/altix/sys/net/radix.h projects/altix/sys/net/radix_mpath.c projects/altix/sys/net/route.c projects/altix/sys/net80211/ieee80211_ht.c projects/altix/sys/net80211/ieee80211_output.c projects/altix/sys/net80211/ieee80211_proto.c projects/altix/sys/net80211/ieee80211_scan_sta.c projects/altix/sys/netgraph/ng_ether.c projects/altix/sys/netgraph/ng_mppc.c projects/altix/sys/netgraph/ng_parse.c projects/altix/sys/netgraph/ng_socket.c projects/altix/sys/netinet/in.c projects/altix/sys/netinet/in_pcb.h projects/altix/sys/netinet/ip_divert.c projects/altix/sys/netinet/ip_fw.h projects/altix/sys/netinet/ipfw/ip_fw2.c projects/altix/sys/netinet/ipfw/ip_fw_log.c projects/altix/sys/netinet/ipfw/ip_fw_pfil.c projects/altix/sys/netinet/ipfw/ip_fw_private.h projects/altix/sys/netinet/ipfw/ip_fw_sockopt.c projects/altix/sys/netinet/sctp.h projects/altix/sys/netinet/sctp_asconf.c projects/altix/sys/netinet/sctp_cc_functions.c projects/altix/sys/netinet/sctp_constants.h projects/altix/sys/netinet/sctp_header.h projects/altix/sys/netinet/sctp_indata.c projects/altix/sys/netinet/sctp_input.c projects/altix/sys/netinet/sctp_output.c projects/altix/sys/netinet/sctp_output.h projects/altix/sys/netinet/sctp_pcb.c projects/altix/sys/netinet/sctp_pcb.h projects/altix/sys/netinet/sctp_structs.h projects/altix/sys/netinet/sctp_sysctl.c projects/altix/sys/netinet/sctp_sysctl.h projects/altix/sys/netinet/sctp_timer.c projects/altix/sys/netinet/sctp_timer.h projects/altix/sys/netinet/sctp_uio.h projects/altix/sys/netinet/sctp_usrreq.c projects/altix/sys/netinet/sctp_var.h projects/altix/sys/netinet/sctputil.c projects/altix/sys/netinet/tcp_input.c projects/altix/sys/netinet/tcp_output.c projects/altix/sys/netinet/tcp_syncache.h projects/altix/sys/netinet/tcp_var.h projects/altix/sys/netinet/udp_usrreq.c projects/altix/sys/netinet6/in6.c projects/altix/sys/netinet6/in6.h projects/altix/sys/netinet6/ip6_forward.c projects/altix/sys/netinet6/ip6_input.c projects/altix/sys/netinet6/ip6_output.c projects/altix/sys/netinet6/mld6.c projects/altix/sys/netinet6/sctp6_usrreq.c projects/altix/sys/netinet6/udp6_usrreq.c projects/altix/sys/nfsclient/nfs_bio.c projects/altix/sys/nfsclient/nfs_node.c projects/altix/sys/nfsclient/nfs_vfsops.c projects/altix/sys/nfsclient/nfs_vnops.c projects/altix/sys/nfsclient/nfsnode.h projects/altix/sys/nfsserver/nfs_serv.c projects/altix/sys/nfsserver/nfs_srvkrpc.c projects/altix/sys/ofed/include/linux/linux_compat.c projects/altix/sys/opencrypto/cryptodev.c projects/altix/sys/pc98/cbus/pckbd.c projects/altix/sys/pc98/cbus/sio.c projects/altix/sys/pc98/conf/GENERIC projects/altix/sys/pc98/pc98/machdep.c projects/altix/sys/pci/if_rlreg.h projects/altix/sys/powerpc/aim/locore32.S projects/altix/sys/powerpc/aim/locore64.S projects/altix/sys/powerpc/aim/mmu_oea.c projects/altix/sys/powerpc/aim/mmu_oea64.c projects/altix/sys/powerpc/booke/locore.S projects/altix/sys/powerpc/booke/platform_bare.c projects/altix/sys/powerpc/booke/pmap.c projects/altix/sys/powerpc/conf/MPC85XX projects/altix/sys/powerpc/include/param.h projects/altix/sys/powerpc/include/pmap.h projects/altix/sys/powerpc/mambo/mambo_console.c projects/altix/sys/powerpc/mpc85xx/atpic.c projects/altix/sys/powerpc/powermac/fcu.c projects/altix/sys/rpc/clnt_dg.c projects/altix/sys/security/audit/audit.h projects/altix/sys/security/audit/audit_arg.c projects/altix/sys/security/audit/audit_bsm.c projects/altix/sys/security/audit/audit_pipe.c projects/altix/sys/security/audit/audit_private.h projects/altix/sys/security/mac/mac_framework.h projects/altix/sys/security/mac/mac_policy.h projects/altix/sys/security/mac/mac_posix_sem.c projects/altix/sys/security/mac/mac_posix_shm.c projects/altix/sys/security/mac/mac_syscalls.c projects/altix/sys/security/mac_biba/mac_biba.c projects/altix/sys/security/mac_mls/mac_mls.c projects/altix/sys/security/mac_stub/mac_stub.c projects/altix/sys/security/mac_test/mac_test.c projects/altix/sys/sparc64/conf/GENERIC projects/altix/sys/sparc64/include/param.h projects/altix/sys/sparc64/sbus/sbus.c projects/altix/sys/sparc64/sparc64/dump_machdep.c projects/altix/sys/sparc64/sparc64/exception.S projects/altix/sys/sparc64/sparc64/intr_machdep.c projects/altix/sys/sparc64/sparc64/mp_machdep.c projects/altix/sys/sparc64/sparc64/pmap.c projects/altix/sys/sparc64/sparc64/tsb.c projects/altix/sys/sys/bus.h projects/altix/sys/sys/capability.h projects/altix/sys/sys/file.h projects/altix/sys/sys/filedesc.h projects/altix/sys/sys/interrupt.h projects/altix/sys/sys/kbio.h projects/altix/sys/sys/kdb.h projects/altix/sys/sys/mount.h projects/altix/sys/sys/namei.h projects/altix/sys/sys/param.h projects/altix/sys/sys/pcpu.h projects/altix/sys/sys/proc.h projects/altix/sys/sys/resourcevar.h projects/altix/sys/sys/selinfo.h projects/altix/sys/sys/sockbuf.h projects/altix/sys/sys/syscall.h projects/altix/sys/sys/syscall.mk projects/altix/sys/sys/sysctl.h projects/altix/sys/sys/sysproto.h projects/altix/sys/sys/systm.h projects/altix/sys/sys/unistd.h projects/altix/sys/sys/user.h projects/altix/sys/sys/vnode.h projects/altix/sys/ufs/ffs/ffs_alloc.c projects/altix/sys/ufs/ffs/ffs_extern.h projects/altix/sys/ufs/ffs/ffs_inode.c projects/altix/sys/ufs/ffs/ffs_softdep.c projects/altix/sys/ufs/ffs/ffs_vfsops.c projects/altix/sys/ufs/ffs/ffs_vnops.c projects/altix/sys/ufs/ufs/inode.h projects/altix/sys/ufs/ufs/ufs_extattr.c projects/altix/sys/vm/device_pager.c projects/altix/sys/vm/swap_pager.c projects/altix/sys/vm/swap_pager.h projects/altix/sys/vm/vm_contig.c projects/altix/sys/vm/vm_kern.c projects/altix/sys/vm/vm_mmap.c projects/altix/sys/vm/vm_object.c projects/altix/sys/vm/vm_page.c projects/altix/sys/vm/vm_page.h projects/altix/sys/x86/acpica/acpi_apm.c projects/altix/sys/x86/x86/tsc.c Directory Properties: projects/altix/lib/libstand/ (props changed) projects/altix/sys/ (props changed) projects/altix/sys/amd64/include/xen/ (props changed) projects/altix/sys/boot/ (props changed) projects/altix/sys/boot/i386/efi/ (props changed) projects/altix/sys/boot/ia64/efi/ (props changed) projects/altix/sys/boot/ia64/ski/ (props changed) projects/altix/sys/boot/powerpc/boot1.chrp/ (props changed) projects/altix/sys/boot/powerpc/ofw/ (props changed) projects/altix/sys/cddl/contrib/opensolaris/ (props changed) projects/altix/sys/conf/ (props changed) projects/altix/sys/contrib/dev/acpica/ (props changed) projects/altix/sys/contrib/octeon-sdk/ (props changed) projects/altix/sys/contrib/pf/ (props changed) projects/altix/sys/contrib/x86emu/ (props changed) projects/altix/sys/kern/subr_busdma.c (props changed) Modified: projects/altix/sys/amd64/amd64/genassym.c ============================================================================== --- projects/altix/sys/amd64/amd64/genassym.c Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/amd64/genassym.c Tue Sep 6 01:33:20 2011 (r225407) @@ -201,7 +201,6 @@ ASSYM(UC_EFLAGS, offsetof(ucontext_t, uc ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); -ASSYM(MAXCPU, MAXCPU); ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); Modified: projects/altix/sys/amd64/amd64/intr_machdep.c ============================================================================== --- projects/altix/sys/amd64/amd64/intr_machdep.c Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/amd64/intr_machdep.c Tue Sep 6 01:33:20 2011 (r225407) @@ -80,6 +80,11 @@ static STAILQ_HEAD(, pic) pics; static int assign_cpu; #endif +u_long intrcnt[INTRCNT_COUNT]; +char intrnames[INTRCNT_COUNT * (MAXCOMLEN + 1)]; +size_t sintrcnt = sizeof(intrcnt); +size_t sintrnames = sizeof(intrnames); + static int intr_assign_cpu(void *arg, u_char cpu); static void intr_disable_src(void *arg); static void intr_init(void *__dummy); Modified: projects/altix/sys/amd64/amd64/machdep.c ============================================================================== --- projects/altix/sys/amd64/amd64/machdep.c Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/amd64/machdep.c Tue Sep 6 01:33:20 2011 (r225407) @@ -1309,7 +1309,7 @@ getmemsize(caddr_t kmdp, u_int64_t first { int i, physmap_idx, pa_indx, da_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; - u_long physmem_tunable; + u_long physmem_tunable, memtest; pt_entry_t *pte; struct bios_smap *smapbase, *smap, *smapend; u_int32_t smapsize; @@ -1372,6 +1372,13 @@ getmemsize(caddr_t kmdp, u_int64_t first Maxmem = atop(physmem_tunable); /* + * By default keep the memtest enabled. Use a general name so that + * one could eventually do more with the code than just disable it. + */ + memtest = 1; + TUNABLE_ULONG_FETCH("hw.memtest.tests", &memtest); + + /* * Don't allow MAXMEM or hw.physmem to extend the amount of memory * in the system. */ @@ -1433,6 +1440,8 @@ getmemsize(caddr_t kmdp, u_int64_t first goto do_dump_avail; page_bad = FALSE; + if (memtest == 0) + goto skip_memtest; /* * map page into kernel: valid, read/write,non-cacheable @@ -1470,6 +1479,7 @@ getmemsize(caddr_t kmdp, u_int64_t first */ *(int *)ptr = tmp; +skip_memtest: /* * Adjust array of valid/good pages. */ Modified: projects/altix/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- projects/altix/sys/amd64/amd64/minidump_machdep.c Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/amd64/minidump_machdep.c Tue Sep 6 01:33:20 2011 (r225407) @@ -27,6 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_pmap.h" #include "opt_watchdog.h" #include <sys/param.h> Modified: projects/altix/sys/amd64/amd64/pmap.c ============================================================================== --- projects/altix/sys/amd64/amd64/pmap.c Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/amd64/pmap.c Tue Sep 6 01:33:20 2011 (r225407) @@ -2320,7 +2320,7 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offse va_last = va + NBPDR - PAGE_SIZE; do { m++; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_pv_demote_pde: page %p is not managed", m)); va += PAGE_SIZE; pmap_insert_entry(pmap, va, m); @@ -2847,7 +2847,7 @@ pmap_remove_all(vm_page_t m) vm_offset_t va; vm_page_t free; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_remove_all: page %p is not managed", m)); free = NULL; vm_page_lock_queues(); @@ -3194,8 +3194,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va)); - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0 || - (m->oflags & VPO_BUSY) != 0, + KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0 || + VM_OBJECT_LOCKED(m->object), ("pmap_enter: page %p is not busy", m)); mpte = NULL; @@ -3276,7 +3276,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, /* * Enter on the PV list if part of our managed memory. */ - if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + if ((m->oflags & VPO_UNMANAGED) == 0) { KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva, ("pmap_enter: managed mapping within the clean submap")); if (pv == NULL) @@ -3389,7 +3389,7 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t } newpde = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 1) | PG_PS | PG_V; - if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + if ((m->oflags & VPO_UNMANAGED) == 0) { newpde |= PG_MANAGED; /* @@ -3498,7 +3498,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ vm_paddr_t pa; KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || - (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, + (m->oflags & VPO_UNMANAGED) != 0, ("pmap_enter_quick_locked: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -3556,7 +3556,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ /* * Enter on the PV list if part of our managed memory. */ - if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0 && + if ((m->oflags & VPO_UNMANAGED) == 0 && !pmap_try_insert_pv_entry(pmap, va, m)) { if (mpte != NULL) { free = NULL; @@ -3581,7 +3581,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ /* * Now validate mapping with RO protection */ - if (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) + if ((m->oflags & VPO_UNMANAGED) != 0) pte_store(pte, pa | PG_V | PG_U); else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); @@ -3958,7 +3958,7 @@ pmap_page_exists_quick(pmap_t pmap, vm_p int loops = 0; boolean_t rv; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_page_exists_quick: page %p is not managed", m)); rv = FALSE; vm_page_lock_queues(); @@ -3999,7 +3999,7 @@ pmap_page_wired_mappings(vm_page_t m) int count; count = 0; - if ((m->flags & PG_FICTITIOUS) != 0) + if ((m->oflags & VPO_UNMANAGED) != 0) return (count); vm_page_lock_queues(); count = pmap_pvh_wired_mappings(&m->md, count); @@ -4041,7 +4041,7 @@ pmap_page_is_mapped(vm_page_t m) { boolean_t rv; - if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0) + if ((m->oflags & VPO_UNMANAGED) != 0) return (FALSE); vm_page_lock_queues(); rv = !TAILQ_EMPTY(&m->md.pv_list) || @@ -4199,7 +4199,7 @@ pmap_is_modified(vm_page_t m) { boolean_t rv; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_is_modified: page %p is not managed", m)); /* @@ -4280,7 +4280,7 @@ pmap_is_referenced(vm_page_t m) { boolean_t rv; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_is_referenced: page %p is not managed", m)); vm_page_lock_queues(); rv = pmap_is_referenced_pvh(&m->md) || @@ -4328,7 +4328,7 @@ pmap_remove_write(vm_page_t m) pt_entry_t oldpte, *pte; vm_offset_t va; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_remove_write: page %p is not managed", m)); /* @@ -4397,7 +4397,7 @@ pmap_ts_referenced(vm_page_t m) vm_offset_t va; int rtval = 0; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_ts_referenced: page %p is not managed", m)); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); vm_page_lock_queues(); @@ -4471,7 +4471,7 @@ pmap_clear_modify(vm_page_t m) pt_entry_t oldpte, *pte; vm_offset_t va; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_clear_modify: page %p is not managed", m)); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); KASSERT((m->oflags & VPO_BUSY) == 0, @@ -4548,7 +4548,7 @@ pmap_clear_reference(vm_page_t m) pt_entry_t *pte; vm_offset_t va; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_clear_reference: page %p is not managed", m)); vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); Modified: projects/altix/sys/amd64/amd64/support.S ============================================================================== --- projects/altix/sys/amd64/amd64/support.S Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/amd64/support.S Tue Sep 6 01:33:20 2011 (r225407) @@ -38,18 +38,6 @@ #include "assym.s" - .data - ALIGN_DATA - .globl intrcnt, eintrcnt -intrcnt: - .space INTRCNT_COUNT * 8 -eintrcnt: - - .globl intrnames, eintrnames -intrnames: - .space INTRCNT_COUNT * (MAXCOMLEN + 1) -eintrnames: - .text /* Modified: projects/altix/sys/amd64/conf/GENERIC ============================================================================== --- projects/altix/sys/amd64/conf/GENERIC Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/conf/GENERIC Tue Sep 6 01:33:20 2011 (r225407) @@ -37,7 +37,7 @@ options MD_ROOT # MD is a potential r options NFSCL # New Network Filesystem Client options NFSD # New Network Filesystem Server options NFSLOCKD # Network Lock Manager -options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) @@ -186,10 +186,7 @@ device plip # TCP/IP over parallel device ppi # Parallel port interface device #device vpo # Requires scbus and da -# If you've got a "dumb" serial or parallel PCI card that is -# supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to sio, uart and/or ppc drivers): -#device puc +device puc # Multi I/O cards and multi-channel UARTs # PCI Ethernet NICs. device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet Modified: projects/altix/sys/amd64/conf/NOTES ============================================================================== --- projects/altix/sys/amd64/conf/NOTES Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/conf/NOTES Tue Sep 6 01:33:20 2011 (r225407) @@ -490,6 +490,14 @@ options ENABLE_ALART # Control alarm o # options PMAP_SHPGPERPROC=201 +# +# Number of initial kernel page table pages used for early bootstrap. +# This number should include enough pages to map the kernel and any +# modules or other data loaded with the kernel by the loader. Each +# page table page maps 2MB. +# +options NKPT=31 + ##################################################################### # ABI Emulation Modified: projects/altix/sys/amd64/include/param.h ============================================================================== --- projects/altix/sys/amd64/include/param.h Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/include/param.h Tue Sep 6 01:33:20 2011 (r225407) @@ -64,7 +64,9 @@ #endif #if defined(SMP) || defined(KLD_MODULE) -#define MAXCPU 32 +#ifndef MAXCPU +#define MAXCPU 64 +#endif #else #define MAXCPU 1 #endif Modified: projects/altix/sys/amd64/linux32/linux32_machdep.c ============================================================================== --- projects/altix/sys/amd64/linux32/linux32_machdep.c Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/amd64/linux32/linux32_machdep.c Tue Sep 6 01:33:20 2011 (r225407) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> +#include <sys/capability.h> #include <sys/file.h> #include <sys/fcntl.h> #include <sys/clock.h> @@ -566,7 +567,7 @@ linux_mmap_common(struct thread *td, l_u * protection options specified. */ - if ((error = fget(td, bsd_args.fd, &fp)) != 0) + if ((error = fget(td, bsd_args.fd, CAP_MMAP, &fp)) != 0) return (error); if (fp->f_type != DTYPE_VNODE) { fdrop(fp, td); Modified: projects/altix/sys/arm/arm/irq_dispatch.S ============================================================================== --- projects/altix/sys/arm/arm/irq_dispatch.S Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/arm/irq_dispatch.S Tue Sep 6 01:33:20 2011 (r225407) @@ -102,14 +102,16 @@ ASENTRY_NP(irq_entry) .align 0 - .global _C_LABEL(intrnames), _C_LABEL(eintrnames) - .global _C_LABEL(intrcnt), _C_LABEL(eintrcnt) + .global _C_LABEL(intrnames), _C_LABEL(sintrnames) + .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt) _C_LABEL(intrnames): .space NIRQ * (MAXCOMLEN + 1) -_C_LABEL(eintrnames): _C_LABEL(intrcnt): .space NIRQ * 4 -_C_LABEL(eintrcnt): +_C_LABEL(sintrnames): + .int NIRQ * (MAXCOMLEN + 1) +_C_LABEL(sintrcnt): + .int NIRQ * 4 .global _C_LABEL(current_intr_depth) _C_LABEL(current_intr_depth): Modified: projects/altix/sys/arm/arm/pmap.c ============================================================================== --- projects/altix/sys/arm/arm/pmap.c Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/arm/pmap.c Tue Sep 6 01:33:20 2011 (r225407) @@ -3120,7 +3120,7 @@ pmap_remove_all(vm_page_t m) pmap_t curpm; int flags = 0; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_remove_all: page %p is not managed", m)); if (TAILQ_EMPTY(&m->md.pv_list)) return; @@ -3242,7 +3242,7 @@ pmap_protect(pmap_t pm, vm_offset_t sva, PTE_SYNC(ptep); if (pg != NULL) { - if (!(pg->flags & PG_UNMANAGED)) { + if (!(pg->oflags & VPO_UNMANAGED)) { f = pmap_modify_pv(pg, pm, sva, PVF_WRITE, 0); vm_page_dirty(pg); @@ -3327,8 +3327,8 @@ pmap_enter_locked(pmap_t pmap, vm_offset pa = systempage.pv_pa; m = NULL; } else { - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0 || - (m->oflags & VPO_BUSY) != 0 || (flags & M_NOWAIT) != 0, + KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0 || + (flags & M_NOWAIT) != 0, ("pmap_enter_locked: page %p is not busy", m)); pa = VM_PAGE_TO_PHYS(m); } @@ -3417,7 +3417,7 @@ do_l2b_alloc: if (prot & VM_PROT_WRITE) { npte |= L2_S_PROT_W; if (m != NULL && - (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) + (m->oflags & VPO_UNMANAGED) == 0) vm_page_flag_set(m, PG_WRITEABLE); } npte |= pte_l2_s_cache_mode; @@ -3480,36 +3480,36 @@ do_l2b_alloc: * this physical page is not/is already mapped. */ - if (m && ((m->flags & PG_FICTITIOUS) || - ((m->flags & PG_UNMANAGED) && + if (m && (m->oflags & VPO_UNMANAGED) && !m->md.pv_kva && - TAILQ_EMPTY(&m->md.pv_list)))) { + TAILQ_EMPTY(&m->md.pv_list)) { pmap_free_pv_entry(pve); pve = NULL; } - } else if (m && !(m->flags & PG_FICTITIOUS) && - (!(m->flags & PG_UNMANAGED) || m->md.pv_kva || + } else if (m && + (!(m->oflags & VPO_UNMANAGED) || m->md.pv_kva || !TAILQ_EMPTY(&m->md.pv_list))) pve = pmap_get_pv_entry(); - } else if (m && !(m->flags & PG_FICTITIOUS) && - (!(m->flags & PG_UNMANAGED) || m->md.pv_kva || + } else if (m && + (!(m->oflags & VPO_UNMANAGED) || m->md.pv_kva || !TAILQ_EMPTY(&m->md.pv_list))) pve = pmap_get_pv_entry(); - if (m && !(m->flags & PG_FICTITIOUS)) { - KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva, - ("pmap_enter: managed mapping within the clean submap")); - if (m->flags & PG_UNMANAGED) { + if (m) { + if ((m->oflags & VPO_UNMANAGED)) { if (!TAILQ_EMPTY(&m->md.pv_list) || - m->md.pv_kva) { + m->md.pv_kva) { KASSERT(pve != NULL, ("No pv")); nflags |= PVF_UNMAN; pmap_enter_pv(m, pve, pmap, va, nflags); } else m->md.pv_kva = va; } else { - KASSERT(pve != NULL, ("No pv")); - pmap_enter_pv(m, pve, pmap, va, nflags); + KASSERT(va < kmi.clean_sva || + va >= kmi.clean_eva, + ("pmap_enter: managed mapping within the clean submap")); + KASSERT(pve != NULL, ("No pv")); + pmap_enter_pv(m, pve, pmap, va, nflags); } } } @@ -4423,7 +4423,7 @@ pmap_page_exists_quick(pmap_t pmap, vm_p int loops = 0; boolean_t rv; - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_page_exists_quick: page %p is not managed", m)); rv = FALSE; vm_page_lock_queues(); @@ -4453,7 +4453,7 @@ pmap_page_wired_mappings(vm_page_t m) int count; count = 0; - if ((m->flags & PG_FICTITIOUS) != 0) + if ((m->oflags & VPO_UNMANAGED) != 0) return (count); vm_page_lock_queues(); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) @@ -4472,7 +4472,7 @@ int pmap_ts_referenced(vm_page_t m) { - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_ts_referenced: page %p is not managed", m)); return (pmap_clearbit(m, PVF_REF)); } @@ -4482,7 +4482,7 @@ boolean_t pmap_is_modified(vm_page_t m) { - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_is_modified: page %p is not managed", m)); if (m->md.pvh_attrs & PVF_MOD) return (TRUE); @@ -4498,7 +4498,7 @@ void pmap_clear_modify(vm_page_t m) { - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_clear_modify: page %p is not managed", m)); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); KASSERT((m->oflags & VPO_BUSY) == 0, @@ -4526,7 +4526,7 @@ boolean_t pmap_is_referenced(vm_page_t m) { - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_is_referenced: page %p is not managed", m)); return ((m->md.pvh_attrs & PVF_REF) != 0); } @@ -4540,7 +4540,7 @@ void pmap_clear_reference(vm_page_t m) { - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_clear_reference: page %p is not managed", m)); if (m->md.pvh_attrs & PVF_REF) pmap_clearbit(m, PVF_REF); @@ -4554,7 +4554,7 @@ void pmap_remove_write(vm_page_t m) { - KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_remove_write: page %p is not managed", m)); /* Modified: projects/altix/sys/arm/at91/uart_dev_at91usart.c ============================================================================== --- projects/altix/sys/arm/at91/uart_dev_at91usart.c Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/at91/uart_dev_at91usart.c Tue Sep 6 01:33:20 2011 (r225407) @@ -29,8 +29,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_comconsole.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -485,25 +483,10 @@ at91_usart_bus_param(struct uart_softc * static __inline void at91_rx_put(struct uart_softc *sc, int key) { -#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) - int kdb_brk; - if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) { - if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) { - switch (kdb_brk) { - case KDB_REQ_DEBUGGER: - kdb_enter(KDB_WHY_BREAK, - "Break sequence on console"); - break; - case KDB_REQ_PANIC: - kdb_panic("Panic sequence on console"); - break; - case KDB_REQ_REBOOT: - kdb_reboot(); - break; - } - } - } +#if defined(KDB) + if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) + kdb_alt_break(key, &sc->sc_altbrk); #endif uart_rx_put(sc, key); } Modified: projects/altix/sys/arm/conf/AVILA ============================================================================== --- projects/altix/sys/arm/conf/AVILA Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/AVILA Tue Sep 6 01:33:20 2011 (r225407) @@ -50,8 +50,8 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFSCL #New Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/BWCT ============================================================================== --- projects/altix/sys/arm/conf/BWCT Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/BWCT Tue Sep 6 01:33:20 2011 (r225407) @@ -46,10 +46,10 @@ options SOFTUPDATES #Enable FFS soft u #options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:md0\" #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +#options NFSD #New Network Filesystem Server #options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP_NFSROOT options BOOTP Modified: projects/altix/sys/arm/conf/CAMBRIA ============================================================================== --- projects/altix/sys/arm/conf/CAMBRIA Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/CAMBRIA Tue Sep 6 01:33:20 2011 (r225407) @@ -51,8 +51,8 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFSCL #New Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/CNS11XXNAS ============================================================================== --- projects/altix/sys/arm/conf/CNS11XXNAS Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/CNS11XXNAS Tue Sep 6 01:33:20 2011 (r225407) @@ -66,10 +66,10 @@ options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +#options NFSD #New Network Filesystem Server #options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) Modified: projects/altix/sys/arm/conf/CRB ============================================================================== --- projects/altix/sys/arm/conf/CRB Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/CRB Tue Sep 6 01:33:20 2011 (r225407) @@ -41,10 +41,10 @@ options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options NFSCLIENT #Network Filesystem Client -options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +options NFSD #New Network Filesystem Server options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) Modified: projects/altix/sys/arm/conf/DB-78XXX ============================================================================== --- projects/altix/sys/arm/conf/DB-78XXX Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/DB-78XXX Tue Sep 6 01:33:20 2011 (r225407) @@ -17,9 +17,9 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem -options NFSCLIENT #Network Filesystem Client +options NFSCL #New Network Filesystem Client options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/DB-88F5XXX ============================================================================== --- projects/altix/sys/arm/conf/DB-88F5XXX Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/DB-88F5XXX Tue Sep 6 01:33:20 2011 (r225407) @@ -17,9 +17,9 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem -options NFSCLIENT #Network Filesystem Client +options NFSCL #New Network Filesystem Client options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/DB-88F6XXX ============================================================================== --- projects/altix/sys/arm/conf/DB-88F6XXX Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/DB-88F6XXX Tue Sep 6 01:33:20 2011 (r225407) @@ -17,9 +17,9 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem -options NFSCLIENT #Network Filesystem Client +options NFSCL #New Network Filesystem Client options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/DOCKSTAR ============================================================================== --- projects/altix/sys/arm/conf/DOCKSTAR Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/DOCKSTAR Tue Sep 6 01:33:20 2011 (r225407) @@ -17,9 +17,9 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem -options NFSCLIENT #Network Filesystem Client +options NFSCL #New Network Filesystem Client options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/EP80219 ============================================================================== --- projects/altix/sys/arm/conf/EP80219 Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/EP80219 Tue Sep 6 01:33:20 2011 (r225407) @@ -40,10 +40,10 @@ options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options NFSCLIENT #Network Filesystem Client -options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +options NFSD #New Network Filesystem Server options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) Modified: projects/altix/sys/arm/conf/GUMSTIX ============================================================================== --- projects/altix/sys/arm/conf/GUMSTIX Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/GUMSTIX Tue Sep 6 01:33:20 2011 (r225407) @@ -45,9 +45,9 @@ options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFSCL #New Network Filesystem Client +#options NFSD #New Network Filesystem Server +options NFS_ROOT #NFS usable as /, requires NFSCL #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) Modified: projects/altix/sys/arm/conf/HL200 ============================================================================== --- projects/altix/sys/arm/conf/HL200 Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/HL200 Tue Sep 6 01:33:20 2011 (r225407) @@ -39,10 +39,10 @@ options FFS #Berkeley Fast Filesystem #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +#options NFSD #New Network Filesystem Server #options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP_NFSROOT options BOOTP options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/HL201 ============================================================================== --- projects/altix/sys/arm/conf/HL201 Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/HL201 Tue Sep 6 01:33:20 2011 (r225407) @@ -39,10 +39,10 @@ options FFS #Berkeley Fast Filesystem #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +#options NFSD #New Network Filesystem Server #options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP_NFSROOT options BOOTP options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/IQ31244 ============================================================================== --- projects/altix/sys/arm/conf/IQ31244 Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/IQ31244 Tue Sep 6 01:33:20 2011 (r225407) @@ -41,10 +41,10 @@ options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options NFSCLIENT #Network Filesystem Client -options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +options NFSD #New Network Filesystem Server options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) Modified: projects/altix/sys/arm/conf/KB920X ============================================================================== --- projects/altix/sys/arm/conf/KB920X Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/KB920X Tue Sep 6 01:33:20 2011 (r225407) @@ -40,10 +40,10 @@ options FFS #Berkeley Fast Filesystem #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 4MB ram disk options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +#options NFSD #New Network Filesystem Server #options NFSLOCKD #Network Lock Manager -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +#options NFS_ROOT #NFS usable as /, requires NFSCL #options BOOTP_NFSROOT #options BOOTP Modified: projects/altix/sys/arm/conf/LN2410SBC ============================================================================== --- projects/altix/sys/arm/conf/LN2410SBC Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/LN2410SBC Tue Sep 6 01:33:20 2011 (r225407) @@ -45,7 +45,7 @@ options ROOTDEVNAME=\"ufs:da0s1\" #options BOOTP #options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info -#options NFSCLIENT #Network File System client +#options NFSCL #New Network Filesystem Client #options NFS_ROOT #NFS usable as root device options PSEUDOFS #Pseudo-filesystem framework Modified: projects/altix/sys/arm/conf/NSLU ============================================================================== --- projects/altix/sys/arm/conf/NSLU Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/NSLU Tue Sep 6 01:33:20 2011 (r225407) @@ -58,10 +58,10 @@ options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options NFSCLIENT #Network Filesystem Client -options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +options NFSD #New Network Filesystem Server options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) Modified: projects/altix/sys/arm/conf/QILA9G20 ============================================================================== --- projects/altix/sys/arm/conf/QILA9G20 Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/QILA9G20 Tue Sep 6 01:33:20 2011 (r225407) @@ -39,10 +39,10 @@ options FFS #Berkeley Fast Filesystem #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 3MB ram disk -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +#options NFSD #New Network Filesystem Server #options NFSLOCKD #Network Lock Manager -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +#options NFS_ROOT #NFS usable as /, requires NFSCL #options BOOTP_NFSROOT #options BOOTP #options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/SAM9G20EK ============================================================================== --- projects/altix/sys/arm/conf/SAM9G20EK Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/SAM9G20EK Tue Sep 6 01:33:20 2011 (r225407) @@ -38,10 +38,10 @@ options FFS #Berkeley Fast Filesystem #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 3MB ram disk -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +#options NFSD #New Network Filesystem Server #options NFSLOCKD #Network Lock Manager -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +#options NFS_ROOT #NFS usable as /, requires NFSCL #options BOOTP_NFSROOT #options BOOTP #options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/SHEEVAPLUG ============================================================================== --- projects/altix/sys/arm/conf/SHEEVAPLUG Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/SHEEVAPLUG Tue Sep 6 01:33:20 2011 (r225407) @@ -17,9 +17,9 @@ options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem -options NFSCLIENT #Network Filesystem Client +options NFSCL #New Network Filesystem Client options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 Modified: projects/altix/sys/arm/conf/SIMICS ============================================================================== --- projects/altix/sys/arm/conf/SIMICS Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/SIMICS Tue Sep 6 01:33:20 2011 (r225407) @@ -39,10 +39,10 @@ options UFS_ACL #Support for access c options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device options ROOTDEVNAME=\"ufs:md0\" -options NFSCLIENT #Network Filesystem Client -options NFSSERVER #Network Filesystem Server +options NFSCL #New Network Filesystem Client +options NFSD #New Network Filesystem Server options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL #options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) Modified: projects/altix/sys/arm/conf/TS7800 ============================================================================== --- projects/altix/sys/arm/conf/TS7800 Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/conf/TS7800 Tue Sep 6 01:33:20 2011 (r225407) @@ -18,9 +18,9 @@ options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support -options NFSCLIENT #Network Filesystem Client +options NFSCL #New Network Filesystem Client options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 Modified: projects/altix/sys/arm/include/param.h ============================================================================== --- projects/altix/sys/arm/include/param.h Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/include/param.h Tue Sep 6 01:33:20 2011 (r225407) @@ -61,7 +61,9 @@ #define MID_MACHINE MID_ARM6 #if defined(SMP) || defined(KLD_MODULE) +#ifndef MAXCPU #define MAXCPU 2 +#endif #else #define MAXCPU 1 #endif /* SMP || KLD_MODULE */ Modified: projects/altix/sys/arm/sa11x0/sa11x0_irq.S ============================================================================== --- projects/altix/sys/arm/sa11x0/sa11x0_irq.S Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/arm/sa11x0/sa11x0_irq.S Tue Sep 6 01:33:20 2011 (r225407) @@ -118,16 +118,11 @@ ENTRY(sa11x0_activateirqs) mov r1, #0xffffffff str r1, [r0, #(SAIPIC_MR)] mov pc, lr -#ifdef IRQSTATS -Lintrcnt: - .word _C_LABEL(intrcnt) -#endif - .global _C_LABEL(intrnames), _C_LABEL(eintrnames) - .global _C_LABEL(eintrcnt) + .global _C_LABEL(intrnames), _C_LABEL(sintrnames) _C_LABEL(intrnames): -_C_LABEL(eintrnames): -_C_LABEL(eintrcnt): +_C_LABEL(sintrnames): + .int 0 .globl _C_LABEL(intrcnt), _C_LABEL(sintrcnt) @@ -135,4 +130,4 @@ _C_LABEL(intrcnt): .space ICU_LEN*4 /* XXX Should be linked to number of interrupts */ _C_LABEL(sintrcnt): - .space 32*4 + .word ICU_LEN*4 Modified: projects/altix/sys/boot/forth/loader.conf ============================================================================== --- projects/altix/sys/boot/forth/loader.conf Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/boot/forth/loader.conf Tue Sep 6 01:33:20 2011 (r225407) @@ -55,6 +55,11 @@ module_path="/boot/modules" # Set the mo #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem +#tftp.blksize="1428" # Set the RFC 2348 TFTP block size. + # If the TFTP server does not support RFC 2348, + # the block size is set to 512. If the value + # is out of range ( < 8 || > 9008 ) an error is + # returned. ############################################################## @@ -104,6 +109,8 @@ module_path="/boot/modules" # Set the mo #kern.ncallout="" # Set the maximum # of timer events #kern.ngroups="1023" # Set the maximum # of supplemental groups #kern.sgrowsiz="" # Set the amount to grow stack +#kern.cam.boot_delay="10000" # Delay (in ms) of root mount for CAM bus + # registration, useful for USB sticks as root #kern.cam.scsi_delay="2000" # Delay (in ms) before probing SCSI #kern.ipc.maxsockets="" # Set the maximum number of sockets avaliable #kern.ipc.nmbclusters="" # Set the number of mbuf clusters Modified: projects/altix/sys/boot/forth/loader.conf.5 ============================================================================== --- projects/altix/sys/boot/forth/loader.conf.5 Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/boot/forth/loader.conf.5 Tue Sep 6 01:33:20 2011 (r225407) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd January 16, 2008 +.Dd July 20, 2011 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -107,6 +107,9 @@ present file. Name of the kernel to be loaded. If no kernel name is set, no additional modules will be loaded. +The name must be a subdirectory of +.Pa /boot +that contains a kernel. .It Ar kernel_options Flags to be passed to the kernel. .It Ar password @@ -190,7 +193,7 @@ replacing it with .Dq spinning character (useful for embedded products and such). .It Va kernel -.Pq Dq Pa /boot/kernel/kernel +.Pq Dq kernel .It Va loader_conf_files .Pq Dq Pa /boot/loader.conf /boot/loader.conf.local .It Va splash_bmp_load Modified: projects/altix/sys/boot/i386/Makefile.inc ============================================================================== --- projects/altix/sys/boot/i386/Makefile.inc Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/boot/i386/Makefile.inc Tue Sep 6 01:33:20 2011 (r225407) @@ -11,6 +11,7 @@ LDFLAGS+= -nostdlib .if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 -march=i386 +ACFLAGS+= -m32 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 .endif Modified: projects/altix/sys/boot/i386/boot2/Makefile ============================================================================== --- projects/altix/sys/boot/i386/boot2/Makefile Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/boot/i386/boot2/Makefile Tue Sep 6 01:33:20 2011 (r225407) @@ -89,6 +89,9 @@ boot2.out: ${BTXCRT} boot2.o sio.o ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s +.if ${CC:T:Mclang} == "clang" + ${CC} ${ACFLAGS} -c boot2.s +.endif SRCS= boot2.c boot2.h Modified: projects/altix/sys/boot/i386/zfsboot/Makefile ============================================================================== --- projects/altix/sys/boot/i386/zfsboot/Makefile Tue Sep 6 01:05:17 2011 (r225406) +++ projects/altix/sys/boot/i386/zfsboot/Makefile Tue Sep 6 01:33:20 2011 (r225407) @@ -86,6 +86,9 @@ zfsboot.out: ${BTXCRT} zfsboot.o sio.o d ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109060133.p861XKnO062151>