Date: Tue, 10 Jan 2012 04:19:37 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r229920 - in projects/nfsv4.1-client/sys: . amd64/amd64 amd64/conf amd64/linux32 arm/conf arm/xscale/ixp425 boot/common boot/forth boot/i386/libi386 boot/ofw/common boot/ofw/libofw boot... Message-ID: <201201100419.q0A4JbUB085627@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Tue Jan 10 04:19:36 2012 New Revision: 229920 URL: http://svn.freebsd.org/changeset/base/229920 Log: Merge in an up to date kernel from head. Added: projects/nfsv4.1-client/sys/contrib/xz-embedded/ - copied from r229919, head/sys/contrib/xz-embedded/ projects/nfsv4.1-client/sys/dev/ath/if_ath_led.c - copied unchanged from r229919, head/sys/dev/ath/if_ath_led.c projects/nfsv4.1-client/sys/dev/ath/if_ath_led.h - copied unchanged from r229919, head/sys/dev/ath/if_ath_led.h projects/nfsv4.1-client/sys/dev/hpt27xx/ - copied from r229919, head/sys/dev/hpt27xx/ projects/nfsv4.1-client/sys/dev/sound/pci/emuxkireg.h - copied unchanged from r229919, head/sys/dev/sound/pci/emuxkireg.h projects/nfsv4.1-client/sys/geom/uncompress/ - copied from r229919, head/sys/geom/uncompress/ projects/nfsv4.1-client/sys/libkern/memcchr.c - copied unchanged from r229919, head/sys/libkern/memcchr.c projects/nfsv4.1-client/sys/libkern/strchr.c - copied unchanged from r229919, head/sys/libkern/strchr.c projects/nfsv4.1-client/sys/libkern/strrchr.c - copied unchanged from r229919, head/sys/libkern/strrchr.c projects/nfsv4.1-client/sys/mips/cavium/octeon_cop2.S - copied unchanged from r229919, head/sys/mips/cavium/octeon_cop2.S projects/nfsv4.1-client/sys/mips/cavium/octeon_cop2.h - copied unchanged from r229919, head/sys/mips/cavium/octeon_cop2.h projects/nfsv4.1-client/sys/mips/cavium/octeon_gpio.c - copied unchanged from r229919, head/sys/mips/cavium/octeon_gpio.c projects/nfsv4.1-client/sys/mips/cavium/octeon_gpiovar.h - copied unchanged from r229919, head/sys/mips/cavium/octeon_gpiovar.h projects/nfsv4.1-client/sys/mips/conf/AR71XX_BASE - copied unchanged from r229919, head/sys/mips/conf/AR71XX_BASE projects/nfsv4.1-client/sys/mips/conf/AR71XX_BASE.hints - copied unchanged from r229919, head/sys/mips/conf/AR71XX_BASE.hints projects/nfsv4.1-client/sys/mips/conf/PB47 - copied unchanged from r229919, head/sys/mips/conf/PB47 projects/nfsv4.1-client/sys/mips/conf/PB47.hints - copied unchanged from r229919, head/sys/mips/conf/PB47.hints projects/nfsv4.1-client/sys/mips/conf/ROUTERSTATION - copied unchanged from r229919, head/sys/mips/conf/ROUTERSTATION projects/nfsv4.1-client/sys/mips/conf/ROUTERSTATION.hints - copied unchanged from r229919, head/sys/mips/conf/ROUTERSTATION.hints projects/nfsv4.1-client/sys/mips/conf/ROUTERSTATION_MFS - copied unchanged from r229919, head/sys/mips/conf/ROUTERSTATION_MFS projects/nfsv4.1-client/sys/mips/conf/RSPRO - copied unchanged from r229919, head/sys/mips/conf/RSPRO projects/nfsv4.1-client/sys/mips/conf/RSPRO.hints - copied unchanged from r229919, head/sys/mips/conf/RSPRO.hints projects/nfsv4.1-client/sys/mips/conf/RSPRO_MFS - copied unchanged from r229919, head/sys/mips/conf/RSPRO_MFS projects/nfsv4.1-client/sys/mips/conf/RSPRO_STANDALONE - copied unchanged from r229919, head/sys/mips/conf/RSPRO_STANDALONE projects/nfsv4.1-client/sys/mips/include/octeon_cop2.h - copied unchanged from r229919, head/sys/mips/include/octeon_cop2.h projects/nfsv4.1-client/sys/mips/mips/octeon_cop2.c - copied unchanged from r229919, head/sys/mips/mips/octeon_cop2.c projects/nfsv4.1-client/sys/mips/mips/octeon_cop2_swtch.S - copied unchanged from r229919, head/sys/mips/mips/octeon_cop2_swtch.S projects/nfsv4.1-client/sys/modules/cfi/ - copied from r229919, head/sys/modules/cfi/ projects/nfsv4.1-client/sys/modules/geom/geom_uncompress/ - copied from r229919, head/sys/modules/geom/geom_uncompress/ projects/nfsv4.1-client/sys/modules/hpt27xx/ - copied from r229919, head/sys/modules/hpt27xx/ Deleted: projects/nfsv4.1-client/sys/libkern/index.c projects/nfsv4.1-client/sys/libkern/rindex.c projects/nfsv4.1-client/sys/libkern/skpc.c projects/nfsv4.1-client/sys/mips/conf/AR71XX projects/nfsv4.1-client/sys/mips/conf/AR71XX.hints Modified: projects/nfsv4.1-client/sys/Makefile projects/nfsv4.1-client/sys/amd64/amd64/machdep.c projects/nfsv4.1-client/sys/amd64/amd64/pmap.c projects/nfsv4.1-client/sys/amd64/conf/GENERIC projects/nfsv4.1-client/sys/amd64/conf/NOTES projects/nfsv4.1-client/sys/amd64/linux32/linux.h projects/nfsv4.1-client/sys/amd64/linux32/linux32_dummy.c projects/nfsv4.1-client/sys/amd64/linux32/linux32_proto.h projects/nfsv4.1-client/sys/amd64/linux32/linux32_syscall.h projects/nfsv4.1-client/sys/amd64/linux32/linux32_syscalls.c projects/nfsv4.1-client/sys/amd64/linux32/linux32_sysent.c projects/nfsv4.1-client/sys/amd64/linux32/linux32_systrace_args.c projects/nfsv4.1-client/sys/amd64/linux32/syscalls.master projects/nfsv4.1-client/sys/arm/conf/KB920X projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixdp425_pci.c projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixp425_pci.c projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixp425var.h projects/nfsv4.1-client/sys/boot/common/interp_parse.c projects/nfsv4.1-client/sys/boot/common/loader.8 projects/nfsv4.1-client/sys/boot/forth/loader.4th projects/nfsv4.1-client/sys/boot/forth/menu.4th projects/nfsv4.1-client/sys/boot/forth/menu.4th.8 projects/nfsv4.1-client/sys/boot/i386/libi386/biospci.c projects/nfsv4.1-client/sys/boot/i386/libi386/comconsole.c projects/nfsv4.1-client/sys/boot/i386/libi386/libi386.h projects/nfsv4.1-client/sys/boot/ofw/common/main.c projects/nfsv4.1-client/sys/boot/ofw/libofw/ofw_net.c projects/nfsv4.1-client/sys/boot/pc98/boot2/boot1.S projects/nfsv4.1-client/sys/boot/pc98/libpc98/comconsole.c projects/nfsv4.1-client/sys/boot/userboot/libstand/Makefile projects/nfsv4.1-client/sys/cam/ata/ata_da.c projects/nfsv4.1-client/sys/cam/scsi/scsi_cd.c projects/nfsv4.1-client/sys/cam/scsi/scsi_da.c projects/nfsv4.1-client/sys/cam/scsi/scsi_sa.c projects/nfsv4.1-client/sys/cam/scsi/scsi_ses.c projects/nfsv4.1-client/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/nfsv4.1-client/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/nfsv4.1-client/sys/compat/linux/linux_file.c projects/nfsv4.1-client/sys/compat/linux/linux_ioctl.c projects/nfsv4.1-client/sys/compat/ndis/subr_ntoskrnl.c projects/nfsv4.1-client/sys/conf/files projects/nfsv4.1-client/sys/conf/files.amd64 projects/nfsv4.1-client/sys/conf/files.i386 projects/nfsv4.1-client/sys/conf/kern.mk projects/nfsv4.1-client/sys/conf/kern.pre.mk projects/nfsv4.1-client/sys/conf/options projects/nfsv4.1-client/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/nfsv4.1-client/sys/contrib/octeon-sdk/cvmx-usb.c projects/nfsv4.1-client/sys/contrib/pf/net/if_pfsync.c projects/nfsv4.1-client/sys/contrib/pf/net/pf.c projects/nfsv4.1-client/sys/contrib/pf/net/pf_ioctl.c projects/nfsv4.1-client/sys/contrib/rdma/ib_addr.h projects/nfsv4.1-client/sys/ddb/db_input.c projects/nfsv4.1-client/sys/dev/acpica/acpi_pcib_acpi.c projects/nfsv4.1-client/sys/dev/ahci/ahci.c projects/nfsv4.1-client/sys/dev/an/if_an.c projects/nfsv4.1-client/sys/dev/ata/ata-disk.c projects/nfsv4.1-client/sys/dev/ata/ata-pci.h projects/nfsv4.1-client/sys/dev/ata/chipsets/ata-intel.c projects/nfsv4.1-client/sys/dev/ath/ath_hal/ah_desc.h projects/nfsv4.1-client/sys/dev/ath/ath_hal/ah_internal.h projects/nfsv4.1-client/sys/dev/ath/ath_hal/ar5210/ar5210reg.h projects/nfsv4.1-client/sys/dev/ath/ath_hal/ar5211/ar5211reg.h projects/nfsv4.1-client/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/nfsv4.1-client/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/nfsv4.1-client/sys/dev/ath/if_ath.c projects/nfsv4.1-client/sys/dev/ath/if_ath_sysctl.c projects/nfsv4.1-client/sys/dev/ath/if_ath_tx.c projects/nfsv4.1-client/sys/dev/ath/if_athvar.h projects/nfsv4.1-client/sys/dev/bfe/if_bfe.c projects/nfsv4.1-client/sys/dev/bm/if_bm.c projects/nfsv4.1-client/sys/dev/bxe/if_bxe.c projects/nfsv4.1-client/sys/dev/ce/if_ce.c projects/nfsv4.1-client/sys/dev/cp/if_cp.c projects/nfsv4.1-client/sys/dev/drm/radeon_state.c projects/nfsv4.1-client/sys/dev/e1000/if_em.c projects/nfsv4.1-client/sys/dev/e1000/if_igb.c projects/nfsv4.1-client/sys/dev/e1000/if_lem.c projects/nfsv4.1-client/sys/dev/ep/if_ep.c projects/nfsv4.1-client/sys/dev/ex/if_ex.c projects/nfsv4.1-client/sys/dev/fdt/fdt_pci.c projects/nfsv4.1-client/sys/dev/fdt/fdtbus.c projects/nfsv4.1-client/sys/dev/fdt/simplebus.c projects/nfsv4.1-client/sys/dev/firewire/if_fwe.c projects/nfsv4.1-client/sys/dev/flash/mx25l.c projects/nfsv4.1-client/sys/dev/hwpmc/hwpmc_amd.c projects/nfsv4.1-client/sys/dev/hwpmc/hwpmc_core.c projects/nfsv4.1-client/sys/dev/hwpmc/hwpmc_uncore.c projects/nfsv4.1-client/sys/dev/hwpmc/hwpmc_uncore.h projects/nfsv4.1-client/sys/dev/hwpmc/pmc_events.h projects/nfsv4.1-client/sys/dev/ichwd/ichwd.c projects/nfsv4.1-client/sys/dev/ichwd/ichwd.h projects/nfsv4.1-client/sys/dev/ie/if_ie.c projects/nfsv4.1-client/sys/dev/if_ndis/if_ndis.c projects/nfsv4.1-client/sys/dev/if_ndis/if_ndis_pccard.c projects/nfsv4.1-client/sys/dev/isp/isp_freebsd.c projects/nfsv4.1-client/sys/dev/isp/isp_freebsd.h projects/nfsv4.1-client/sys/dev/iwn/if_iwn.c projects/nfsv4.1-client/sys/dev/ixgb/if_ixgb.c projects/nfsv4.1-client/sys/dev/ixgbe/ixgbe.c projects/nfsv4.1-client/sys/dev/ixgbe/ixv.c projects/nfsv4.1-client/sys/dev/lge/if_lge.c projects/nfsv4.1-client/sys/dev/mps/mps_sas.c projects/nfsv4.1-client/sys/dev/msk/if_msk.c projects/nfsv4.1-client/sys/dev/mxge/if_mxge.c projects/nfsv4.1-client/sys/dev/my/if_my.c projects/nfsv4.1-client/sys/dev/nfe/if_nfe.c projects/nfsv4.1-client/sys/dev/nve/if_nve.c projects/nfsv4.1-client/sys/dev/qlxgb/qla_misc.c projects/nfsv4.1-client/sys/dev/qlxgb/qla_os.c projects/nfsv4.1-client/sys/dev/random/probe.c projects/nfsv4.1-client/sys/dev/rt/if_rt.c projects/nfsv4.1-client/sys/dev/sfxge/sfxge_port.c projects/nfsv4.1-client/sys/dev/sis/if_sis.c projects/nfsv4.1-client/sys/dev/sk/if_sk.c projects/nfsv4.1-client/sys/dev/sn/if_sn.c projects/nfsv4.1-client/sys/dev/snc/dp83932.c projects/nfsv4.1-client/sys/dev/sound/pci/emu10k1.c projects/nfsv4.1-client/sys/dev/stge/if_stge.c projects/nfsv4.1-client/sys/dev/tl/if_tl.c projects/nfsv4.1-client/sys/dev/tsec/if_tsec.c projects/nfsv4.1-client/sys/dev/tws/tws.c projects/nfsv4.1-client/sys/dev/uart/uart_bus_fdt.c projects/nfsv4.1-client/sys/dev/uart/uart_bus_pci.c projects/nfsv4.1-client/sys/dev/uart/uart_cpu_sparc64.c projects/nfsv4.1-client/sys/dev/usb/controller/usb_controller.c projects/nfsv4.1-client/sys/dev/usb/controller/xhci.c projects/nfsv4.1-client/sys/dev/usb/controller/xhci.h projects/nfsv4.1-client/sys/dev/usb/net/usb_ethernet.c projects/nfsv4.1-client/sys/dev/vx/if_vx.c projects/nfsv4.1-client/sys/dev/vxge/vxge.c projects/nfsv4.1-client/sys/dev/wb/if_wb.c projects/nfsv4.1-client/sys/dev/xen/netback/netback.c projects/nfsv4.1-client/sys/dev/xen/netfront/netfront.c projects/nfsv4.1-client/sys/fs/ext2fs/ext2_alloc.c projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c projects/nfsv4.1-client/sys/fs/nfs/nfsport.h projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clkrpc.c projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clport.c projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c projects/nfsv4.1-client/sys/fs/ntfs/ntfs_compr.c projects/nfsv4.1-client/sys/fs/ntfs/ntfs_subr.c projects/nfsv4.1-client/sys/fs/nullfs/null_subr.c projects/nfsv4.1-client/sys/fs/nullfs/null_vfsops.c projects/nfsv4.1-client/sys/fs/nullfs/null_vnops.c projects/nfsv4.1-client/sys/fs/nwfs/nwfs_vfsops.c projects/nfsv4.1-client/sys/fs/pseudofs/pseudofs_vnops.c projects/nfsv4.1-client/sys/fs/smbfs/smbfs_vfsops.c projects/nfsv4.1-client/sys/fs/smbfs/smbfs_vnops.c projects/nfsv4.1-client/sys/fs/tmpfs/tmpfs_subr.c projects/nfsv4.1-client/sys/fs/tmpfs/tmpfs_vnops.c projects/nfsv4.1-client/sys/geom/raid/md_intel.c projects/nfsv4.1-client/sys/gnu/fs/xfs/xfs_vfsops.c projects/nfsv4.1-client/sys/i386/conf/GENERIC projects/nfsv4.1-client/sys/i386/conf/NOTES projects/nfsv4.1-client/sys/i386/conf/XEN projects/nfsv4.1-client/sys/i386/i386/machdep.c projects/nfsv4.1-client/sys/i386/i386/pmap.c projects/nfsv4.1-client/sys/i386/i386/sys_machdep.c projects/nfsv4.1-client/sys/i386/ibcs2/ibcs2_socksys.c projects/nfsv4.1-client/sys/i386/ibcs2/ibcs2_stat.c projects/nfsv4.1-client/sys/i386/include/asm.h projects/nfsv4.1-client/sys/i386/include/ucontext.h projects/nfsv4.1-client/sys/i386/linux/linux.h projects/nfsv4.1-client/sys/i386/linux/linux_dummy.c projects/nfsv4.1-client/sys/i386/linux/linux_proto.h projects/nfsv4.1-client/sys/i386/linux/linux_syscall.h projects/nfsv4.1-client/sys/i386/linux/linux_syscalls.c projects/nfsv4.1-client/sys/i386/linux/linux_sysent.c projects/nfsv4.1-client/sys/i386/linux/linux_systrace_args.c projects/nfsv4.1-client/sys/i386/linux/syscalls.master projects/nfsv4.1-client/sys/i386/xen/pmap.c projects/nfsv4.1-client/sys/ia64/conf/GENERIC projects/nfsv4.1-client/sys/kern/kern_intr.c projects/nfsv4.1-client/sys/kern/kern_ktr.c projects/nfsv4.1-client/sys/kern/kern_linker.c projects/nfsv4.1-client/sys/kern/kern_prot.c projects/nfsv4.1-client/sys/kern/kern_resource.c projects/nfsv4.1-client/sys/kern/kern_shutdown.c projects/nfsv4.1-client/sys/kern/kern_thread.c projects/nfsv4.1-client/sys/kern/kern_uuid.c projects/nfsv4.1-client/sys/kern/sched_4bsd.c projects/nfsv4.1-client/sys/kern/sched_ule.c projects/nfsv4.1-client/sys/kern/subr_hints.c projects/nfsv4.1-client/sys/kern/subr_witness.c projects/nfsv4.1-client/sys/kern/tty_inq.c projects/nfsv4.1-client/sys/kern/uipc_mqueue.c projects/nfsv4.1-client/sys/kern/uipc_shm.c projects/nfsv4.1-client/sys/kern/vfs_lookup.c projects/nfsv4.1-client/sys/kern/vfs_subr.c projects/nfsv4.1-client/sys/kern/vfs_syscalls.c projects/nfsv4.1-client/sys/kern/vnode_if.src projects/nfsv4.1-client/sys/libkern/fnmatch.c projects/nfsv4.1-client/sys/mips/atheros/ar724x_pci.c projects/nfsv4.1-client/sys/mips/cavium/cryptocteon/cavium_crypto.c projects/nfsv4.1-client/sys/mips/cavium/files.octeon1 projects/nfsv4.1-client/sys/mips/cavium/octeon_ds1337.c projects/nfsv4.1-client/sys/mips/cavium/usb/octusb.c projects/nfsv4.1-client/sys/mips/cavium/usb/octusb.h projects/nfsv4.1-client/sys/mips/cavium/usb/octusb_octeon.c projects/nfsv4.1-client/sys/mips/conf/AR91XX_BASE projects/nfsv4.1-client/sys/mips/include/_stdint.h projects/nfsv4.1-client/sys/mips/include/cpuregs.h projects/nfsv4.1-client/sys/mips/include/frame.h projects/nfsv4.1-client/sys/mips/include/intr_machdep.h projects/nfsv4.1-client/sys/mips/include/proc.h projects/nfsv4.1-client/sys/mips/mips/db_disasm.c projects/nfsv4.1-client/sys/mips/mips/elf_machdep.c projects/nfsv4.1-client/sys/mips/mips/exception.S projects/nfsv4.1-client/sys/mips/mips/gdb_machdep.c projects/nfsv4.1-client/sys/mips/mips/genassym.c projects/nfsv4.1-client/sys/mips/mips/locore.S projects/nfsv4.1-client/sys/mips/mips/pm_machdep.c projects/nfsv4.1-client/sys/mips/mips/swtch.S projects/nfsv4.1-client/sys/mips/mips/trap.c projects/nfsv4.1-client/sys/mips/mips/vm_machdep.c projects/nfsv4.1-client/sys/modules/Makefile projects/nfsv4.1-client/sys/modules/ath/Makefile projects/nfsv4.1-client/sys/modules/ce/Makefile projects/nfsv4.1-client/sys/modules/drm/r128/Makefile projects/nfsv4.1-client/sys/modules/drm/radeon/Makefile projects/nfsv4.1-client/sys/modules/drm/via/Makefile projects/nfsv4.1-client/sys/modules/ipfilter/Makefile projects/nfsv4.1-client/sys/modules/kgssapi_krb5/Makefile projects/nfsv4.1-client/sys/modules/nxge/Makefile projects/nfsv4.1-client/sys/modules/random/Makefile projects/nfsv4.1-client/sys/modules/sound/driver/emu10k1/Makefile projects/nfsv4.1-client/sys/modules/xfs/Makefile projects/nfsv4.1-client/sys/net/bpf.c projects/nfsv4.1-client/sys/net/if.c projects/nfsv4.1-client/sys/net/if_llatbl.c projects/nfsv4.1-client/sys/net/if_media.h projects/nfsv4.1-client/sys/net/if_var.h projects/nfsv4.1-client/sys/net/if_vlan.c projects/nfsv4.1-client/sys/net/rtsock.c projects/nfsv4.1-client/sys/net80211/ieee80211_ht.c projects/nfsv4.1-client/sys/net80211/ieee80211_output.c projects/nfsv4.1-client/sys/netatalk/aarp.c projects/nfsv4.1-client/sys/netatalk/at_control.c projects/nfsv4.1-client/sys/netgraph/ng_base.c projects/nfsv4.1-client/sys/netgraph/ng_ksocket.c projects/nfsv4.1-client/sys/netinet/if_ether.c projects/nfsv4.1-client/sys/netinet/if_ether.h projects/nfsv4.1-client/sys/netinet/igmp.c projects/nfsv4.1-client/sys/netinet/in.c projects/nfsv4.1-client/sys/netinet/in_mcast.c projects/nfsv4.1-client/sys/netinet/in_pcb.c projects/nfsv4.1-client/sys/netinet/in_proto.c projects/nfsv4.1-client/sys/netinet/in_var.h projects/nfsv4.1-client/sys/netinet/ip_carp.c projects/nfsv4.1-client/sys/netinet/ip_icmp.c projects/nfsv4.1-client/sys/netinet/ip_input.c projects/nfsv4.1-client/sys/netinet/ip_var.h projects/nfsv4.1-client/sys/netinet/raw_ip.c projects/nfsv4.1-client/sys/netinet/sctp_asconf.c projects/nfsv4.1-client/sys/netinet/sctp_auth.c projects/nfsv4.1-client/sys/netinet/sctp_bsd_addr.c projects/nfsv4.1-client/sys/netinet/sctp_cc_functions.c projects/nfsv4.1-client/sys/netinet/sctp_constants.h projects/nfsv4.1-client/sys/netinet/sctp_indata.c projects/nfsv4.1-client/sys/netinet/sctp_input.c projects/nfsv4.1-client/sys/netinet/sctp_output.c projects/nfsv4.1-client/sys/netinet/sctp_pcb.c projects/nfsv4.1-client/sys/netinet/sctp_ss_functions.c projects/nfsv4.1-client/sys/netinet/sctp_sysctl.c projects/nfsv4.1-client/sys/netinet/sctp_sysctl.h projects/nfsv4.1-client/sys/netinet/sctp_timer.c projects/nfsv4.1-client/sys/netinet/sctp_usrreq.c projects/nfsv4.1-client/sys/netinet/sctp_var.h projects/nfsv4.1-client/sys/netinet/sctputil.c projects/nfsv4.1-client/sys/netinet/tcp_input.c projects/nfsv4.1-client/sys/netinet/tcp_timewait.c projects/nfsv4.1-client/sys/netinet/tcp_usrreq.c projects/nfsv4.1-client/sys/netinet6/icmp6.c projects/nfsv4.1-client/sys/netinet6/in6.c projects/nfsv4.1-client/sys/netinet6/in6_ifattach.c projects/nfsv4.1-client/sys/netinet6/in6_mcast.c projects/nfsv4.1-client/sys/netinet6/in6_var.h projects/nfsv4.1-client/sys/netinet6/ip6_input.c projects/nfsv4.1-client/sys/netinet6/mld6.c projects/nfsv4.1-client/sys/netinet6/nd6.c projects/nfsv4.1-client/sys/netinet6/nd6.h projects/nfsv4.1-client/sys/netinet6/nd6_rtr.c projects/nfsv4.1-client/sys/netinet6/scope6_var.h projects/nfsv4.1-client/sys/netinet6/sctp6_usrreq.c projects/nfsv4.1-client/sys/netipx/ipx.c projects/nfsv4.1-client/sys/pc98/conf/GENERIC projects/nfsv4.1-client/sys/powerpc/conf/GENERIC projects/nfsv4.1-client/sys/powerpc/conf/GENERIC64 projects/nfsv4.1-client/sys/powerpc/include/_stdint.h projects/nfsv4.1-client/sys/security/mac_lomac/mac_lomac.c projects/nfsv4.1-client/sys/sparc64/conf/GENERIC projects/nfsv4.1-client/sys/sys/_null.h projects/nfsv4.1-client/sys/sys/cdefs.h projects/nfsv4.1-client/sys/sys/copyright.h projects/nfsv4.1-client/sys/sys/libkern.h projects/nfsv4.1-client/sys/sys/namei.h projects/nfsv4.1-client/sys/sys/param.h projects/nfsv4.1-client/sys/ufs/ffs/ffs_alloc.c projects/nfsv4.1-client/sys/ufs/ufs/ufs_quota.c projects/nfsv4.1-client/sys/vm/vm_object.c projects/nfsv4.1-client/sys/x86/acpica/srat.c Directory Properties: projects/nfsv4.1-client/sys/ (props changed) projects/nfsv4.1-client/sys/conf/ (props changed) projects/nfsv4.1-client/sys/contrib/dev/acpica/ (props changed) Modified: projects/nfsv4.1-client/sys/Makefile ============================================================================== --- projects/nfsv4.1-client/sys/Makefile Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/Makefile Tue Jan 10 04:19:36 2012 (r229920) @@ -13,10 +13,18 @@ CSCOPEDIRS= boot bsm cam cddl compat con netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfsclient nfsserver nlm opencrypto \ pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR} +.if !defined(CSCOPE_ARCHDIR) .if defined(ALL_ARCH) -CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86 +CSCOPE_ARCHDIR = amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86 .else -CSCOPE_ARCHDIR ?= ${MACHINE} +CSCOPE_ARCHDIR = ${MACHINE} +.if ${MACHINE} != ${MACHINE_CPUARCH} +CSCOPE_ARCHDIR += ${MACHINE_CPUARCH} +.endif +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +CSCOPE_ARCHDIR += x86 +.endif +.endif .endif # Loadable kernel modules Modified: projects/nfsv4.1-client/sys/amd64/amd64/machdep.c ============================================================================== --- projects/nfsv4.1-client/sys/amd64/amd64/machdep.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/amd64/machdep.c Tue Jan 10 04:19:36 2012 (r229920) @@ -1401,10 +1401,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 + * By default enable the memory test on real hardware, and disable + * it if we appear to be running in a VM. This avoids touching all + * pages unnecessarily, which doesn't matter on real hardware but is + * bad for shared VM hosts. Use a general name so that * one could eventually do more with the code than just disable it. */ - memtest = 1; + memtest = (vm_guest > VM_GUEST_NO) ? 0 : 1; TUNABLE_ULONG_FETCH("hw.memtest.tests", &memtest); /* Modified: projects/nfsv4.1-client/sys/amd64/amd64/pmap.c ============================================================================== --- projects/nfsv4.1-client/sys/amd64/amd64/pmap.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/amd64/pmap.c Tue Jan 10 04:19:36 2012 (r229920) @@ -1255,8 +1255,8 @@ retry: if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - if (vm_page_pa_tryrelock(pmap, (pde & PG_PS_FRAME) | - (va & PDRMASK), &pa)) + if (vm_page_pa_tryrelock(pmap, (pde & + PG_PS_FRAME) | (va & PDRMASK), &pa)) goto retry; m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); @@ -1266,7 +1266,8 @@ retry: pte = *pmap_pde_to_pte(pdep, va); if ((pte & PG_V) && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { - if (vm_page_pa_tryrelock(pmap, pte & PG_FRAME, &pa)) + if (vm_page_pa_tryrelock(pmap, pte & PG_FRAME, + &pa)) goto retry; m = PHYS_TO_VM_PAGE(pte & PG_FRAME); vm_page_hold(m); Modified: projects/nfsv4.1-client/sys/amd64/conf/GENERIC ============================================================================== --- projects/nfsv4.1-client/sys/amd64/conf/GENERIC Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/conf/GENERIC Tue Jan 10 04:19:36 2012 (r229920) @@ -60,6 +60,8 @@ options PRINTF_BUFR_SIZE=128 # Prevent options KBD_INSTALL_CDEV # install a CDEV entry in /dev options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing +options CAPABILITY_MODE # Capsicum capability mode +options CAPABILITIES # Capsicum capabilities options MAC # TrustedBSD MAC Framework #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks Modified: projects/nfsv4.1-client/sys/amd64/conf/NOTES ============================================================================== --- projects/nfsv4.1-client/sys/amd64/conf/NOTES Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/conf/NOTES Tue Jan 10 04:19:36 2012 (r229920) @@ -388,6 +388,10 @@ device aac device aacp # SCSI Passthrough interface (optional, CAM required) # +# Highpoint RocketRAID 27xx. +device hpt27xx + +# # Highpoint RocketRAID 182x. device hptmv Modified: projects/nfsv4.1-client/sys/amd64/linux32/linux.h ============================================================================== --- projects/nfsv4.1-client/sys/amd64/linux32/linux.h Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/linux32/linux.h Tue Jan 10 04:19:36 2012 (r229920) @@ -597,6 +597,16 @@ int linux_ioctl_unregister_handler(struc #define LINUX_F_UNLCK 2 /* + * posix_fadvise advice + */ +#define LINUX_POSIX_FADV_NORMAL 0 +#define LINUX_POSIX_FADV_RANDOM 1 +#define LINUX_POSIX_FADV_SEQUENTIAL 2 +#define LINUX_POSIX_FADV_WILLNEED 3 +#define LINUX_POSIX_FADV_DONTNEED 4 +#define LINUX_POSIX_FADV_NOREUSE 5 + +/* * mount flags */ #define LINUX_MS_RDONLY 0x0001 Modified: projects/nfsv4.1-client/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- projects/nfsv4.1-client/sys/amd64/linux32/linux32_dummy.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/linux32/linux32_dummy.c Tue Jan 10 04:19:36 2012 (r229920) @@ -59,7 +59,6 @@ DUMMY(setfsuid); DUMMY(setfsgid); DUMMY(pivot_root); DUMMY(mincore); -DUMMY(fadvise64); DUMMY(ptrace); DUMMY(lookup_dcookie); DUMMY(epoll_create); @@ -72,7 +71,6 @@ DUMMY(timer_gettime); DUMMY(timer_getoverrun); DUMMY(timer_delete); DUMMY(fstatfs64); -DUMMY(fadvise64_64); DUMMY(mbind); DUMMY(get_mempolicy); DUMMY(set_mempolicy); Modified: projects/nfsv4.1-client/sys/amd64/linux32/linux32_proto.h ============================================================================== --- projects/nfsv4.1-client/sys/amd64/linux32/linux32_proto.h Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/linux32/linux32_proto.h Tue Jan 10 04:19:36 2012 (r229920) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693 2011-11-19 07:19:37Z ed + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957 2011-12-29 15:34:59Z jhb */ #ifndef _LINUX_SYSPROTO_H_ @@ -756,7 +756,10 @@ struct linux_set_thread_area_args { char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)]; }; struct linux_fadvise64_args { - register_t dummy; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)]; + char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; + char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)]; }; struct linux_exit_group_args { char error_code_l_[PADL_(int)]; int error_code; char error_code_r_[PADR_(int)]; @@ -830,7 +833,10 @@ struct linux_utimes_args { char tptr_l_[PADL_(struct l_timeval *)]; struct l_timeval * tptr; char tptr_r_[PADR_(struct l_timeval *)]; }; struct linux_fadvise64_64_args { - register_t dummy; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)]; + char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)]; + char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)]; }; struct linux_mbind_args { register_t dummy; Modified: projects/nfsv4.1-client/sys/amd64/linux32/linux32_syscall.h ============================================================================== --- projects/nfsv4.1-client/sys/amd64/linux32/linux32_syscall.h Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/linux32/linux32_syscall.h Tue Jan 10 04:19:36 2012 (r229920) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693 2011-11-19 07:19:37Z ed + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957 2011-12-29 15:34:59Z jhb */ #define LINUX_SYS_exit 1 Modified: projects/nfsv4.1-client/sys/amd64/linux32/linux32_syscalls.c ============================================================================== --- projects/nfsv4.1-client/sys/amd64/linux32/linux32_syscalls.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/linux32/linux32_syscalls.c Tue Jan 10 04:19:36 2012 (r229920) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693 2011-11-19 07:19:37Z ed + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957 2011-12-29 15:34:59Z jhb */ const char *linux_syscallnames[] = { Modified: projects/nfsv4.1-client/sys/amd64/linux32/linux32_sysent.c ============================================================================== --- projects/nfsv4.1-client/sys/amd64/linux32/linux32_sysent.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/linux32/linux32_sysent.c Tue Jan 10 04:19:36 2012 (r229920) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693 2011-11-19 07:19:37Z ed + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957 2011-12-29 15:34:59Z jhb */ #include "opt_compat.h" @@ -269,7 +269,7 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 247 = linux_io_getevents */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 248 = linux_io_submit */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 250 = linux_fadvise64 */ + { AS(linux_fadvise64_args), (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 251 = */ { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 252 = linux_exit_group */ { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 253 = linux_lookup_dcookie */ @@ -291,7 +291,7 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 269 = linux_fstatfs64 */ { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 270 = linux_tgkill */ { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = linux_fadvise64_64 */ + { AS(linux_fadvise64_64_args), (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = linux_fadvise64_64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 273 = */ { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 274 = linux_mbind */ { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = linux_get_mempolicy */ Modified: projects/nfsv4.1-client/sys/amd64/linux32/linux32_systrace_args.c ============================================================================== --- projects/nfsv4.1-client/sys/amd64/linux32/linux32_systrace_args.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/linux32/linux32_systrace_args.c Tue Jan 10 04:19:36 2012 (r229920) @@ -1674,7 +1674,12 @@ systrace_args(int sysnum, void *params, } /* linux_fadvise64 */ case 250: { - *n_args = 0; + struct linux_fadvise64_args *p = params; + iarg[0] = p->fd; /* int */ + iarg[1] = p->offset; /* l_loff_t */ + iarg[2] = p->len; /* l_size_t */ + iarg[3] = p->advice; /* int */ + *n_args = 4; break; } /* linux_exit_group */ @@ -1808,7 +1813,12 @@ systrace_args(int sysnum, void *params, } /* linux_fadvise64_64 */ case 272: { - *n_args = 0; + struct linux_fadvise64_64_args *p = params; + iarg[0] = p->fd; /* int */ + iarg[1] = p->offset; /* l_loff_t */ + iarg[2] = p->len; /* l_loff_t */ + iarg[3] = p->advice; /* int */ + *n_args = 4; break; } /* linux_mbind */ @@ -4614,6 +4624,22 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_fadvise64 */ case 250: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "l_loff_t"; + break; + case 2: + p = "l_size_t"; + break; + case 3: + p = "int"; + break; + default: + break; + }; break; /* linux_exit_group */ case 252: @@ -4773,6 +4799,22 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_fadvise64_64 */ case 272: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "l_loff_t"; + break; + case 2: + p = "l_loff_t"; + break; + case 3: + p = "int"; + break; + default: + break; + }; break; /* linux_mbind */ case 274: @@ -6089,6 +6131,9 @@ systrace_return_setargdesc(int sysnum, i break; /* linux_fadvise64 */ case 250: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_exit_group */ case 252: if (ndx == 0 || ndx == 1) @@ -6158,6 +6203,9 @@ systrace_return_setargdesc(int sysnum, i break; /* linux_fadvise64_64 */ case 272: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_mbind */ case 274: /* linux_get_mempolicy */ Modified: projects/nfsv4.1-client/sys/amd64/linux32/syscalls.master ============================================================================== --- projects/nfsv4.1-client/sys/amd64/linux32/syscalls.master Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/amd64/linux32/syscalls.master Tue Jan 10 04:19:36 2012 (r229920) @@ -419,7 +419,8 @@ 247 AUE_NULL UNIMPL linux_io_getevents 248 AUE_NULL UNIMPL linux_io_submit 249 AUE_NULL UNIMPL linux_io_cancel -250 AUE_NULL STD { int linux_fadvise64(void); } +250 AUE_NULL STD { int linux_fadvise64(int fd, l_loff_t offset, \ + l_size_t len, int advice); } 251 AUE_NULL UNIMPL 252 AUE_EXIT STD { int linux_exit_group(int error_code); } 253 AUE_NULL STD { int linux_lookup_dcookie(void); } @@ -443,7 +444,9 @@ 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } 271 AUE_UTIMES STD { int linux_utimes(char *fname, \ struct l_timeval *tptr); } -272 AUE_NULL STD { int linux_fadvise64_64(void); } +272 AUE_NULL STD { int linux_fadvise64_64(int fd, \ + l_loff_t offset, l_loff_t len, \ + int advice); } 273 AUE_NULL UNIMPL 274 AUE_NULL STD { int linux_mbind(void); } 275 AUE_NULL STD { int linux_get_mempolicy(void); } Modified: projects/nfsv4.1-client/sys/arm/conf/KB920X ============================================================================== --- projects/nfsv4.1-client/sys/arm/conf/KB920X Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/arm/conf/KB920X Tue Jan 10 04:19:36 2012 (r229920) @@ -138,3 +138,6 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm +options IEEE80211_SUPPORT_MESH + +options AH_SUPPORT_AR5416 Modified: projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixdp425_pci.c ============================================================================== --- projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixdp425_pci.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixdp425_pci.c Tue Jan 10 04:19:36 2012 (r229920) @@ -43,6 +43,9 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/malloc.h> #include <sys/rman.h> + +#include <dev/pci/pcivar.h> + #include <machine/bus.h> #include <machine/intr.h> Modified: projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixp425_pci.c ============================================================================== --- projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixp425_pci.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixp425_pci.c Tue Jan 10 04:19:36 2012 (r229920) @@ -45,9 +45,12 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/rman.h> +#include <dev/pci/pcivar.h> + #include <machine/bus.h> #include <machine/cpu.h> #include <machine/pcb.h> + #include <vm/vm.h> #include <vm/pmap.h> #include <vm/vm_extern.h> Modified: projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixp425var.h ============================================================================== --- projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixp425var.h Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/arm/xscale/ixp425/ixp425var.h Tue Jan 10 04:19:36 2012 (r229920) @@ -44,7 +44,6 @@ #include <machine/bus.h> -#include <dev/pci/pcivar.h> #include <sys/rman.h> /* NB: cputype is setup by set_cpufuncs */ Modified: projects/nfsv4.1-client/sys/boot/common/interp_parse.c ============================================================================== --- projects/nfsv4.1-client/sys/boot/common/interp_parse.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/boot/common/interp_parse.c Tue Jan 10 04:19:36 2012 (r229920) @@ -137,7 +137,7 @@ parse(int *argc, char ***argv, char *str case VAR: if (token) { - PARSE_FAIL((q = index(p, token)) == NULL); + PARSE_FAIL((q = strchr(p, token)) == NULL); } else { q = p; while (*q && !isspace(*q)) Modified: projects/nfsv4.1-client/sys/boot/common/loader.8 ============================================================================== --- projects/nfsv4.1-client/sys/boot/common/loader.8 Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/boot/common/loader.8 Tue Jan 10 04:19:36 2012 (r229920) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2009 +.Dd January 7, 2012 .Dt LOADER 8 .Os .Sh NAME @@ -419,6 +419,43 @@ was compiled. Changes to the .Va comconsole_speed variable take effect immediately. +.It Va comconsole_port +Defines the base i/o port used to access console UART +(i386 and amd64 only). +If the variable is not set, its assumed value is 0x3F8, which +corresponds to PC port COM1, unless overriden by +.Va BOOT_COMCONSOLE_PORT +variable during the compilation of +.Nm . +Setting the +.Va comconsole_port +variable automatically set +.Va hw.uart.console +environment variable to provide a hint to kernel for location of the console. +Loader console is changed immediately after variable +.Va comconsole_port +is set. +.It Va comconsole_pcidev +Defines the location of a PCI device of the 'simple communication' +class to be used as the serial console UART (i386 and amd64 only). +The syntax of the variable is +.Li 'bus:device:function[:bar]' , +where all members must be numeric, with possible +.Li 0x +prefix to indicate a hexadecimal value. +The +.Va bar +member is optional and assumed to be 0x10 if omitted. +The bar must decode i/o space. +Setting the variable +.Va comconsole_pcidev +automatically sets the variable +.Va comconsole_port +to the base of the selected bar, and hint +.Va hw.uart.console . +Loader console is changed immediately after variable +.Va comconsole_pcidev +is set. .It Va console Defines the current console or consoles. Multiple consoles may be specified. @@ -926,10 +963,10 @@ autoboot 5 .Pp Set the disk unit of the root device to 2, and then boot. This would be needed in a system with two IDE disks, -with the second IDE disk hardwired to wd2 instead of wd1. +with the second IDE disk hardwired to ad2 instead of ad1. .Bd -literal -offset indent set root_disk_unit=2 -boot /kernel +boot /boot/kernel/kernel .Ed .Pp See also: Modified: projects/nfsv4.1-client/sys/boot/forth/loader.4th ============================================================================== --- projects/nfsv4.1-client/sys/boot/forth/loader.4th Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/boot/forth/loader.4th Tue Jan 10 04:19:36 2012 (r229920) @@ -41,12 +41,26 @@ s" arch-i386" environment? [if] [if] include /boot/support.4th -\ ***** boot-conf -\ -\ Prepares to boot as specified by loaded configuration files. - only forth also support-functions also builtins definitions +: try-menu-unset + \ menu-unset may not be present + s" beastie_disable" getenv + dup -1 <> if + s" YES" compare-insensitive 0= if + exit + then + else + drop + then + s" menu-unset" + sfind if + execute + else + drop + then +; + : boot 0= if ( interpreted ) get_arguments then @@ -57,24 +71,32 @@ only forth also support-functions also b 0 1 unload drop else s" kernelname" getenv? if ( a kernel has been loaded ) + try-menu-unset 1 boot exit then load_kernel_and_modules ?dup if exit then + try-menu-unset 0 1 boot exit then else s" kernelname" getenv? if ( a kernel has been loaded ) + try-menu-unset 1 boot exit then load_kernel_and_modules ?dup if exit then + try-menu-unset 0 1 boot exit then load_kernel_and_modules ?dup 0= if 0 1 boot then ; +\ ***** boot-conf +\ +\ Prepares to boot as specified by loaded configuration files. + : boot-conf 0= if ( interpreted ) get_arguments then 0 1 unload drop Modified: projects/nfsv4.1-client/sys/boot/forth/menu.4th ============================================================================== --- projects/nfsv4.1-client/sys/boot/forth/menu.4th Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/boot/forth/menu.4th Tue Jan 10 04:19:36 2012 (r229920) @@ -131,11 +131,11 @@ create init_text8 255 allot \ Print the value of menuidx loader_color? if - ." [1m" + ." [1m" ( [22m ) then menuidx @ . loader_color? if - ." [37m" + ." [37m" ( [39m ) then \ Move the cursor forward 1 column @@ -897,22 +897,60 @@ create init_text8 255 allot ; \ This function unsets all the possible environment variables associated with -\ creating the interactive menu. Call this when you want to clear the menu -\ area in preparation for another menu. +\ creating the interactive menu. \ -: menu-clear ( -- ) +: menu-unset ( -- ) 49 \ Iterator start (loop range 49 to 56; ASCII '1' to '8') begin - \ basename for caption variable - loader_color? if - s" ansi_caption[x]" - else - s" menu_caption[x]" - then + \ Unset variables in-order of appearance in menu.4th(8) + + s" menu_caption[x]" \ basename for caption variable -rot 2dup 13 + c! rot \ replace 'x' with current iteration unsetenv \ not erroneous to unset unknown var + s" menu_command[x]" \ command basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s" menu_keycode[x]" \ keycode basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s" ansi_caption[x]" \ ANSI caption basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s" toggled_text[x]" \ toggle_menuitem caption basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s" toggled_ansi[x]" \ toggle_menuitem ANSI caption basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s" menu_caption[x][y]" \ cycle_menuitem caption + -rot 2dup 13 + c! rot \ replace 'x' + 49 -rot + begin + 16 2over rot + c! \ replace 'y' + 2dup unsetenv + + rot 1+ dup 56 > 2swap rot + until + 2drop drop + + s" ansi_caption[x][y]" \ cycle_menuitem ANSI caption + -rot 2dup 13 + c! rot \ replace 'x' + 49 -rot + begin + 16 2over rot + c! \ replace 'y' + 2dup unsetenv + + rot 1+ dup 56 > 2swap rot + until + 2drop drop + s" 0 menukeyN !" \ basename for key association var -rot 2dup 9 + c! rot \ replace 'N' with current iteration evaluate \ assign zero (0) to key assoc. var @@ -921,6 +959,9 @@ create init_text8 255 allot until drop \ iterator + \ unset the timeout command + s" menu_timeout_command" unsetenv + \ clear the "Reboot" menu option flag s" menu_reboot" unsetenv 0 menureboot ! @@ -933,6 +974,13 @@ create init_text8 255 allot s" menu_options" unsetenv 0 menuoptions ! +; + +\ This function both unsets menu variables and visually erases the menu area +\ in-preparation for another menu. +\ +: menu-clear ( -- ) + menu-unset menu-erase ; Modified: projects/nfsv4.1-client/sys/boot/forth/menu.4th.8 ============================================================================== --- projects/nfsv4.1-client/sys/boot/forth/menu.4th.8 Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/boot/forth/menu.4th.8 Tue Jan 10 04:19:36 2012 (r229920) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Aug 29, 2011 +.Dd Dec 27, 2011 .Dt MENU.4TH 8 .Os .Sh NAME @@ -69,9 +69,13 @@ Clears the screen area within the menu b Calls .Ic menu-erase and then redraws the menu. +.It Ic menu-unset +Unsets the environment variables associated with individual menu items, +clearing the way for a new menu. .It Ic menu-clear -Unsets all possible environment variables used -to configure the menu and then calls +Calls +.Ic menu-unset +and then .Ic menu-erase . .El .Pp Modified: projects/nfsv4.1-client/sys/boot/i386/libi386/biospci.c ============================================================================== --- projects/nfsv4.1-client/sys/boot/i386/libi386/biospci.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/boot/i386/libi386/biospci.c Tue Jan 10 04:19:36 2012 (r229920) @@ -342,3 +342,9 @@ biospci_read_config(uint32_t locator, in return (0); } +uint32_t +biospci_locator(int8_t bus, uint8_t device, uint8_t function) +{ + + return ((bus << 8) | ((device & 0x1f) << 3) | (function & 0x7)); +} Modified: projects/nfsv4.1-client/sys/boot/i386/libi386/comconsole.c ============================================================================== --- projects/nfsv4.1-client/sys/boot/i386/libi386/comconsole.c Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/boot/i386/libi386/comconsole.c Tue Jan 10 04:19:36 2012 (r229920) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include <bootstrap.h> #include <machine/cpufunc.h> #include <dev/ic/ns16550.h> +#include <dev/pci/pcireg.h> #include "libi386.h" #define COMC_FMT 0x3 /* 8N1 */ @@ -49,14 +50,23 @@ static int comc_init(int arg); static void comc_putchar(int c); static int comc_getchar(void); static int comc_getspeed(void); +static void set_hw_console_hint(void); static int comc_ischar(void); -static int comc_parsespeed(const char *string); -static void comc_setup(int speed); +static int comc_parseint(const char *string); +static uint32_t comc_parse_pcidev(const char *string); +static int comc_pcidev_set(struct env_var *ev, int flags, + const void *value); +static int comc_pcidev_handle(uint32_t locator); +static int comc_port_set(struct env_var *ev, int flags, + const void *value); +static void comc_setup(int speed, int port); static int comc_speed_set(struct env_var *ev, int flags, const void *value); static int comc_started; static int comc_curspeed; +static int comc_port = COMPORT; +static uint32_t comc_locator; struct console comconsole = { "comconsole", @@ -72,9 +82,10 @@ struct console comconsole = { static void comc_probe(struct console *cp) { - char speedbuf[16]; - char *cons, *speedenv; - int speed; + char intbuf[16]; + char *cons, *env; + int speed, port; + uint32_t locator; /* XXX check the BIOS equipment list? */ cp->c_flags |= (C_PRESENTIN | C_PRESENTOUT); @@ -90,16 +101,40 @@ comc_probe(struct console *cp) getenv("boot_multicons") != NULL) { comc_curspeed = comc_getspeed(); } - speedenv = getenv("comconsole_speed"); - if (speedenv != NULL) { - speed = comc_parsespeed(speedenv); + + env = getenv("comconsole_speed"); + if (env != NULL) { + speed = comc_parseint(env); if (speed > 0) comc_curspeed = speed; } - sprintf(speedbuf, "%d", comc_curspeed); + sprintf(intbuf, "%d", comc_curspeed); unsetenv("comconsole_speed"); - env_setenv("comconsole_speed", EV_VOLATILE, speedbuf, comc_speed_set, + env_setenv("comconsole_speed", EV_VOLATILE, intbuf, comc_speed_set, + env_nounset); + + env = getenv("comconsole_port"); + if (env != NULL) { + port = comc_parseint(env); + if (port > 0) + comc_port = port; + } + + sprintf(intbuf, "%d", comc_port); + unsetenv("comconsole_port"); + env_setenv("comconsole_port", EV_VOLATILE, intbuf, comc_port_set, + env_nounset); + + env = getenv("comconsole_pcidev"); + if (env != NULL) { + locator = comc_parse_pcidev(env); + if (locator != 0) + comc_pcidev_handle(locator); + } + + unsetenv("comconsole_pcidev"); + env_setenv("comconsole_pcidev", EV_VOLATILE, env, comc_pcidev_set, env_nounset); } } @@ -111,7 +146,7 @@ comc_init(int arg) return 0; comc_started = 1; - comc_setup(comc_curspeed); + comc_setup(comc_curspeed, comc_port); return(0); } @@ -122,8 +157,8 @@ comc_putchar(int c) int wait; for (wait = COMC_TXWAIT; wait > 0; wait--) - if (inb(COMPORT + com_lsr) & LSR_TXRDY) { - outb(COMPORT + com_data, (u_char)c); + if (inb(comc_port + com_lsr) & LSR_TXRDY) { + outb(comc_port + com_data, (u_char)c); break; } } @@ -131,13 +166,13 @@ comc_putchar(int c) static int comc_getchar(void) { - return(comc_ischar() ? inb(COMPORT + com_data) : -1); + return(comc_ischar() ? inb(comc_port + com_data) : -1); } static int comc_ischar(void) { - return(inb(COMPORT + com_lsr) & LSR_RXRDY); + return(inb(comc_port + com_lsr) & LSR_RXRDY); } static int @@ -145,13 +180,33 @@ comc_speed_set(struct env_var *ev, int f { int speed; - if (value == NULL || (speed = comc_parsespeed(value)) <= 0) { + if (value == NULL || (speed = comc_parseint(value)) <= 0) { printf("Invalid speed\n"); return (CMD_ERROR); } if (comc_started && comc_curspeed != speed) - comc_setup(speed); + comc_setup(speed, comc_port); + + env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); + + return (CMD_OK); +} + +static int +comc_port_set(struct env_var *ev, int flags, const void *value) +{ + int port; + + if (value == NULL || (port = comc_parseint(value)) <= 0) { + printf("Invalid port\n"); + return (CMD_ERROR); + } + + if (comc_started && comc_port != port) { + comc_setup(comc_curspeed, port); + set_hw_console_hint(); + } env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); @@ -159,24 +214,126 @@ comc_speed_set(struct env_var *ev, int f } static void -comc_setup(int speed) +set_hw_console_hint(void) +{ + char intbuf[64]; + + unsetenv("hw.uart.console"); + sprintf(intbuf, "io:%d,br:%d", comc_port, comc_curspeed); + env_setenv("hw.uart.console", EV_VOLATILE, intbuf, + env_noset, env_nounset); +} + +/* + * Input: bus:dev:func[:bar]. If bar is not specified, it is 0x10. + * Output: bar[24:16] bus[15:8] dev[7:3] func[2:0] + */ +static uint32_t +comc_parse_pcidev(const char *string) +{ + char *p, *p1; + uint8_t bus, dev, func, bar; + uint32_t locator; + int pres; + + pres = strtol(string, &p, 0); + if (p == string || *p != ':' || pres < 0 ) + return (0); + bus = pres; + p1 = ++p; + + pres = strtol(p1, &p, 0); + if (p == string || *p != ':' || pres < 0 ) + return (0); + dev = pres; + p1 = ++p; + + pres = strtol(p1, &p, 0); + if (p == string || (*p != ':' && *p != '\0') || pres < 0 ) + return (0); + func = pres; + + if (*p == ':') { + p1 = ++p; + pres = strtol(p1, &p, 0); + if (p == string || *p != '\0' || pres <= 0 ) + return (0); + bar = pres; + } else + bar = 0x10; + + locator = (bar << 16) | biospci_locator(bus, dev, func); + return (locator); +} + +static int +comc_pcidev_handle(uint32_t locator) +{ + char intbuf[64]; + uint32_t port; + + if (biospci_read_config(locator & 0xffff, + (locator & 0xff0000) >> 16, 2, &port) == -1) { + printf("Cannot read bar at 0x%x\n", locator); + return (CMD_ERROR); + } + if (!PCI_BAR_IO(port)) { + printf("Memory bar at 0x%x\n", locator); + return (CMD_ERROR); + } + port &= PCIM_BAR_IO_BASE; + + sprintf(intbuf, "%d", port); + unsetenv("comconsole_port"); + env_setenv("comconsole_port", EV_VOLATILE, intbuf, + comc_port_set, env_nounset); + + comc_setup(comc_curspeed, port); + set_hw_console_hint(); + comc_locator = locator; + + return (CMD_OK); +} + +static int +comc_pcidev_set(struct env_var *ev, int flags, const void *value) +{ + uint32_t locator; + int error; + + if (value == NULL || (locator = comc_parse_pcidev(value)) <= 0) { + printf("Invalid pcidev\n"); + return (CMD_ERROR); + } + if (comc_started && comc_locator != locator) { + error = comc_pcidev_handle(locator); + if (error != CMD_OK) + return (error); + } + env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); + return (CMD_OK); +} + +static void +comc_setup(int speed, int port) { comc_curspeed = speed; + comc_port = port; - outb(COMPORT + com_cfcr, CFCR_DLAB | COMC_FMT); - outb(COMPORT + com_dlbl, COMC_BPS(speed) & 0xff); - outb(COMPORT + com_dlbh, COMC_BPS(speed) >> 8); - outb(COMPORT + com_cfcr, COMC_FMT); - outb(COMPORT + com_mcr, MCR_RTS | MCR_DTR); + outb(comc_port + com_cfcr, CFCR_DLAB | COMC_FMT); + outb(comc_port + com_dlbl, COMC_BPS(speed) & 0xff); + outb(comc_port + com_dlbh, COMC_BPS(speed) >> 8); + outb(comc_port + com_cfcr, COMC_FMT); + outb(comc_port + com_mcr, MCR_RTS | MCR_DTR); do - inb(COMPORT + com_data); - while (inb(COMPORT + com_lsr) & LSR_RXRDY); + inb(comc_port + com_data); + while (inb(comc_port + com_lsr) & LSR_RXRDY); } static int -comc_parsespeed(const char *speedstr) +comc_parseint(const char *speedstr) { char *p; int speed; @@ -196,13 +353,13 @@ comc_getspeed(void) u_char dlbl; u_char cfcr; - cfcr = inb(COMPORT + com_cfcr); - outb(COMPORT + com_cfcr, CFCR_DLAB | cfcr); + cfcr = inb(comc_port + com_cfcr); + outb(comc_port + com_cfcr, CFCR_DLAB | cfcr); - dlbl = inb(COMPORT + com_dlbl); - dlbh = inb(COMPORT + com_dlbh); + dlbl = inb(comc_port + com_dlbl); + dlbh = inb(comc_port + com_dlbh); - outb(COMPORT + com_cfcr, cfcr); + outb(comc_port + com_cfcr, cfcr); divisor = dlbh << 8 | dlbl; Modified: projects/nfsv4.1-client/sys/boot/i386/libi386/libi386.h ============================================================================== --- projects/nfsv4.1-client/sys/boot/i386/libi386/libi386.h Tue Jan 10 02:59:58 2012 (r229919) +++ projects/nfsv4.1-client/sys/boot/i386/libi386/libi386.h Tue Jan 10 04:19:36 2012 (r229920) @@ -97,6 +97,7 @@ extern vm_offset_t high_heap_base; /* fo int biospci_find_devclass(uint32_t class, int index, uint32_t *locator); int biospci_write_config(uint32_t locator, int offset, int width, uint32_t val); int biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val); +uint32_t biospci_locator(int8_t bus, uint8_t device, uint8_t function); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201100419.q0A4JbUB085627>