From owner-svn-src-projects@FreeBSD.ORG Tue Jan 10 02:21:49 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 334E81065673; Tue, 10 Jan 2012 02:21:49 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 04D418FC19; Tue, 10 Jan 2012 02:21:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0A2LmHc077357; Tue, 10 Jan 2012 02:21:48 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0A2Lmtw077355; Tue, 10 Jan 2012 02:21:48 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201201100221.q0A2Lmtw077355@svn.freebsd.org> From: Lawrence Stewart Date: Tue, 10 Jan 2012 02:21:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229903 - projects/diffused_head/sys/netinet/ipfw X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2012 02:21:49 -0000 Author: lstewart Date: Tue Jan 10 02:21:48 2012 New Revision: 229903 URL: http://svn.freebsd.org/changeset/base/229903 Log: Fix more places to use the correct structure types (_ctl_) for kernel/userspace control messages which were not caught during refactoring. Submitted by: Nigel Williams Modified: projects/diffused_head/sys/netinet/ipfw/ip_diffuse.c Modified: projects/diffused_head/sys/netinet/ipfw/ip_diffuse.c ============================================================================== --- projects/diffused_head/sys/netinet/ipfw/ip_diffuse.c Tue Jan 10 02:16:38 2012 (r229902) +++ projects/diffused_head/sys/netinet/ipfw/ip_diffuse.c Tue Jan 10 02:21:48 2012 (r229903) @@ -536,7 +536,7 @@ export_instance_used(void) } static int -add_export_instance(const char *name, struct di_export *e_conf, +add_export_instance(const char *name, struct di_ctl_export *e_conf, struct socket *sock) { struct di_export *s, *e; @@ -1490,7 +1490,7 @@ config_feature(struct di_ctl_feature *f, /* Config export. */ static int -config_export(struct di_export *e, struct di_oid *arg) +config_export(struct di_ctl_export *e, struct di_oid *arg) { struct socket *sock; int ret; @@ -1854,13 +1854,13 @@ get_info(struct sockopt *sopt) if (oid.subtype == DI_FEATURE) { DID("show feature"); - l += sizeof(struct di_feature); + l += sizeof(struct di_ctl_feature); } else if (oid.subtype == DI_CLASSIFIER) { DID("show classifier"); - l += sizeof(struct di_classifier); + l += sizeof(struct di_ctl_classifier); } else if (oid.subtype == DI_EXPORT) { DID("show export"); - l += sizeof(struct di_export); + l += sizeof(struct di_ctl_export); } else { DID("show flow table"); } @@ -2079,7 +2079,7 @@ do_config(void *p, int l) DID("delete feature"); DI_WLOCK(); err = remove_feature_instance( - ((struct di_feature *)o)->name); + ((struct di_ctl_feature *)o)->name); DI_UNLOCK(); } break; @@ -2099,7 +2099,7 @@ do_config(void *p, int l) DID("delete classifier"); DI_WLOCK(); err = remove_classifier_instance( - ((struct di_classifier *)o)->name); + ((struct di_ctl_classifier *)o)->name); DI_UNLOCK(); } break; @@ -2107,12 +2107,13 @@ do_config(void *p, int l) case DI_EXPORT: if (action == DI_CMD_CONFIG) { DID("configure export"); - err = config_export((struct di_export *)o, arg); + err = config_export((struct di_ctl_export *)o, + arg); } else if (action == DI_CMD_DELETE) { DID("delete export"); DI_WLOCK(); err = remove_export_instance( - ((struct di_export *)o)->name); + ((struct di_ctl_export *)o)->name); DI_UNLOCK(); } break; From owner-svn-src-projects@FreeBSD.ORG Tue Jan 10 04:19:38 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5796F106564A; Tue, 10 Jan 2012 04:19:38 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3CC8E8FC0C; Tue, 10 Jan 2012 04:19:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0A4Jc55085654; Tue, 10 Jan 2012 04:19:38 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0A4JbUB085627; Tue, 10 Jan 2012 04:19:37 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201201100419.q0A4JbUB085627@svn.freebsd.org> From: Rick Macklem Date: Tue, 10 Jan 2012 04:19:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: 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... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2012 04:19:38 -0000 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 #include #include + +#include + #include #include 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 #include +#include + #include #include #include + #include #include #include 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 -#include #include /* 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 - ." " + ." " (  ) then menuidx @ . loader_color? if - ." " + ." " (  ) 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 #include #include +#include #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 *** From owner-svn-src-projects@FreeBSD.ORG Wed Jan 11 01:42:16 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5A391065672; Wed, 11 Jan 2012 01:42:16 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C05958FC20; Wed, 11 Jan 2012 01:42:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0B1gGKL036764; Wed, 11 Jan 2012 01:42:16 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0B1gGON036761; Wed, 11 Jan 2012 01:42:16 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201201110142.q0B1gGON036761@svn.freebsd.org> From: Peter Grehan Date: Wed, 11 Jan 2012 01:42:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229954 - projects/bhyve/sys/dev/aic7xxx/aicasm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2012 01:42:16 -0000 Author: grehan Date: Wed Jan 11 01:42:16 2012 New Revision: 229954 URL: http://svn.freebsd.org/changeset/base/229954 Log: Revert r228556 - this breaks building on 8.*, and I still use these systems daily to do CURRENT development. Modified: projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l Modified: projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l ============================================================================== --- projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l Wed Jan 11 01:24:35 2012 (r229953) +++ projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l Wed Jan 11 01:42:16 2012 (r229954) @@ -66,8 +66,6 @@ static char msgbuf[255]; extern int mmlex(void); %} -%option noinput - WORD [A-Za-z_][-A-Za-z_0-9]* SPACE [ \t]+ MCARG [^(), \t]+ Modified: projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l ============================================================================== --- projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l Wed Jan 11 01:24:35 2012 (r229953) +++ projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l Wed Jan 11 01:42:16 2012 (r229954) @@ -72,8 +72,6 @@ extern void mm_switch_to_buffer(YY_BUFFE extern void mm_delete_buffer(YY_BUFFER_STATE); %} -%option noinput - PATH ([/]*[-A-Za-z0-9_.])+ WORD [A-Za-z_][-A-Za-z_0-9]* SPACE [ \t]+ From owner-svn-src-projects@FreeBSD.ORG Thu Jan 12 17:06:46 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BE54106566C; Thu, 12 Jan 2012 17:06:46 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7B7858FC17; Thu, 12 Jan 2012 17:06:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0CH6k2i018789; Thu, 12 Jan 2012 17:06:46 GMT (envelope-from andreast@svn.freebsd.org) Received: (from andreast@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0CH6kWN018787; Thu, 12 Jan 2012 17:06:46 GMT (envelope-from andreast@svn.freebsd.org) Message-Id: <201201121706.q0CH6kWN018787@svn.freebsd.org> From: Andreas Tobler Date: Thu, 12 Jan 2012 17:06:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230022 - projects/pseries/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 17:06:46 -0000 Author: andreast Date: Thu Jan 12 17:06:46 2012 New Revision: 230022 URL: http://svn.freebsd.org/changeset/base/230022 Log: Remove not existing file. Modified: projects/pseries/conf/files.powerpc Modified: projects/pseries/conf/files.powerpc ============================================================================== --- projects/pseries/conf/files.powerpc Thu Jan 12 16:51:56 2012 (r230021) +++ projects/pseries/conf/files.powerpc Thu Jan 12 17:06:46 2012 (r230022) @@ -94,7 +94,6 @@ powerpc/aim/swtch64.S optional aim powe powerpc/aim/trap.c optional aim powerpc/aim/uma_machdep.c optional aim powerpc/aim/vm_machdep.c optional aim -powerpc/cell/celliic.c optional aim powerpc/booke/clock.c optional e500 powerpc/booke/copyinout.c optional e500 powerpc/booke/interrupt.c optional e500 From owner-svn-src-projects@FreeBSD.ORG Thu Jan 12 22:30:43 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88042106564A; Thu, 12 Jan 2012 22:30:43 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 721AC8FC0A; Thu, 12 Jan 2012 22:30:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0CMUhYN029431; Thu, 12 Jan 2012 22:30:43 GMT (envelope-from andreast@svn.freebsd.org) Received: (from andreast@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0CMUgRu029392; Thu, 12 Jan 2012 22:30:42 GMT (envelope-from andreast@svn.freebsd.org) Message-Id: <201201122230.q0CMUgRu029392@svn.freebsd.org> From: Andreas Tobler Date: Thu, 12 Jan 2012 22:30:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230036 - in projects/pseries: . amd64/amd64 amd64/conf amd64/include amd64/linux32 arm/arm arm/conf arm/econa arm/include arm/mv arm/xscale/i80321 arm/xscale/i8134x arm/xscale/ixp425 b... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 22:30:43 -0000 Author: andreast Date: Thu Jan 12 22:30:41 2012 New Revision: 230036 URL: http://svn.freebsd.org/changeset/base/230036 Log: IFC 230026 Added: projects/pseries/cam/ctl/ - copied from r230026, head/sys/cam/ctl/ projects/pseries/contrib/dev/acpica/compiler/aslrestype2s.c - copied unchanged from r230026, head/sys/contrib/dev/acpica/compiler/aslrestype2s.c projects/pseries/contrib/dev/acpica/disassembler/dmresrcl2.c - copied unchanged from r230026, head/sys/contrib/dev/acpica/disassembler/dmresrcl2.c projects/pseries/contrib/dev/acpica/include/actbl3.h - copied unchanged from r230026, head/sys/contrib/dev/acpica/include/actbl3.h projects/pseries/contrib/dev/acpica/os_specific/ - copied from r230026, head/sys/contrib/dev/acpica/os_specific/ projects/pseries/contrib/dev/acpica/resources/rsserial.c - copied unchanged from r230026, head/sys/contrib/dev/acpica/resources/rsserial.c projects/pseries/contrib/dev/acpica/utilities/utaddress.c - copied unchanged from r230026, head/sys/contrib/dev/acpica/utilities/utaddress.c projects/pseries/contrib/dev/acpica/utilities/utxfmutex.c - copied unchanged from r230026, head/sys/contrib/dev/acpica/utilities/utxfmutex.c projects/pseries/contrib/xz-embedded/ - copied from r230026, head/sys/contrib/xz-embedded/ projects/pseries/dev/ath/if_ath_led.c - copied unchanged from r230026, head/sys/dev/ath/if_ath_led.c projects/pseries/dev/ath/if_ath_led.h - copied unchanged from r230026, head/sys/dev/ath/if_ath_led.h projects/pseries/dev/cxgbe/firmware/ - copied from r230026, head/sys/dev/cxgbe/firmware/ projects/pseries/dev/fb/splash_txt.c - copied unchanged from r230026, head/sys/dev/fb/splash_txt.c projects/pseries/dev/hpt27xx/ - copied from r230026, head/sys/dev/hpt27xx/ projects/pseries/dev/sound/pci/emuxkireg.h - copied unchanged from r230026, head/sys/dev/sound/pci/emuxkireg.h projects/pseries/dev/viawd/ - copied from r230026, head/sys/dev/viawd/ projects/pseries/dev/wtap/ - copied from r230026, head/sys/dev/wtap/ projects/pseries/geom/uncompress/ - copied from r230026, head/sys/geom/uncompress/ projects/pseries/libkern/memcchr.c - copied unchanged from r230026, head/sys/libkern/memcchr.c projects/pseries/libkern/strchr.c - copied unchanged from r230026, head/sys/libkern/strchr.c projects/pseries/libkern/strrchr.c - copied unchanged from r230026, head/sys/libkern/strrchr.c projects/pseries/mips/cavium/octeon_cop2.S - copied unchanged from r230026, head/sys/mips/cavium/octeon_cop2.S projects/pseries/mips/cavium/octeon_cop2.h - copied unchanged from r230026, head/sys/mips/cavium/octeon_cop2.h projects/pseries/mips/cavium/octeon_gpio.c - copied unchanged from r230026, head/sys/mips/cavium/octeon_gpio.c projects/pseries/mips/cavium/octeon_gpiovar.h - copied unchanged from r230026, head/sys/mips/cavium/octeon_gpiovar.h projects/pseries/mips/conf/AR71XX_BASE - copied unchanged from r230026, head/sys/mips/conf/AR71XX_BASE projects/pseries/mips/conf/AR71XX_BASE.hints - copied unchanged from r230026, head/sys/mips/conf/AR71XX_BASE.hints projects/pseries/mips/conf/PB47 - copied unchanged from r230026, head/sys/mips/conf/PB47 projects/pseries/mips/conf/PB47.hints - copied unchanged from r230026, head/sys/mips/conf/PB47.hints projects/pseries/mips/conf/ROUTERSTATION - copied unchanged from r230026, head/sys/mips/conf/ROUTERSTATION projects/pseries/mips/conf/ROUTERSTATION.hints - copied unchanged from r230026, head/sys/mips/conf/ROUTERSTATION.hints projects/pseries/mips/conf/ROUTERSTATION_MFS - copied unchanged from r230026, head/sys/mips/conf/ROUTERSTATION_MFS projects/pseries/mips/conf/RSPRO - copied unchanged from r230026, head/sys/mips/conf/RSPRO projects/pseries/mips/conf/RSPRO.hints - copied unchanged from r230026, head/sys/mips/conf/RSPRO.hints projects/pseries/mips/conf/RSPRO_MFS - copied unchanged from r230026, head/sys/mips/conf/RSPRO_MFS projects/pseries/mips/conf/RSPRO_STANDALONE - copied unchanged from r230026, head/sys/mips/conf/RSPRO_STANDALONE projects/pseries/mips/include/octeon_cop2.h - copied unchanged from r230026, head/sys/mips/include/octeon_cop2.h projects/pseries/mips/mips/octeon_cop2.c - copied unchanged from r230026, head/sys/mips/mips/octeon_cop2.c projects/pseries/mips/mips/octeon_cop2_swtch.S - copied unchanged from r230026, head/sys/mips/mips/octeon_cop2_swtch.S projects/pseries/mips/nlm/hal/nlm_hal.c - copied unchanged from r230026, head/sys/mips/nlm/hal/nlm_hal.c projects/pseries/modules/carp/ - copied from r230026, head/sys/modules/carp/ projects/pseries/modules/cfi/ - copied from r230026, head/sys/modules/cfi/ projects/pseries/modules/cxgbe/firmware/ - copied from r230026, head/sys/modules/cxgbe/firmware/ projects/pseries/modules/geom/geom_uncompress/ - copied from r230026, head/sys/modules/geom/geom_uncompress/ projects/pseries/modules/hpt27xx/ - copied from r230026, head/sys/modules/hpt27xx/ projects/pseries/modules/splash/txt/ - copied from r230026, head/sys/modules/splash/txt/ projects/pseries/modules/usb/avr32dci/ - copied from r230026, head/sys/modules/usb/avr32dci/ projects/pseries/modules/viawd/ - copied from r230026, head/sys/modules/viawd/ projects/pseries/modules/wtap/ - copied from r230026, head/sys/modules/wtap/ projects/pseries/sparc64/sparc64/cam_machdep.c - copied unchanged from r230026, head/sys/sparc64/sparc64/cam_machdep.c projects/pseries/sys/_kstack_cache.h - copied unchanged from r230026, head/sys/sys/_kstack_cache.h Deleted: projects/pseries/contrib/dev/acpica/osunixxf.c projects/pseries/contrib/dev/acpica/tools/ projects/pseries/dev/amd/ projects/pseries/dev/cxgbe/common/t4fw_interface.h projects/pseries/fs/ext2fs/ext2_readwrite.c projects/pseries/gnu/dev/sound/pci/emu10k1-alsa.h projects/pseries/gnu/dev/sound/pci/p16v-alsa.h projects/pseries/gnu/dev/sound/pci/p17v-alsa.h projects/pseries/libkern/gets.c projects/pseries/libkern/index.c projects/pseries/libkern/rindex.c projects/pseries/libkern/skpc.c projects/pseries/mips/conf/AR71XX projects/pseries/mips/conf/AR71XX.hints projects/pseries/modules/amd/ projects/pseries/modules/if_carp/ Modified: projects/pseries/Makefile projects/pseries/amd64/amd64/legacy.c projects/pseries/amd64/amd64/machdep.c projects/pseries/amd64/amd64/pmap.c projects/pseries/amd64/conf/GENERIC projects/pseries/amd64/conf/NOTES projects/pseries/amd64/include/_types.h projects/pseries/amd64/linux32/linux.h projects/pseries/amd64/linux32/linux32_dummy.c projects/pseries/amd64/linux32/linux32_proto.h projects/pseries/amd64/linux32/linux32_syscall.h projects/pseries/amd64/linux32/linux32_syscalls.c projects/pseries/amd64/linux32/linux32_sysent.c projects/pseries/amd64/linux32/linux32_systrace_args.c projects/pseries/amd64/linux32/syscalls.master projects/pseries/arm/arm/irq_dispatch.S projects/pseries/arm/arm/pmap.c projects/pseries/arm/arm/vm_machdep.c projects/pseries/arm/conf/KB920X projects/pseries/arm/econa/ehci_ebus.c projects/pseries/arm/econa/ohci_ec.c projects/pseries/arm/include/_types.h projects/pseries/arm/include/pmap.h projects/pseries/arm/mv/common.c projects/pseries/arm/mv/mv_machdep.c projects/pseries/arm/mv/mv_pci.c projects/pseries/arm/xscale/i80321/i80321_pci.c projects/pseries/arm/xscale/i8134x/i81342_pci.c projects/pseries/arm/xscale/ixp425/avila_ata.c projects/pseries/arm/xscale/ixp425/ixdp425_pci.c projects/pseries/arm/xscale/ixp425/ixp425_pci.c projects/pseries/arm/xscale/ixp425/ixp425var.h projects/pseries/boot/arm/at91/libat91/sd-card.c projects/pseries/boot/common/interp_parse.c projects/pseries/boot/common/loader.8 projects/pseries/boot/forth/loader.4th projects/pseries/boot/forth/loader.conf projects/pseries/boot/forth/menu.4th projects/pseries/boot/forth/menu.4th.8 projects/pseries/boot/i386/boot0/boot0.S projects/pseries/boot/i386/libi386/biospci.c projects/pseries/boot/i386/libi386/comconsole.c projects/pseries/boot/i386/libi386/libi386.h projects/pseries/boot/i386/libi386/time.c projects/pseries/boot/i386/zfsboot/zfsboot.c projects/pseries/boot/ofw/common/main.c projects/pseries/boot/ofw/libofw/ofw_net.c projects/pseries/boot/pc98/boot2/boot1.S projects/pseries/boot/pc98/libpc98/comconsole.c projects/pseries/boot/userboot/libstand/Makefile projects/pseries/boot/zfs/zfsimpl.c projects/pseries/cam/ata/ata_da.c projects/pseries/cam/cam_periph.c projects/pseries/cam/cam_periph.h projects/pseries/cam/cam_xpt.c projects/pseries/cam/scsi/scsi_all.c projects/pseries/cam/scsi/scsi_all.h projects/pseries/cam/scsi/scsi_cd.c projects/pseries/cam/scsi/scsi_da.c projects/pseries/cam/scsi/scsi_da.h projects/pseries/cam/scsi/scsi_sa.c projects/pseries/cam/scsi/scsi_ses.c projects/pseries/cam/scsi/scsi_sg.c projects/pseries/cam/scsi/scsi_targ_bh.c projects/pseries/cam/scsi/scsi_target.c projects/pseries/cam/scsi/scsi_xpt.c projects/pseries/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c projects/pseries/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/pseries/cddl/contrib/opensolaris/common/zfs/zfs_prop.h projects/pseries/cddl/contrib/opensolaris/common/zfs/zpool_prop.c projects/pseries/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c projects/pseries/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/pseries/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/pseries/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h projects/pseries/compat/freebsd32/freebsd32_proto.h projects/pseries/compat/freebsd32/freebsd32_syscall.h projects/pseries/compat/freebsd32/freebsd32_syscalls.c projects/pseries/compat/freebsd32/freebsd32_sysent.c projects/pseries/compat/freebsd32/freebsd32_systrace_args.c projects/pseries/compat/freebsd32/syscalls.master projects/pseries/compat/linprocfs/linprocfs.c projects/pseries/compat/linux/linux_file.c projects/pseries/compat/linux/linux_ioctl.c projects/pseries/compat/ndis/subr_ntoskrnl.c projects/pseries/conf/NOTES projects/pseries/conf/files projects/pseries/conf/files.amd64 projects/pseries/conf/files.i386 projects/pseries/conf/files.sparc64 projects/pseries/conf/kern.mk projects/pseries/conf/kern.post.mk projects/pseries/conf/kern.pre.mk projects/pseries/conf/kmod.mk projects/pseries/conf/makeLINT.mk projects/pseries/conf/newvers.sh projects/pseries/conf/options projects/pseries/contrib/dev/acpica/acpica_prep.sh projects/pseries/contrib/dev/acpica/changes.txt projects/pseries/contrib/dev/acpica/common/adfile.c projects/pseries/contrib/dev/acpica/common/adisasm.c projects/pseries/contrib/dev/acpica/common/adwalk.c projects/pseries/contrib/dev/acpica/common/dmextern.c projects/pseries/contrib/dev/acpica/common/dmrestag.c projects/pseries/contrib/dev/acpica/common/dmtable.c projects/pseries/contrib/dev/acpica/common/dmtbdump.c projects/pseries/contrib/dev/acpica/common/dmtbinfo.c projects/pseries/contrib/dev/acpica/common/getopt.c projects/pseries/contrib/dev/acpica/compiler/aslanalyze.c projects/pseries/contrib/dev/acpica/compiler/aslbtypes.c projects/pseries/contrib/dev/acpica/compiler/aslcodegen.c projects/pseries/contrib/dev/acpica/compiler/aslcompile.c projects/pseries/contrib/dev/acpica/compiler/aslcompiler.h projects/pseries/contrib/dev/acpica/compiler/aslcompiler.l projects/pseries/contrib/dev/acpica/compiler/aslcompiler.y projects/pseries/contrib/dev/acpica/compiler/asldefine.h projects/pseries/contrib/dev/acpica/compiler/aslerror.c projects/pseries/contrib/dev/acpica/compiler/aslfiles.c projects/pseries/contrib/dev/acpica/compiler/aslfold.c projects/pseries/contrib/dev/acpica/compiler/aslglobal.h projects/pseries/contrib/dev/acpica/compiler/asllength.c projects/pseries/contrib/dev/acpica/compiler/asllisting.c projects/pseries/contrib/dev/acpica/compiler/aslload.c projects/pseries/contrib/dev/acpica/compiler/asllookup.c projects/pseries/contrib/dev/acpica/compiler/aslmain.c projects/pseries/contrib/dev/acpica/compiler/aslmap.c projects/pseries/contrib/dev/acpica/compiler/aslmessages.h projects/pseries/contrib/dev/acpica/compiler/aslopcodes.c projects/pseries/contrib/dev/acpica/compiler/asloperands.c projects/pseries/contrib/dev/acpica/compiler/aslopt.c projects/pseries/contrib/dev/acpica/compiler/aslpredef.c projects/pseries/contrib/dev/acpica/compiler/aslresource.c projects/pseries/contrib/dev/acpica/compiler/aslrestype1.c projects/pseries/contrib/dev/acpica/compiler/aslrestype1i.c projects/pseries/contrib/dev/acpica/compiler/aslrestype2.c projects/pseries/contrib/dev/acpica/compiler/aslrestype2d.c projects/pseries/contrib/dev/acpica/compiler/aslrestype2e.c projects/pseries/contrib/dev/acpica/compiler/aslrestype2q.c projects/pseries/contrib/dev/acpica/compiler/aslrestype2w.c projects/pseries/contrib/dev/acpica/compiler/aslstartup.c projects/pseries/contrib/dev/acpica/compiler/aslstubs.c projects/pseries/contrib/dev/acpica/compiler/asltransform.c projects/pseries/contrib/dev/acpica/compiler/asltree.c projects/pseries/contrib/dev/acpica/compiler/asltypes.h projects/pseries/contrib/dev/acpica/compiler/aslutils.c projects/pseries/contrib/dev/acpica/compiler/asluuid.c projects/pseries/contrib/dev/acpica/compiler/aslwalks.c projects/pseries/contrib/dev/acpica/compiler/dtcompile.c projects/pseries/contrib/dev/acpica/compiler/dtcompiler.h projects/pseries/contrib/dev/acpica/compiler/dtexpress.c projects/pseries/contrib/dev/acpica/compiler/dtfield.c projects/pseries/contrib/dev/acpica/compiler/dtio.c projects/pseries/contrib/dev/acpica/compiler/dtparser.l projects/pseries/contrib/dev/acpica/compiler/dtparser.y projects/pseries/contrib/dev/acpica/compiler/dtsubtable.c projects/pseries/contrib/dev/acpica/compiler/dttable.c projects/pseries/contrib/dev/acpica/compiler/dttemplate.c projects/pseries/contrib/dev/acpica/compiler/dttemplate.h projects/pseries/contrib/dev/acpica/compiler/dtutils.c projects/pseries/contrib/dev/acpica/debugger/dbcmds.c projects/pseries/contrib/dev/acpica/debugger/dbdisply.c projects/pseries/contrib/dev/acpica/debugger/dbexec.c projects/pseries/contrib/dev/acpica/debugger/dbfileio.c projects/pseries/contrib/dev/acpica/debugger/dbhistry.c projects/pseries/contrib/dev/acpica/debugger/dbinput.c projects/pseries/contrib/dev/acpica/debugger/dbmethod.c projects/pseries/contrib/dev/acpica/debugger/dbnames.c projects/pseries/contrib/dev/acpica/debugger/dbstats.c projects/pseries/contrib/dev/acpica/debugger/dbutils.c projects/pseries/contrib/dev/acpica/debugger/dbxface.c projects/pseries/contrib/dev/acpica/disassembler/dmbuffer.c projects/pseries/contrib/dev/acpica/disassembler/dmnames.c projects/pseries/contrib/dev/acpica/disassembler/dmobject.c projects/pseries/contrib/dev/acpica/disassembler/dmopcode.c projects/pseries/contrib/dev/acpica/disassembler/dmresrc.c projects/pseries/contrib/dev/acpica/disassembler/dmresrcl.c projects/pseries/contrib/dev/acpica/disassembler/dmresrcs.c projects/pseries/contrib/dev/acpica/disassembler/dmutils.c projects/pseries/contrib/dev/acpica/disassembler/dmwalk.c projects/pseries/contrib/dev/acpica/dispatcher/dsargs.c projects/pseries/contrib/dev/acpica/dispatcher/dscontrol.c projects/pseries/contrib/dev/acpica/dispatcher/dsfield.c projects/pseries/contrib/dev/acpica/dispatcher/dsinit.c projects/pseries/contrib/dev/acpica/dispatcher/dsmethod.c projects/pseries/contrib/dev/acpica/dispatcher/dsmthdat.c projects/pseries/contrib/dev/acpica/dispatcher/dsobject.c projects/pseries/contrib/dev/acpica/dispatcher/dsopcode.c projects/pseries/contrib/dev/acpica/dispatcher/dsutils.c projects/pseries/contrib/dev/acpica/dispatcher/dswexec.c projects/pseries/contrib/dev/acpica/dispatcher/dswload.c projects/pseries/contrib/dev/acpica/dispatcher/dswload2.c projects/pseries/contrib/dev/acpica/dispatcher/dswscope.c projects/pseries/contrib/dev/acpica/dispatcher/dswstate.c projects/pseries/contrib/dev/acpica/events/evevent.c projects/pseries/contrib/dev/acpica/events/evglock.c projects/pseries/contrib/dev/acpica/events/evgpe.c projects/pseries/contrib/dev/acpica/events/evgpeblk.c projects/pseries/contrib/dev/acpica/events/evgpeinit.c projects/pseries/contrib/dev/acpica/events/evgpeutil.c projects/pseries/contrib/dev/acpica/events/evmisc.c projects/pseries/contrib/dev/acpica/events/evregion.c projects/pseries/contrib/dev/acpica/events/evrgnini.c projects/pseries/contrib/dev/acpica/events/evsci.c projects/pseries/contrib/dev/acpica/events/evxface.c projects/pseries/contrib/dev/acpica/events/evxfevnt.c projects/pseries/contrib/dev/acpica/events/evxfgpe.c projects/pseries/contrib/dev/acpica/events/evxfregn.c projects/pseries/contrib/dev/acpica/executer/exconfig.c projects/pseries/contrib/dev/acpica/executer/exconvrt.c projects/pseries/contrib/dev/acpica/executer/excreate.c projects/pseries/contrib/dev/acpica/executer/exdebug.c projects/pseries/contrib/dev/acpica/executer/exdump.c projects/pseries/contrib/dev/acpica/executer/exfield.c projects/pseries/contrib/dev/acpica/executer/exfldio.c projects/pseries/contrib/dev/acpica/executer/exmisc.c projects/pseries/contrib/dev/acpica/executer/exmutex.c projects/pseries/contrib/dev/acpica/executer/exnames.c projects/pseries/contrib/dev/acpica/executer/exoparg1.c projects/pseries/contrib/dev/acpica/executer/exoparg2.c projects/pseries/contrib/dev/acpica/executer/exoparg3.c projects/pseries/contrib/dev/acpica/executer/exoparg6.c projects/pseries/contrib/dev/acpica/executer/exprep.c projects/pseries/contrib/dev/acpica/executer/exregion.c projects/pseries/contrib/dev/acpica/executer/exresnte.c projects/pseries/contrib/dev/acpica/executer/exresolv.c projects/pseries/contrib/dev/acpica/executer/exresop.c projects/pseries/contrib/dev/acpica/executer/exstore.c projects/pseries/contrib/dev/acpica/executer/exstoren.c projects/pseries/contrib/dev/acpica/executer/exstorob.c projects/pseries/contrib/dev/acpica/executer/exsystem.c projects/pseries/contrib/dev/acpica/executer/exutils.c projects/pseries/contrib/dev/acpica/hardware/hwacpi.c projects/pseries/contrib/dev/acpica/hardware/hwgpe.c projects/pseries/contrib/dev/acpica/hardware/hwpci.c projects/pseries/contrib/dev/acpica/hardware/hwregs.c projects/pseries/contrib/dev/acpica/hardware/hwsleep.c projects/pseries/contrib/dev/acpica/hardware/hwtimer.c projects/pseries/contrib/dev/acpica/hardware/hwvalid.c projects/pseries/contrib/dev/acpica/hardware/hwxface.c projects/pseries/contrib/dev/acpica/include/acapps.h projects/pseries/contrib/dev/acpica/include/accommon.h projects/pseries/contrib/dev/acpica/include/acconfig.h projects/pseries/contrib/dev/acpica/include/acdebug.h projects/pseries/contrib/dev/acpica/include/acdisasm.h projects/pseries/contrib/dev/acpica/include/acdispat.h projects/pseries/contrib/dev/acpica/include/acevents.h projects/pseries/contrib/dev/acpica/include/acexcep.h projects/pseries/contrib/dev/acpica/include/acglobal.h projects/pseries/contrib/dev/acpica/include/achware.h projects/pseries/contrib/dev/acpica/include/acinterp.h projects/pseries/contrib/dev/acpica/include/aclocal.h projects/pseries/contrib/dev/acpica/include/acmacros.h projects/pseries/contrib/dev/acpica/include/acnames.h projects/pseries/contrib/dev/acpica/include/acnamesp.h projects/pseries/contrib/dev/acpica/include/acobject.h projects/pseries/contrib/dev/acpica/include/acopcode.h projects/pseries/contrib/dev/acpica/include/acoutput.h projects/pseries/contrib/dev/acpica/include/acparser.h projects/pseries/contrib/dev/acpica/include/acpi.h projects/pseries/contrib/dev/acpica/include/acpiosxf.h projects/pseries/contrib/dev/acpica/include/acpixf.h projects/pseries/contrib/dev/acpica/include/acpredef.h projects/pseries/contrib/dev/acpica/include/acresrc.h projects/pseries/contrib/dev/acpica/include/acrestyp.h projects/pseries/contrib/dev/acpica/include/acstruct.h projects/pseries/contrib/dev/acpica/include/actables.h projects/pseries/contrib/dev/acpica/include/actbl.h projects/pseries/contrib/dev/acpica/include/actbl1.h projects/pseries/contrib/dev/acpica/include/actbl2.h projects/pseries/contrib/dev/acpica/include/actypes.h projects/pseries/contrib/dev/acpica/include/acutils.h projects/pseries/contrib/dev/acpica/include/amlcode.h projects/pseries/contrib/dev/acpica/include/amlresrc.h projects/pseries/contrib/dev/acpica/include/platform/acenv.h projects/pseries/contrib/dev/acpica/include/platform/acfreebsd.h projects/pseries/contrib/dev/acpica/include/platform/acgcc.h projects/pseries/contrib/dev/acpica/namespace/nsaccess.c projects/pseries/contrib/dev/acpica/namespace/nsalloc.c projects/pseries/contrib/dev/acpica/namespace/nsdump.c projects/pseries/contrib/dev/acpica/namespace/nsdumpdv.c projects/pseries/contrib/dev/acpica/namespace/nseval.c projects/pseries/contrib/dev/acpica/namespace/nsinit.c projects/pseries/contrib/dev/acpica/namespace/nsload.c projects/pseries/contrib/dev/acpica/namespace/nsnames.c projects/pseries/contrib/dev/acpica/namespace/nsobject.c projects/pseries/contrib/dev/acpica/namespace/nsparse.c projects/pseries/contrib/dev/acpica/namespace/nspredef.c projects/pseries/contrib/dev/acpica/namespace/nsrepair.c projects/pseries/contrib/dev/acpica/namespace/nsrepair2.c projects/pseries/contrib/dev/acpica/namespace/nssearch.c projects/pseries/contrib/dev/acpica/namespace/nsutils.c projects/pseries/contrib/dev/acpica/namespace/nswalk.c projects/pseries/contrib/dev/acpica/namespace/nsxfeval.c projects/pseries/contrib/dev/acpica/namespace/nsxfname.c projects/pseries/contrib/dev/acpica/namespace/nsxfobj.c projects/pseries/contrib/dev/acpica/parser/psargs.c projects/pseries/contrib/dev/acpica/parser/psloop.c projects/pseries/contrib/dev/acpica/parser/psopcode.c projects/pseries/contrib/dev/acpica/parser/psparse.c projects/pseries/contrib/dev/acpica/parser/psscope.c projects/pseries/contrib/dev/acpica/parser/pstree.c projects/pseries/contrib/dev/acpica/parser/psutils.c projects/pseries/contrib/dev/acpica/parser/pswalk.c projects/pseries/contrib/dev/acpica/parser/psxface.c projects/pseries/contrib/dev/acpica/resources/rsaddr.c projects/pseries/contrib/dev/acpica/resources/rscalc.c projects/pseries/contrib/dev/acpica/resources/rscreate.c projects/pseries/contrib/dev/acpica/resources/rsdump.c projects/pseries/contrib/dev/acpica/resources/rsinfo.c projects/pseries/contrib/dev/acpica/resources/rsio.c projects/pseries/contrib/dev/acpica/resources/rsirq.c projects/pseries/contrib/dev/acpica/resources/rslist.c projects/pseries/contrib/dev/acpica/resources/rsmemory.c projects/pseries/contrib/dev/acpica/resources/rsmisc.c projects/pseries/contrib/dev/acpica/resources/rsutils.c projects/pseries/contrib/dev/acpica/resources/rsxface.c projects/pseries/contrib/dev/acpica/tables/tbfadt.c projects/pseries/contrib/dev/acpica/tables/tbfind.c projects/pseries/contrib/dev/acpica/tables/tbinstal.c projects/pseries/contrib/dev/acpica/tables/tbutils.c projects/pseries/contrib/dev/acpica/tables/tbxface.c projects/pseries/contrib/dev/acpica/tables/tbxfroot.c projects/pseries/contrib/dev/acpica/utilities/utalloc.c projects/pseries/contrib/dev/acpica/utilities/utcache.c projects/pseries/contrib/dev/acpica/utilities/utcopy.c projects/pseries/contrib/dev/acpica/utilities/utdebug.c projects/pseries/contrib/dev/acpica/utilities/utdecode.c projects/pseries/contrib/dev/acpica/utilities/utdelete.c projects/pseries/contrib/dev/acpica/utilities/uteval.c projects/pseries/contrib/dev/acpica/utilities/utglobal.c projects/pseries/contrib/dev/acpica/utilities/utids.c projects/pseries/contrib/dev/acpica/utilities/utinit.c projects/pseries/contrib/dev/acpica/utilities/utlock.c projects/pseries/contrib/dev/acpica/utilities/utmath.c projects/pseries/contrib/dev/acpica/utilities/utmisc.c projects/pseries/contrib/dev/acpica/utilities/utmutex.c projects/pseries/contrib/dev/acpica/utilities/utobject.c projects/pseries/contrib/dev/acpica/utilities/utosi.c projects/pseries/contrib/dev/acpica/utilities/utresrc.c projects/pseries/contrib/dev/acpica/utilities/utstate.c projects/pseries/contrib/dev/acpica/utilities/uttrack.c projects/pseries/contrib/dev/acpica/utilities/utxface.c projects/pseries/contrib/dev/acpica/utilities/utxferror.c projects/pseries/contrib/ipfilter/netinet/ip_compat.h projects/pseries/contrib/ipfilter/netinet/ip_proxy.c projects/pseries/contrib/ngatm/netnatm/msg/uni_ie.c projects/pseries/contrib/octeon-sdk/cvmx-helper-board.c projects/pseries/contrib/octeon-sdk/cvmx-usb.c projects/pseries/contrib/pf/net/if_pfsync.c projects/pseries/contrib/pf/net/pf.c projects/pseries/contrib/pf/net/pf_ioctl.c projects/pseries/contrib/pf/net/pfvar.h projects/pseries/contrib/rdma/ib_addr.h projects/pseries/ddb/db_command.c projects/pseries/ddb/db_input.c projects/pseries/ddb/db_ps.c projects/pseries/ddb/db_thread.c projects/pseries/ddb/ddb.h projects/pseries/dev/aac/aac_pci.c projects/pseries/dev/acpi_support/acpi_wmi.c projects/pseries/dev/acpica/acpi_battery.c projects/pseries/dev/acpica/acpi_cpu.c projects/pseries/dev/acpica/acpi_isab.c projects/pseries/dev/acpica/acpi_pcib_acpi.c projects/pseries/dev/ahci/ahci.c projects/pseries/dev/aic7xxx/aicasm/aicasm_macro_scan.l projects/pseries/dev/aic7xxx/aicasm/aicasm_scan.l projects/pseries/dev/amr/amr_pci.c projects/pseries/dev/an/if_an.c projects/pseries/dev/arcmsr/arcmsr.c projects/pseries/dev/ata/ata-disk.c projects/pseries/dev/ata/ata-pci.c projects/pseries/dev/ata/ata-pci.h projects/pseries/dev/ata/atapi-cam.c projects/pseries/dev/ata/chipsets/ata-ati.c projects/pseries/dev/ata/chipsets/ata-intel.c projects/pseries/dev/ata/chipsets/ata-nvidia.c projects/pseries/dev/ath/ath_hal/ah_desc.h projects/pseries/dev/ath/ath_hal/ah_internal.h projects/pseries/dev/ath/ath_hal/ar5210/ar5210reg.h projects/pseries/dev/ath/ath_hal/ar5211/ar5211reg.h projects/pseries/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/pseries/dev/ath/ath_hal/ar5416/ar2133.c projects/pseries/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/pseries/dev/ath/ath_hal/ar5416/ar5416_gpio.c projects/pseries/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/pseries/dev/ath/ath_hal/ar5416/ar5416reg.h projects/pseries/dev/ath/ath_hal/ar9002/ar9280.c projects/pseries/dev/ath/ath_hal/ar9002/ar9285.c projects/pseries/dev/ath/ath_hal/ar9002/ar9287.c projects/pseries/dev/ath/ath_hal/ar9002/ar9287.h projects/pseries/dev/ath/if_ath.c projects/pseries/dev/ath/if_ath_sysctl.c projects/pseries/dev/ath/if_ath_tx.c projects/pseries/dev/ath/if_athioctl.h projects/pseries/dev/ath/if_athvar.h projects/pseries/dev/bce/if_bce.c projects/pseries/dev/bce/if_bcereg.h projects/pseries/dev/bfe/if_bfe.c projects/pseries/dev/bge/if_bge.c projects/pseries/dev/bge/if_bgereg.h projects/pseries/dev/bm/if_bm.c projects/pseries/dev/bwi/if_bwi.c projects/pseries/dev/bwn/if_bwn.c projects/pseries/dev/bwn/if_bwnvar.h projects/pseries/dev/bxe/bxe_reg.h projects/pseries/dev/bxe/if_bxe.c projects/pseries/dev/cas/if_cas.c projects/pseries/dev/ce/if_ce.c projects/pseries/dev/cesa/cesa.c projects/pseries/dev/cfe/cfe_console.c projects/pseries/dev/ciss/ciss.c projects/pseries/dev/cm/smc90cx6.c projects/pseries/dev/cp/if_cp.c projects/pseries/dev/cpuctl/cpuctl.c projects/pseries/dev/cxgb/common/cxgb_aq100x.c projects/pseries/dev/cxgb/cxgb_main.c projects/pseries/dev/cxgbe/adapter.h projects/pseries/dev/cxgbe/common/common.h projects/pseries/dev/cxgbe/common/t4_hw.c projects/pseries/dev/cxgbe/common/t4_hw.h projects/pseries/dev/cxgbe/offload.h projects/pseries/dev/cxgbe/osdep.h projects/pseries/dev/cxgbe/t4_ioctl.h projects/pseries/dev/cxgbe/t4_l2t.c projects/pseries/dev/cxgbe/t4_l2t.h projects/pseries/dev/cxgbe/t4_main.c projects/pseries/dev/cxgbe/t4_sge.c projects/pseries/dev/dc/dcphy.c projects/pseries/dev/dc/if_dc.c projects/pseries/dev/dc/pnphy.c projects/pseries/dev/dcons/dcons_os.c projects/pseries/dev/de/if_de.c projects/pseries/dev/drm/i915_drv.h projects/pseries/dev/drm/mga_drv.h projects/pseries/dev/drm/radeon_state.c projects/pseries/dev/e1000/e1000_80003es2lan.c projects/pseries/dev/e1000/e1000_80003es2lan.h projects/pseries/dev/e1000/e1000_82540.c projects/pseries/dev/e1000/e1000_82541.c projects/pseries/dev/e1000/e1000_82543.c projects/pseries/dev/e1000/e1000_82571.c projects/pseries/dev/e1000/e1000_82575.c projects/pseries/dev/e1000/e1000_82575.h projects/pseries/dev/e1000/e1000_api.c projects/pseries/dev/e1000/e1000_api.h projects/pseries/dev/e1000/e1000_defines.h projects/pseries/dev/e1000/e1000_hw.h projects/pseries/dev/e1000/e1000_ich8lan.c projects/pseries/dev/e1000/e1000_ich8lan.h projects/pseries/dev/e1000/e1000_mac.c projects/pseries/dev/e1000/e1000_nvm.c projects/pseries/dev/e1000/e1000_nvm.h projects/pseries/dev/e1000/e1000_osdep.h projects/pseries/dev/e1000/e1000_phy.c projects/pseries/dev/e1000/e1000_phy.h projects/pseries/dev/e1000/e1000_regs.h projects/pseries/dev/e1000/e1000_vf.c projects/pseries/dev/e1000/if_em.c projects/pseries/dev/e1000/if_em.h projects/pseries/dev/e1000/if_igb.c projects/pseries/dev/e1000/if_igb.h projects/pseries/dev/e1000/if_lem.c projects/pseries/dev/e1000/if_lem.h projects/pseries/dev/ed/if_ed.c projects/pseries/dev/eisa/eisaconf.c projects/pseries/dev/ep/if_ep.c projects/pseries/dev/esp/esp_pci.c projects/pseries/dev/esp/esp_sbus.c projects/pseries/dev/esp/ncr53c9x.c projects/pseries/dev/et/if_et.c projects/pseries/dev/et/if_etreg.h projects/pseries/dev/et/if_etvar.h projects/pseries/dev/ex/if_ex.c projects/pseries/dev/fb/fb.c projects/pseries/dev/fdc/fdc.c projects/pseries/dev/fdt/fdt_common.c projects/pseries/dev/fdt/fdt_pci.c projects/pseries/dev/fdt/fdt_powerpc.c projects/pseries/dev/fdt/fdtbus.c projects/pseries/dev/fdt/simplebus.c projects/pseries/dev/firewire/firewire.c projects/pseries/dev/firewire/fwohci_pci.c projects/pseries/dev/firewire/if_fwe.c projects/pseries/dev/flash/mx25l.c projects/pseries/dev/fxp/if_fxp.c projects/pseries/dev/gem/if_gem_pci.c projects/pseries/dev/gem/if_gem_sbus.c projects/pseries/dev/gpio/gpiobus.c projects/pseries/dev/gpio/gpioiic.c projects/pseries/dev/hifn/hifn7751.c projects/pseries/dev/hme/if_hme_pci.c projects/pseries/dev/hme/if_hme_sbus.c projects/pseries/dev/hptiop/hptiop.c projects/pseries/dev/hptmv/entry.c projects/pseries/dev/hptrr/hptrr_osm_bsd.c projects/pseries/dev/hwpmc/hwpmc_amd.c projects/pseries/dev/hwpmc/hwpmc_core.c projects/pseries/dev/hwpmc/hwpmc_powerpc.c projects/pseries/dev/hwpmc/hwpmc_uncore.c projects/pseries/dev/hwpmc/hwpmc_uncore.h projects/pseries/dev/hwpmc/pmc_events.h projects/pseries/dev/ichsmb/ichsmb_pci.c projects/pseries/dev/ichwd/ichwd.c projects/pseries/dev/ichwd/ichwd.h projects/pseries/dev/ida/ida_pci.c projects/pseries/dev/ie/if_ie.c projects/pseries/dev/if_ndis/if_ndis.c projects/pseries/dev/if_ndis/if_ndis_pccard.c projects/pseries/dev/if_ndis/if_ndis_usb.c projects/pseries/dev/iicbus/iicbb.c projects/pseries/dev/iicbus/iicbus.c projects/pseries/dev/iicbus/iicbus.h projects/pseries/dev/iicbus/iiconf.c projects/pseries/dev/iicbus/iicsmb.c projects/pseries/dev/ipw/if_ipw.c projects/pseries/dev/isp/isp_freebsd.c projects/pseries/dev/isp/isp_freebsd.h projects/pseries/dev/iwi/if_iwi.c projects/pseries/dev/iwn/if_iwn.c projects/pseries/dev/iwn/if_iwnreg.h projects/pseries/dev/ixgb/if_ixgb.c projects/pseries/dev/ixgbe/ixgbe.c projects/pseries/dev/ixgbe/ixgbe_osdep.h projects/pseries/dev/ixgbe/ixv.c projects/pseries/dev/lge/if_lge.c projects/pseries/dev/malo/if_malo.c projects/pseries/dev/mca/mca_bus.c projects/pseries/dev/md/md.c projects/pseries/dev/mfi/mfi_pci.c projects/pseries/dev/mii/acphy.c projects/pseries/dev/mii/amphy.c projects/pseries/dev/mii/atphy.c projects/pseries/dev/mii/axphy.c projects/pseries/dev/mii/bmtphy.c projects/pseries/dev/mii/brgphy.c projects/pseries/dev/mii/ciphy.c projects/pseries/dev/mii/e1000phy.c projects/pseries/dev/mii/gentbi.c projects/pseries/dev/mii/icsphy.c projects/pseries/dev/mii/ip1000phy.c projects/pseries/dev/mii/jmphy.c projects/pseries/dev/mii/lxtphy.c projects/pseries/dev/mii/mii.c projects/pseries/dev/mii/miidevs projects/pseries/dev/mii/mlphy.c projects/pseries/dev/mii/nsgphy.c projects/pseries/dev/mii/nsphy.c projects/pseries/dev/mii/nsphyter.c projects/pseries/dev/mii/pnaphy.c projects/pseries/dev/mii/qsphy.c projects/pseries/dev/mii/rdcphy.c projects/pseries/dev/mii/rgephy.c projects/pseries/dev/mii/rlphy.c projects/pseries/dev/mii/rlswitch.c projects/pseries/dev/mii/smcphy.c projects/pseries/dev/mii/tdkphy.c projects/pseries/dev/mii/tlphy.c projects/pseries/dev/mii/truephy.c projects/pseries/dev/mii/ukphy.c projects/pseries/dev/mii/xmphy.c projects/pseries/dev/mlx/mlx_pci.c projects/pseries/dev/mps/mps_pci.c projects/pseries/dev/mps/mps_sas.c projects/pseries/dev/msk/if_msk.c projects/pseries/dev/mvs/mvs_pci.c projects/pseries/dev/mvs/mvs_soc.c projects/pseries/dev/mwl/if_mwl.c projects/pseries/dev/mxge/if_mxge.c projects/pseries/dev/my/if_my.c projects/pseries/dev/netmap/if_em_netmap.h projects/pseries/dev/netmap/if_igb_netmap.h projects/pseries/dev/netmap/if_lem_netmap.h projects/pseries/dev/netmap/if_re_netmap.h projects/pseries/dev/netmap/ixgbe_netmap.h projects/pseries/dev/netmap/netmap.c projects/pseries/dev/netmap/netmap_kern.h projects/pseries/dev/nfe/if_nfe.c projects/pseries/dev/nge/if_nge.c projects/pseries/dev/null/null.c projects/pseries/dev/nve/if_nve.c projects/pseries/dev/ofw/ofw_console.c projects/pseries/dev/ofw/ofw_fdt.c projects/pseries/dev/ofw/ofw_iicbus.c projects/pseries/dev/ofw/openfirm.c projects/pseries/dev/pccard/pccardvar.h projects/pseries/dev/pccbb/pccbb_isa.c projects/pseries/dev/pccbb/pccbb_pci.c projects/pseries/dev/pci/eisa_pci.c projects/pseries/dev/pci/isa_pci.c projects/pseries/dev/pci/pci_pci.c projects/pseries/dev/pci/pcireg.h projects/pseries/dev/pcn/if_pcn.c projects/pseries/dev/ppbus/lpbb.c projects/pseries/dev/ppbus/lpt.c projects/pseries/dev/ppbus/ppb_base.c projects/pseries/dev/ppbus/ppb_msq.c projects/pseries/dev/ppbus/ppbconf.c projects/pseries/dev/ppbus/vpo.c projects/pseries/dev/ppc/ppc.c projects/pseries/dev/pst/pst-pci.c projects/pseries/dev/puc/puc_pccard.c projects/pseries/dev/puc/puc_pci.c projects/pseries/dev/qlxgb/qla_misc.c projects/pseries/dev/qlxgb/qla_os.c projects/pseries/dev/quicc/quicc_bfe_fdt.c projects/pseries/dev/ral/rt2560.c projects/pseries/dev/ral/rt2661.c projects/pseries/dev/random/probe.c projects/pseries/dev/re/if_re.c projects/pseries/dev/rt/if_rt.c projects/pseries/dev/safe/safe.c projects/pseries/dev/scc/scc_bfe_ebus.c projects/pseries/dev/scc/scc_bfe_macio.c projects/pseries/dev/scc/scc_bfe_quicc.c projects/pseries/dev/scc/scc_bfe_sbus.c projects/pseries/dev/sec/sec.c projects/pseries/dev/sf/if_sf.c projects/pseries/dev/sfxge/common/efsys.h projects/pseries/dev/sfxge/common/efx.h (contents, props changed) projects/pseries/dev/sfxge/common/efx_bootcfg.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_ev.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_filter.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_impl.h (contents, props changed) projects/pseries/dev/sfxge/common/efx_intr.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_mac.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_mcdi.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_mcdi.h (contents, props changed) projects/pseries/dev/sfxge/common/efx_mon.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_nic.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_nvram.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_phy.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_port.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_regs.h (contents, props changed) projects/pseries/dev/sfxge/common/efx_regs_ef10.h (contents, props changed) projects/pseries/dev/sfxge/common/efx_regs_mcdi.h (contents, props changed) projects/pseries/dev/sfxge/common/efx_regs_pci.h (contents, props changed) projects/pseries/dev/sfxge/common/efx_rx.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_sram.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_tx.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_types.h (contents, props changed) projects/pseries/dev/sfxge/common/efx_vpd.c (contents, props changed) projects/pseries/dev/sfxge/common/efx_wol.c (contents, props changed) projects/pseries/dev/sfxge/common/siena_flash.h (contents, props changed) projects/pseries/dev/sfxge/common/siena_impl.h (contents, props changed) projects/pseries/dev/sfxge/common/siena_mac.c (contents, props changed) projects/pseries/dev/sfxge/common/siena_mon.c (contents, props changed) projects/pseries/dev/sfxge/common/siena_nic.c (contents, props changed) projects/pseries/dev/sfxge/common/siena_nvram.c (contents, props changed) projects/pseries/dev/sfxge/common/siena_phy.c (contents, props changed) projects/pseries/dev/sfxge/common/siena_sram.c (contents, props changed) projects/pseries/dev/sfxge/common/siena_vpd.c (contents, props changed) projects/pseries/dev/sfxge/sfxge.c projects/pseries/dev/sfxge/sfxge_port.c projects/pseries/dev/sge/if_sge.c projects/pseries/dev/siba/siba.c projects/pseries/dev/siba/siba_bwn.c projects/pseries/dev/siba/siba_cc.c projects/pseries/dev/siba/siba_core.c projects/pseries/dev/siba/siba_pcib.c projects/pseries/dev/siis/siis.c projects/pseries/dev/sio/sio.c projects/pseries/dev/sis/if_sis.c projects/pseries/dev/sk/if_sk.c projects/pseries/dev/smbus/smbus.c projects/pseries/dev/sn/if_sn.c projects/pseries/dev/snc/dp83932.c projects/pseries/dev/sound/isa/gusc.c projects/pseries/dev/sound/isa/sbc.c projects/pseries/dev/sound/pci/csa.c projects/pseries/dev/sound/pci/emu10k1.c projects/pseries/dev/sound/pci/emu10kx-midi.c projects/pseries/dev/sound/pci/emu10kx-pcm.c projects/pseries/dev/sound/pci/emu10kx.c projects/pseries/dev/sound/pci/emu10kx.h projects/pseries/dev/sound/pci/fm801.c projects/pseries/dev/sound/pci/hda/hdac.c projects/pseries/dev/sound/usb/uaudio.c projects/pseries/dev/sound/usb/uaudio.h projects/pseries/dev/speaker/spkr.c projects/pseries/dev/spibus/spibus.c projects/pseries/dev/spibus/spibusvar.h projects/pseries/dev/ste/if_ste.c projects/pseries/dev/stge/if_stge.c projects/pseries/dev/syscons/syscons.c projects/pseries/dev/syscons/syscons.h projects/pseries/dev/ti/if_ti.c projects/pseries/dev/tl/if_tl.c projects/pseries/dev/tsec/if_tsec.c projects/pseries/dev/tsec/if_tsec_fdt.c projects/pseries/dev/twa/tw_osl.h projects/pseries/dev/twa/tw_osl_freebsd.c projects/pseries/dev/twe/twe_freebsd.c projects/pseries/dev/tws/tws.c projects/pseries/dev/tws/tws.h projects/pseries/dev/uart/uart_bus_fdt.c projects/pseries/dev/uart/uart_bus_pci.c projects/pseries/dev/uart/uart_cpu_sparc64.c projects/pseries/dev/uart/uart_subr.c projects/pseries/dev/uart/uart_tty.c projects/pseries/dev/ubsec/ubsec.c projects/pseries/dev/usb/controller/at91dci.c projects/pseries/dev/usb/controller/at91dci.h projects/pseries/dev/usb/controller/at91dci_atmelarm.c projects/pseries/dev/usb/controller/atmegadci.c projects/pseries/dev/usb/controller/atmegadci.h projects/pseries/dev/usb/controller/atmegadci_atmelarm.c projects/pseries/dev/usb/controller/avr32dci.c projects/pseries/dev/usb/controller/avr32dci.h projects/pseries/dev/usb/controller/ehci.c projects/pseries/dev/usb/controller/ehci.h projects/pseries/dev/usb/controller/ehci_ixp4xx.c projects/pseries/dev/usb/controller/ehci_mv.c projects/pseries/dev/usb/controller/ehci_pci.c projects/pseries/dev/usb/controller/musb_otg.c projects/pseries/dev/usb/controller/musb_otg.h projects/pseries/dev/usb/controller/musb_otg_atmelarm.c projects/pseries/dev/usb/controller/ohci.c projects/pseries/dev/usb/controller/ohci.h projects/pseries/dev/usb/controller/ohci_atmelarm.c projects/pseries/dev/usb/controller/ohci_pci.c projects/pseries/dev/usb/controller/ohci_s3c24x0.c projects/pseries/dev/usb/controller/uhci.c projects/pseries/dev/usb/controller/uhci.h projects/pseries/dev/usb/controller/uhci_pci.c projects/pseries/dev/usb/controller/usb_controller.c projects/pseries/dev/usb/controller/uss820dci.c projects/pseries/dev/usb/controller/uss820dci.h projects/pseries/dev/usb/controller/uss820dci_atmelarm.c projects/pseries/dev/usb/controller/xhci.c projects/pseries/dev/usb/controller/xhci.h projects/pseries/dev/usb/controller/xhci_pci.c projects/pseries/dev/usb/controller/xhcireg.h projects/pseries/dev/usb/input/ukbd.c projects/pseries/dev/usb/net/if_aue.c projects/pseries/dev/usb/net/if_axe.c projects/pseries/dev/usb/net/if_mos.c projects/pseries/dev/usb/net/if_rue.c projects/pseries/dev/usb/net/if_udav.c projects/pseries/dev/usb/net/ruephy.c projects/pseries/dev/usb/net/usb_ethernet.c projects/pseries/dev/usb/quirk/usb_quirk.c projects/pseries/dev/usb/serial/usb_serial.c projects/pseries/dev/usb/template/usb_template.c projects/pseries/dev/usb/template/usb_template_kbd.c projects/pseries/dev/usb/template/usb_template_modem.c projects/pseries/dev/usb/template/usb_template_mouse.c projects/pseries/dev/usb/usb_bus.h projects/pseries/dev/usb/usb_controller.h projects/pseries/dev/usb/usb_hub.c projects/pseries/dev/usb/usb_if.m projects/pseries/dev/usb/usb_msctest.c projects/pseries/dev/usb/usb_transfer.c projects/pseries/dev/usb/usb_transfer.h projects/pseries/dev/usb/usbdevs projects/pseries/dev/usb/wlan/if_rum.c projects/pseries/dev/usb/wlan/if_run.c projects/pseries/dev/usb/wlan/if_uath.c projects/pseries/dev/usb/wlan/if_upgt.c projects/pseries/dev/usb/wlan/if_ural.c projects/pseries/dev/usb/wlan/if_urtw.c projects/pseries/dev/usb/wlan/if_zyd.c projects/pseries/dev/vge/if_vge.c projects/pseries/dev/virtio/balloon/virtio_balloon.c projects/pseries/dev/virtio/balloon/virtio_balloon.h projects/pseries/dev/virtio/block/virtio_blk.c projects/pseries/dev/virtio/block/virtio_blk.h projects/pseries/dev/virtio/network/if_vtnet.c projects/pseries/dev/virtio/network/if_vtnetvar.h projects/pseries/dev/virtio/network/virtio_net.h projects/pseries/dev/virtio/pci/virtio_pci.h projects/pseries/dev/virtio/virtio.h projects/pseries/dev/virtio/virtio_ring.h projects/pseries/dev/vr/if_vr.c projects/pseries/dev/vr/if_vrreg.h projects/pseries/dev/vte/if_vte.c projects/pseries/dev/vx/if_vx.c projects/pseries/dev/vxge/vxge-osdep.h projects/pseries/dev/vxge/vxge.c projects/pseries/dev/wb/if_wb.c projects/pseries/dev/wi/if_wi.c projects/pseries/dev/wpi/if_wpi.c projects/pseries/dev/xen/console/console.c projects/pseries/dev/xen/netback/netback.c projects/pseries/dev/xen/netfront/netfront.c projects/pseries/dev/xen/pcifront/pcifront.c projects/pseries/dev/xl/if_xl.c projects/pseries/dev/xl/xlphy.c projects/pseries/fs/devfs/devfs_vnops.c projects/pseries/fs/ext2fs/ext2_alloc.c projects/pseries/fs/ext2fs/ext2_balloc.c projects/pseries/fs/ext2fs/ext2_bmap.c projects/pseries/fs/ext2fs/ext2_extern.h projects/pseries/fs/ext2fs/ext2_inode.c projects/pseries/fs/ext2fs/ext2_lookup.c projects/pseries/fs/ext2fs/ext2_subr.c projects/pseries/fs/ext2fs/ext2_vfsops.c projects/pseries/fs/ext2fs/ext2_vnops.c projects/pseries/fs/ext2fs/ext2fs.h projects/pseries/fs/ext2fs/fs.h projects/pseries/fs/fifofs/fifo_vnops.c projects/pseries/fs/msdosfs/msdosfs_conv.c projects/pseries/fs/msdosfs/msdosfs_denode.c projects/pseries/fs/msdosfs/msdosfs_fat.c projects/pseries/fs/msdosfs/msdosfs_lookup.c projects/pseries/fs/msdosfs/msdosfs_vfsops.c projects/pseries/fs/nfs/nfs_commonkrpc.c projects/pseries/fs/nfs/nfs_commonport.c projects/pseries/fs/nfs/nfs_commonsubs.c projects/pseries/fs/nfs/nfsclstate.h projects/pseries/fs/nfs/nfsport.h projects/pseries/fs/nfsclient/nfs_clbio.c projects/pseries/fs/nfsclient/nfs_clkrpc.c projects/pseries/fs/nfsclient/nfs_clport.c projects/pseries/fs/nfsclient/nfs_clrpcops.c projects/pseries/fs/nfsclient/nfs_clstate.c projects/pseries/fs/nfsserver/nfs_nfsdport.c projects/pseries/fs/nfsserver/nfs_nfsdsubs.c projects/pseries/fs/ntfs/ntfs_compr.c projects/pseries/fs/ntfs/ntfs_subr.c projects/pseries/fs/ntfs/ntfs_subr.h projects/pseries/fs/ntfs/ntfs_vnops.c projects/pseries/fs/nullfs/null_subr.c projects/pseries/fs/nullfs/null_vfsops.c projects/pseries/fs/nullfs/null_vnops.c projects/pseries/fs/nwfs/nwfs_io.c projects/pseries/fs/nwfs/nwfs_vfsops.c projects/pseries/fs/procfs/procfs_status.c projects/pseries/fs/pseudofs/pseudofs_vnops.c projects/pseries/fs/smbfs/smbfs_io.c projects/pseries/fs/smbfs/smbfs_vfsops.c projects/pseries/fs/smbfs/smbfs_vnops.c projects/pseries/fs/tmpfs/tmpfs.h projects/pseries/fs/tmpfs/tmpfs_subr.c projects/pseries/fs/tmpfs/tmpfs_vnops.c projects/pseries/gdb/gdb_cons.c projects/pseries/geom/eli/g_eli.c projects/pseries/geom/geom_vfs.c projects/pseries/geom/part/g_part_apm.c projects/pseries/geom/raid/md_intel.c projects/pseries/gnu/fs/xfs/xfs_vfsops.c projects/pseries/i386/conf/GENERIC projects/pseries/i386/conf/NOTES projects/pseries/i386/conf/PAE projects/pseries/i386/conf/XEN projects/pseries/i386/i386/legacy.c projects/pseries/i386/i386/locore.s projects/pseries/i386/i386/machdep.c projects/pseries/i386/i386/mp_machdep.c projects/pseries/i386/i386/pmap.c projects/pseries/i386/i386/sys_machdep.c projects/pseries/i386/ibcs2/ibcs2_socksys.c projects/pseries/i386/ibcs2/ibcs2_stat.c projects/pseries/i386/include/_types.h projects/pseries/i386/include/asm.h projects/pseries/i386/include/ucontext.h projects/pseries/i386/include/vmparam.h projects/pseries/i386/linux/linux.h projects/pseries/i386/linux/linux_dummy.c projects/pseries/i386/linux/linux_proto.h projects/pseries/i386/linux/linux_syscall.h projects/pseries/i386/linux/linux_syscalls.c projects/pseries/i386/linux/linux_sysent.c projects/pseries/i386/linux/linux_systrace_args.c projects/pseries/i386/linux/syscalls.master projects/pseries/i386/xen/mp_machdep.c projects/pseries/i386/xen/pmap.c projects/pseries/ia64/conf/GENERIC projects/pseries/ia64/ia64/ssc.c projects/pseries/ia64/ia64/uma_machdep.c projects/pseries/ia64/include/_types.h projects/pseries/isa/vga_isa.c projects/pseries/kern/init_sysent.c projects/pseries/kern/kern_conf.c projects/pseries/kern/kern_cons.c projects/pseries/kern/kern_cpuset.c projects/pseries/kern/kern_ffclock.c projects/pseries/kern/kern_intr.c projects/pseries/kern/kern_ktr.c projects/pseries/kern/kern_ktrace.c projects/pseries/kern/kern_linker.c projects/pseries/kern/kern_lock.c projects/pseries/kern/kern_malloc.c projects/pseries/kern/kern_mutex.c projects/pseries/kern/kern_ntptime.c projects/pseries/kern/kern_proc.c projects/pseries/kern/kern_prot.c projects/pseries/kern/kern_racct.c projects/pseries/kern/kern_resource.c projects/pseries/kern/kern_rmlock.c projects/pseries/kern/kern_rwlock.c projects/pseries/kern/kern_shutdown.c projects/pseries/kern/kern_switch.c projects/pseries/kern/kern_sx.c projects/pseries/kern/kern_synch.c projects/pseries/kern/kern_tc.c projects/pseries/kern/kern_thr.c projects/pseries/kern/kern_thread.c projects/pseries/kern/kern_umtx.c projects/pseries/kern/kern_uuid.c projects/pseries/kern/makesyscalls.sh projects/pseries/kern/sched_4bsd.c projects/pseries/kern/sched_ule.c projects/pseries/kern/subr_blist.c projects/pseries/kern/subr_bus.c projects/pseries/kern/subr_hints.c projects/pseries/kern/subr_kdb.c projects/pseries/kern/subr_lock.c projects/pseries/kern/subr_witness.c projects/pseries/kern/sys_pipe.c projects/pseries/kern/syscalls.c projects/pseries/kern/syscalls.master projects/pseries/kern/systrace_args.c projects/pseries/kern/tty_inq.c projects/pseries/kern/uipc_mqueue.c projects/pseries/kern/uipc_shm.c projects/pseries/kern/uipc_sockbuf.c projects/pseries/kern/vfs_bio.c projects/pseries/kern/vfs_cache.c projects/pseries/kern/vfs_lookup.c projects/pseries/kern/vfs_mountroot.c projects/pseries/kern/vfs_subr.c projects/pseries/kern/vfs_syscalls.c projects/pseries/kern/vnode_if.src projects/pseries/libkern/fnmatch.c projects/pseries/mips/adm5120/admpci.c projects/pseries/mips/adm5120/console.c projects/pseries/mips/atheros/apb.c projects/pseries/mips/atheros/ar71xx_chip.c projects/pseries/mips/atheros/ar71xx_cpudef.h projects/pseries/mips/atheros/ar71xx_ehci.c projects/pseries/mips/atheros/ar71xx_gpio.c projects/pseries/mips/atheros/ar71xx_machdep.c projects/pseries/mips/atheros/ar71xx_ohci.c projects/pseries/mips/atheros/ar71xx_pci.c projects/pseries/mips/atheros/ar724x_chip.c projects/pseries/mips/atheros/ar724x_pci.c projects/pseries/mips/atheros/ar91xx_chip.c projects/pseries/mips/atheros/if_arge.c projects/pseries/mips/cavium/cryptocteon/cavium_crypto.c projects/pseries/mips/cavium/files.octeon1 projects/pseries/mips/cavium/octeon_ds1337.c projects/pseries/mips/cavium/octeon_machdep.c projects/pseries/mips/cavium/octopci.c projects/pseries/mips/cavium/usb/octusb.c projects/pseries/mips/cavium/usb/octusb.h projects/pseries/mips/cavium/usb/octusb_octeon.c projects/pseries/mips/conf/AR91XX_BASE projects/pseries/mips/conf/AR91XX_BASE.hints projects/pseries/mips/conf/OCTEON1 projects/pseries/mips/conf/PB92 projects/pseries/mips/conf/TP-WN1043ND projects/pseries/mips/conf/TP-WN1043ND.hints projects/pseries/mips/conf/XLPN32 projects/pseries/mips/idt/idtpci.c projects/pseries/mips/idt/if_kr.c projects/pseries/mips/include/_stdint.h projects/pseries/mips/include/_types.h projects/pseries/mips/include/cpufunc.h projects/pseries/mips/include/cpuregs.h projects/pseries/mips/include/frame.h projects/pseries/mips/include/intr_machdep.h projects/pseries/mips/include/proc.h projects/pseries/mips/malta/gt.c projects/pseries/mips/malta/gt_pci.c projects/pseries/mips/mips/db_disasm.c projects/pseries/mips/mips/db_trace.c projects/pseries/mips/mips/elf_machdep.c projects/pseries/mips/mips/exception.S projects/pseries/mips/mips/gdb_machdep.c projects/pseries/mips/mips/genassym.c projects/pseries/mips/mips/locore.S projects/pseries/mips/mips/pm_machdep.c projects/pseries/mips/mips/swtch.S projects/pseries/mips/mips/trap.c projects/pseries/mips/mips/vm_machdep.c projects/pseries/mips/nlm/cms.c projects/pseries/mips/nlm/files.xlp projects/pseries/mips/nlm/hal/cop2.h projects/pseries/mips/nlm/hal/cpucontrol.h projects/pseries/mips/nlm/hal/fmn.c projects/pseries/mips/nlm/hal/fmn.h projects/pseries/mips/nlm/hal/iomap.h projects/pseries/mips/nlm/hal/pcibus.h projects/pseries/mips/nlm/hal/pic.h projects/pseries/mips/nlm/mpreset.S projects/pseries/mips/nlm/msgring.h projects/pseries/mips/nlm/xlp.h projects/pseries/mips/nlm/xlp_machdep.c projects/pseries/mips/nlm/xlp_pci.c projects/pseries/mips/rmi/dev/nlge/if_nlge.c projects/pseries/mips/rmi/dev/sec/rmisec.c projects/pseries/mips/rmi/xlr_pci.c projects/pseries/mips/rmi/xls_ehci.c projects/pseries/mips/rt305x/rt305x_dotg.c projects/pseries/modules/Makefile projects/pseries/modules/acpi/acpi/Makefile projects/pseries/modules/aic7xxx/ahc/ahc_pci/Makefile projects/pseries/modules/aic7xxx/ahd/Makefile projects/pseries/modules/asr/Makefile projects/pseries/modules/ath/Makefile projects/pseries/modules/cam/Makefile projects/pseries/modules/ce/Makefile projects/pseries/modules/cxgbe/Makefile projects/pseries/modules/drm/r128/Makefile projects/pseries/modules/drm/radeon/Makefile projects/pseries/modules/drm/via/Makefile projects/pseries/modules/ipfilter/Makefile projects/pseries/modules/kgssapi_krb5/Makefile projects/pseries/modules/nve/Makefile projects/pseries/modules/nxge/Makefile projects/pseries/modules/pfsync/Makefile projects/pseries/modules/random/Makefile projects/pseries/modules/sound/driver/emu10k1/Makefile projects/pseries/modules/sound/driver/emu10kx/Makefile projects/pseries/modules/splash/Makefile projects/pseries/modules/usb/Makefile projects/pseries/modules/xfs/Makefile projects/pseries/net/bpf.c projects/pseries/net/if.c projects/pseries/net/if.h projects/pseries/net/if_clone.c projects/pseries/net/if_clone.h projects/pseries/net/if_ethersubr.c projects/pseries/net/if_llatbl.c projects/pseries/net/if_media.h projects/pseries/net/if_types.h projects/pseries/net/if_var.h projects/pseries/net/if_vlan.c projects/pseries/net/if_vlan_var.h projects/pseries/net/netmap.h projects/pseries/net/route.c projects/pseries/net/rtsock.c projects/pseries/net80211/ieee80211.c projects/pseries/net80211/ieee80211_acl.c projects/pseries/net80211/ieee80211_hostap.c projects/pseries/net80211/ieee80211_ht.c projects/pseries/net80211/ieee80211_ioctl.c projects/pseries/net80211/ieee80211_mesh.c projects/pseries/net80211/ieee80211_output.c projects/pseries/net80211/ieee80211_proto.h projects/pseries/net80211/ieee80211_radiotap.c projects/pseries/net80211/ieee80211_radiotap.h projects/pseries/net80211/ieee80211_var.h projects/pseries/netatalk/aarp.c projects/pseries/netatalk/at_control.c projects/pseries/netgraph/ng_base.c projects/pseries/netgraph/ng_ksocket.c projects/pseries/netinet/if_ether.c projects/pseries/netinet/if_ether.h projects/pseries/netinet/igmp.c projects/pseries/netinet/in.c projects/pseries/netinet/in_mcast.c projects/pseries/netinet/in_pcb.c projects/pseries/netinet/in_proto.c projects/pseries/netinet/in_var.h projects/pseries/netinet/ip_carp.c projects/pseries/netinet/ip_carp.h projects/pseries/netinet/ip_icmp.c projects/pseries/netinet/ip_input.c projects/pseries/netinet/ip_var.h projects/pseries/netinet/raw_ip.c projects/pseries/netinet/sctp.h projects/pseries/netinet/sctp_asconf.c projects/pseries/netinet/sctp_asconf.h projects/pseries/netinet/sctp_auth.c projects/pseries/netinet/sctp_auth.h projects/pseries/netinet/sctp_bsd_addr.c projects/pseries/netinet/sctp_bsd_addr.h projects/pseries/netinet/sctp_cc_functions.c projects/pseries/netinet/sctp_constants.h projects/pseries/netinet/sctp_crc32.h projects/pseries/netinet/sctp_dtrace_declare.h projects/pseries/netinet/sctp_dtrace_define.h projects/pseries/netinet/sctp_header.h projects/pseries/netinet/sctp_indata.c projects/pseries/netinet/sctp_indata.h projects/pseries/netinet/sctp_input.c projects/pseries/netinet/sctp_input.h projects/pseries/netinet/sctp_os.h projects/pseries/netinet/sctp_output.c projects/pseries/netinet/sctp_output.h projects/pseries/netinet/sctp_pcb.c projects/pseries/netinet/sctp_pcb.h projects/pseries/netinet/sctp_peeloff.c projects/pseries/netinet/sctp_peeloff.h projects/pseries/netinet/sctp_ss_functions.c projects/pseries/netinet/sctp_structs.h projects/pseries/netinet/sctp_sysctl.c projects/pseries/netinet/sctp_sysctl.h projects/pseries/netinet/sctp_timer.c projects/pseries/netinet/sctp_timer.h projects/pseries/netinet/sctp_uio.h projects/pseries/netinet/sctp_usrreq.c projects/pseries/netinet/sctp_var.h projects/pseries/netinet/sctputil.c projects/pseries/netinet/sctputil.h projects/pseries/netinet/tcp_input.c projects/pseries/netinet/tcp_reass.c projects/pseries/netinet/tcp_timewait.c projects/pseries/netinet/tcp_usrreq.c projects/pseries/netinet6/icmp6.c projects/pseries/netinet6/in6.c projects/pseries/netinet6/in6_ifattach.c projects/pseries/netinet6/in6_mcast.c projects/pseries/netinet6/in6_proto.c projects/pseries/netinet6/in6_var.h projects/pseries/netinet6/ip6_input.c projects/pseries/netinet6/ip6_mroute.c projects/pseries/netinet6/mld6.c projects/pseries/netinet6/nd6.c projects/pseries/netinet6/nd6.h projects/pseries/netinet6/nd6_nbr.c projects/pseries/netinet6/nd6_rtr.c projects/pseries/netinet6/scope6_var.h projects/pseries/netinet6/sctp6_usrreq.c projects/pseries/netinet6/sctp6_var.h projects/pseries/netipsec/xform_ah.c projects/pseries/netipsec/xform_esp.c projects/pseries/netipx/ipx.c projects/pseries/nfs/bootp_subr.c projects/pseries/nfsclient/nfs_bio.c projects/pseries/nfsclient/nfs_krpc.c projects/pseries/nfsserver/nfs_serv.c projects/pseries/ofed/include/asm/types.h projects/pseries/ofed/include/linux/types.h projects/pseries/pc98/cbus/scterm-sck.c projects/pseries/pc98/cbus/scvtb.c projects/pseries/pc98/cbus/sio.c projects/pseries/pc98/conf/GENERIC projects/pseries/pc98/include/md_var.h projects/pseries/pc98/pc98/pc98_machdep.h projects/pseries/pci/if_rl.c projects/pseries/pci/if_rlreg.h projects/pseries/pci/intpm.c projects/pseries/pci/viapm.c projects/pseries/powerpc/aim/locore32.S projects/pseries/powerpc/aim/machdep.c projects/pseries/powerpc/aim/mmu_oea.c projects/pseries/powerpc/aim/mmu_oea64.c projects/pseries/powerpc/aim/nexus.c projects/pseries/powerpc/aim/trap.c projects/pseries/powerpc/aim/uma_machdep.c projects/pseries/powerpc/booke/platform_bare.c projects/pseries/powerpc/conf/GENERIC projects/pseries/powerpc/conf/GENERIC64 projects/pseries/powerpc/include/_stdint.h projects/pseries/powerpc/include/_types.h projects/pseries/powerpc/include/pmap.h projects/pseries/powerpc/include/pmc_mdep.h projects/pseries/powerpc/include/spr.h projects/pseries/powerpc/include/vmparam.h projects/pseries/powerpc/mambo/mambo.c projects/pseries/powerpc/mambo/mambo_console.c projects/pseries/powerpc/mpc85xx/nexus.c projects/pseries/powerpc/mpc85xx/pci_fdt.c projects/pseries/powerpc/ofw/ofw_cpu.c projects/pseries/powerpc/ofw/ofw_pcib_pci.c projects/pseries/powerpc/powermac/cpcht.c projects/pseries/powerpc/powermac/cuda.c projects/pseries/powerpc/powermac/grackle.c projects/pseries/powerpc/powermac/platform_powermac.c projects/pseries/powerpc/powermac/pmu.c projects/pseries/powerpc/powermac/pmuvar.h projects/pseries/powerpc/powermac/uninorthpci.c projects/pseries/powerpc/powerpc/busdma_machdep.c projects/pseries/powerpc/ps3/ehci_ps3.c projects/pseries/powerpc/ps3/ohci_ps3.c projects/pseries/powerpc/ps3/ps3-hv-asm.awk projects/pseries/powerpc/ps3/ps3-hvcall.S projects/pseries/powerpc/ps3/ps3-hvcall.h projects/pseries/powerpc/ps3/ps3-hvcall.master projects/pseries/powerpc/ps3/ps3_syscons.c projects/pseries/powerpc/ps3/ps3bus.c projects/pseries/powerpc/ps3/ps3pic.c projects/pseries/security/mac/mac_framework.c projects/pseries/security/mac_lomac/mac_lomac.c projects/pseries/sparc64/central/central.c projects/pseries/sparc64/conf/GENERIC projects/pseries/sparc64/ebus/ebus.c projects/pseries/sparc64/ebus/epic.c projects/pseries/sparc64/fhc/fhc.c projects/pseries/sparc64/include/_types.h projects/pseries/sparc64/include/atomic.h projects/pseries/sparc64/include/md_var.h projects/pseries/sparc64/pci/apb.c projects/pseries/sparc64/pci/fire.c projects/pseries/sparc64/pci/ofw_pcib.c projects/pseries/sparc64/pci/ofw_pcibus.c projects/pseries/sparc64/pci/psycho.c projects/pseries/sparc64/pci/sbbc.c projects/pseries/sparc64/pci/schizo.c projects/pseries/sparc64/sbus/dma_sbus.c projects/pseries/sparc64/sbus/sbus.c projects/pseries/sparc64/sparc64/ata_machdep.c projects/pseries/sparc64/sparc64/eeprom.c projects/pseries/sparc64/sparc64/jbusppm.c projects/pseries/sparc64/sparc64/nexus.c projects/pseries/sparc64/sparc64/ofw_machdep.c projects/pseries/sparc64/sparc64/rtc.c projects/pseries/sparc64/sparc64/sc_machdep.c projects/pseries/sparc64/sparc64/schppm.c projects/pseries/sparc64/sparc64/ssm.c projects/pseries/sparc64/sparc64/upa.c projects/pseries/sparc64/sparc64/vm_machdep.c projects/pseries/sys/_null.h projects/pseries/sys/bus.h projects/pseries/sys/cdefs.h projects/pseries/sys/cons.h projects/pseries/sys/copyright.h projects/pseries/sys/elf_common.h projects/pseries/sys/libkern.h projects/pseries/sys/mman.h projects/pseries/sys/mutex.h projects/pseries/sys/namei.h projects/pseries/sys/param.h projects/pseries/sys/pmc.h projects/pseries/sys/proc.h projects/pseries/sys/resource.h projects/pseries/sys/sockio.h projects/pseries/sys/stdint.h projects/pseries/sys/sx.h projects/pseries/sys/syscall.h projects/pseries/sys/syscall.mk projects/pseries/sys/sysctl.h projects/pseries/sys/sysproto.h projects/pseries/sys/systm.h projects/pseries/sys/taskqueue.h projects/pseries/sys/timeffc.h projects/pseries/sys/timepps.h projects/pseries/sys/types.h projects/pseries/sys/umtx.h projects/pseries/sys/vnode.h projects/pseries/ufs/ffs/ffs_alloc.c projects/pseries/ufs/ufs/ufs_quota.c projects/pseries/vm/swap_pager.c projects/pseries/vm/vm_glue.c projects/pseries/vm/vm_map.c projects/pseries/vm/vm_meter.c projects/pseries/vm/vm_object.c projects/pseries/vm/vm_object.h projects/pseries/vm/vm_page.c projects/pseries/vm/vm_page.h projects/pseries/vm/vm_reserv.c projects/pseries/vm/vm_reserv.h projects/pseries/vm/vnode_pager.c projects/pseries/x86/acpica/acpi_apm.c projects/pseries/x86/acpica/srat.c projects/pseries/x86/pci/pci_bus.c projects/pseries/x86/pci/qpi.c projects/pseries/x86/x86/mptable_pci.c projects/pseries/xen/evtchn/evtchn_dev.c projects/pseries/xen/xenstore/xenstore.c Directory Properties: projects/pseries/ (props changed) projects/pseries/boot/ (props changed) projects/pseries/cddl/contrib/opensolaris/ (props changed) projects/pseries/conf/ (props changed) projects/pseries/contrib/dev/acpica/ (props changed) projects/pseries/contrib/octeon-sdk/ (props changed) projects/pseries/contrib/pf/ (props changed) Modified: projects/pseries/Makefile ============================================================================== --- projects/pseries/Makefile Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/Makefile Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/amd64/legacy.c ============================================================================== --- projects/pseries/amd64/amd64/legacy.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/amd64/legacy.c Thu Jan 12 22:30:41 2012 (r230036) @@ -237,19 +237,17 @@ static device_method_t cpu_methods[] = { /* Bus interface */ DEVMETHOD(bus_add_child, cpu_add_child), DEVMETHOD(bus_read_ivar, cpu_read_ivar), - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_get_resource_list, cpu_get_rlist), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t cpu_driver = { Modified: projects/pseries/amd64/amd64/machdep.c ============================================================================== --- projects/pseries/amd64/amd64/machdep.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/amd64/machdep.c Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/amd64/pmap.c ============================================================================== --- projects/pseries/amd64/amd64/pmap.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/amd64/pmap.c Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/conf/GENERIC ============================================================================== --- projects/pseries/amd64/conf/GENERIC Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/conf/GENERIC Thu Jan 12 22:30:41 2012 (r230036) @@ -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 @@ -129,7 +131,8 @@ device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) -device ses # SCSI Environmental Services (and SAF-TE) +device ses # Enclosure Services (SES and SAF-TE) +device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem device amr # AMI MegaRAID Modified: projects/pseries/amd64/conf/NOTES ============================================================================== --- projects/pseries/amd64/conf/NOTES Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/conf/NOTES Thu Jan 12 22:30:41 2012 (r230036) @@ -294,6 +294,7 @@ options DRM_DEBUG # Include debug print # Requires the mwl firmware module # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking +# sfxge: Solarflare SFC9000 family 10Gb Ethernet adapters # wpi: Intel 3945ABG Wireless LAN controller # Requires the wpi firmware module @@ -307,6 +308,7 @@ device iwn device mwl device nfe device nve +device sfxge device wpi # IEEE 802.11 adapter firmware modules @@ -386,6 +388,10 @@ device aac device aacp # SCSI Passthrough interface (optional, CAM required) # +# Highpoint RocketRAID 27xx. +device hpt27xx + +# # Highpoint RocketRAID 182x. device hptmv @@ -453,9 +459,11 @@ device tpm # # ichwd: Intel ICH watchdog timer # amdsbwd: AMD SB7xx watchdog timer +# viawd: VIA south bridge watchdog timer # device ichwd device amdsbwd +device viawd # # Temperature sensors: Modified: projects/pseries/amd64/include/_types.h ============================================================================== --- projects/pseries/amd64/include/_types.h Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/include/_types.h Thu Jan 12 22:30:41 2012 (r230036) @@ -48,7 +48,7 @@ /* * Basic types upon which most other types are built. */ -typedef __signed char __int8_t; +typedef signed char __int8_t; typedef unsigned char __uint8_t; typedef short __int16_t; typedef unsigned short __uint16_t; Modified: projects/pseries/amd64/linux32/linux.h ============================================================================== --- projects/pseries/amd64/linux32/linux.h Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/linux32/linux.h Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/linux32/linux32_dummy.c ============================================================================== --- projects/pseries/amd64/linux32/linux32_dummy.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/linux32/linux32_dummy.c Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/linux32/linux32_proto.h ============================================================================== --- projects/pseries/amd64/linux32/linux32_proto.h Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/linux32/linux32_proto.h Thu Jan 12 22:30:41 2012 (r230036) @@ -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_ @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -755,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)]; @@ -829,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/pseries/amd64/linux32/linux32_syscall.h ============================================================================== --- projects/pseries/amd64/linux32/linux32_syscall.h Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/linux32/linux32_syscall.h Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/linux32/linux32_syscalls.c ============================================================================== --- projects/pseries/amd64/linux32/linux32_syscalls.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/linux32/linux32_syscalls.c Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/linux32/linux32_sysent.c ============================================================================== --- projects/pseries/amd64/linux32/linux32_sysent.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/linux32/linux32_sysent.c Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/linux32/linux32_systrace_args.c ============================================================================== --- projects/pseries/amd64/linux32/linux32_systrace_args.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/linux32/linux32_systrace_args.c Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/amd64/linux32/syscalls.master ============================================================================== --- projects/pseries/amd64/linux32/syscalls.master Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/amd64/linux32/syscalls.master Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/arm/arm/irq_dispatch.S ============================================================================== --- projects/pseries/arm/arm/irq_dispatch.S Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/arm/irq_dispatch.S Thu Jan 12 22:30:41 2012 (r230036) @@ -98,10 +98,9 @@ ASENTRY_NP(irq_entry) PULLFRAMEFROMSVCANDEXIT movs pc, lr /* Exit */ - .bss + .data .align 0 - .global _C_LABEL(intrnames), _C_LABEL(sintrnames) .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt) _C_LABEL(intrnames): Modified: projects/pseries/arm/arm/pmap.c ============================================================================== --- projects/pseries/arm/arm/pmap.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/arm/pmap.c Thu Jan 12 22:30:41 2012 (r230036) @@ -4039,6 +4039,7 @@ pmap_zero_page_generic(vm_paddr_t phys, * order to work without corruption when write-allocate is enabled. */ *cdst_pte = L2_S_PROTO | phys | L2_S_PROT(PTE_KERNEL, VM_PROT_WRITE); + PTE_SYNC(cdst_pte); cpu_tlb_flushD_SE(cdstp); cpu_cpwait(); if (off || size != PAGE_SIZE) Modified: projects/pseries/arm/arm/vm_machdep.c ============================================================================== --- projects/pseries/arm/arm/vm_machdep.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/arm/vm_machdep.c Thu Jan 12 22:30:41 2012 (r230036) @@ -617,7 +617,6 @@ uma_small_alloc(uma_zone_t zone, int byt void *ret; struct arm_small_page *sp; TAILQ_HEAD(,arm_small_page) *head; - static vm_pindex_t color; vm_page_t m; *flags = UMA_SLAB_PRIV; @@ -650,8 +649,7 @@ uma_small_alloc(uma_zone_t zone, int byt if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; for (;;) { - m = vm_page_alloc(NULL, color++, - pflags | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, 0, pflags | VM_ALLOC_NOOBJ); if (m == NULL) { if (wait & M_NOWAIT) return (NULL); Modified: projects/pseries/arm/conf/KB920X ============================================================================== --- projects/pseries/arm/conf/KB920X Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/conf/KB920X Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/arm/econa/ehci_ebus.c ============================================================================== --- projects/pseries/arm/econa/ehci_ebus.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/econa/ehci_ebus.c Thu Jan 12 22:30:41 2012 (r230036) @@ -75,10 +75,6 @@ __FBSDID("$FreeBSD$"); static device_attach_t ehci_ebus_attach; static device_detach_t ehci_ebus_detach; -static device_shutdown_t ehci_ebus_shutdown; -static device_suspend_t ehci_ebus_suspend; -static device_resume_t ehci_ebus_resume; - static void *ih_err; @@ -86,45 +82,6 @@ static void *ih_err; #define USB_BRIDGE_INTR_MASK 0x214 static int -ehci_ebus_suspend(device_t self) -{ - ehci_softc_t *sc = device_get_softc(self); - int err; - - err = bus_generic_suspend(self); - if (err) - return (err); - ehci_suspend(sc); - return (0); -} - -static int -ehci_ebus_resume(device_t self) -{ - ehci_softc_t *sc = device_get_softc(self); - - ehci_resume(sc); - - bus_generic_resume(self); - - return (0); -} - -static int -ehci_ebus_shutdown(device_t self) -{ - ehci_softc_t *sc = device_get_softc(self); - int err; - - err = bus_generic_shutdown(self); - if (err) - return (err); - ehci_shutdown(sc); - - return (0); -} - -static int ehci_ebus_probe(device_t self) { @@ -235,7 +192,7 @@ ehci_ebus_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); /* * disable interrupts that might have been switched on in @@ -277,20 +234,17 @@ static device_method_t ehci_methods[] = DEVMETHOD(device_probe, ehci_ebus_probe), DEVMETHOD(device_attach, ehci_ebus_attach), DEVMETHOD(device_detach, ehci_ebus_detach), - DEVMETHOD(device_suspend, ehci_ebus_suspend), - DEVMETHOD(device_resume, ehci_ebus_resume), - DEVMETHOD(device_shutdown, ehci_ebus_shutdown), - - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t ehci_driver = { - "ehci", - ehci_methods, - sizeof(ehci_softc_t), + .name = "ehci", + .methods = ehci_methods, + .size = sizeof(ehci_softc_t), }; static devclass_t ehci_devclass; Modified: projects/pseries/arm/econa/ohci_ec.c ============================================================================== --- projects/pseries/arm/econa/ohci_ec.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/econa/ohci_ec.c Thu Jan 12 22:30:41 2012 (r230036) @@ -185,7 +185,7 @@ ohci_ec_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); bus_space_write_4(sc->sc_ohci.sc_io_tag, sc->sc_ohci.sc_io_hdl, OHCI_CONTROL, 0); @@ -220,18 +220,17 @@ static device_method_t ohci_methods[] = DEVMETHOD(device_probe, ohci_ec_probe), DEVMETHOD(device_attach, ohci_ec_attach), DEVMETHOD(device_detach, ohci_ec_detach), + DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_shutdown, bus_generic_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} + DEVMETHOD_END }; static driver_t ohci_driver = { - "ohci", - ohci_methods, - sizeof(struct ec_ohci_softc), + .name = "ohci", + .methods = ohci_methods, + .size = sizeof(struct ec_ohci_softc), }; static devclass_t ohci_devclass; Modified: projects/pseries/arm/include/_types.h ============================================================================== --- projects/pseries/arm/include/_types.h Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/include/_types.h Thu Jan 12 22:30:41 2012 (r230036) @@ -46,7 +46,7 @@ /* * Basic types upon which most other types are built. */ -typedef __signed char __int8_t; +typedef signed char __int8_t; typedef unsigned char __uint8_t; typedef short __int16_t; typedef unsigned short __uint16_t; Modified: projects/pseries/arm/include/pmap.h ============================================================================== --- projects/pseries/arm/include/pmap.h Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/include/pmap.h Thu Jan 12 22:30:41 2012 (r230036) @@ -382,7 +382,8 @@ do { \ if (PMAP_NEEDS_PTE_SYNC) { \ cpu_dcache_wb_range((vm_offset_t)(pte), sizeof(pt_entry_t));\ cpu_l2cache_wb_range((vm_offset_t)(pte), sizeof(pt_entry_t));\ - }\ + } else \ + cpu_drain_writebuf(); \ } while (/*CONSTCOND*/0) #define PTE_SYNC_RANGE(pte, cnt) \ @@ -392,7 +393,8 @@ do { \ (cnt) << 2); /* * sizeof(pt_entry_t) */ \ cpu_l2cache_wb_range((vm_offset_t)(pte), \ (cnt) << 2); /* * sizeof(pt_entry_t) */ \ - } \ + } else \ + cpu_drain_writebuf(); \ } while (/*CONSTCOND*/0) extern pt_entry_t pte_l1_s_cache_mode; Modified: projects/pseries/arm/mv/common.c ============================================================================== --- projects/pseries/arm/mv/common.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/mv/common.c Thu Jan 12 22:30:41 2012 (r230036) @@ -1693,7 +1693,7 @@ fdt_get_ranges(const char *nodename, voi int len, tuple_size, tuples_count; node = OF_finddevice(nodename); - if (node <= 0) + if (node == -1) return (EINVAL); if ((fdt_addrsize_cells(node, &addr_cells, &size_cells)) != 0) @@ -1762,11 +1762,11 @@ win_cpu_from_dt(void) /* * Retrieve CESA SRAM data. */ - if ((node = OF_finddevice("sram")) != 0) + if ((node = OF_finddevice("sram")) != -1) if (fdt_is_compatible(node, "mrvl,cesa-sram")) goto moveon; - if ((node = OF_finddevice("/")) == 0) + if ((node = OF_finddevice("/")) != -1) return (ENXIO); if ((node = fdt_find_compatible(node, "mrvl,cesa-sram", 0)) == 0) @@ -1796,7 +1796,7 @@ fdt_win_setup(void) int err, i; node = OF_finddevice("/"); - if (node == 0) + if (node == -1) panic("fdt_win_setup: no root node"); node = fdt_find_compatible(node, "simple-bus", 1); Modified: projects/pseries/arm/mv/mv_machdep.c ============================================================================== --- projects/pseries/arm/mv/mv_machdep.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/mv/mv_machdep.c Thu Jan 12 22:30:41 2012 (r230036) @@ -617,13 +617,13 @@ platform_mpp_init(void) /* * Try to access the MPP node directly i.e. through /aliases/mpp. */ - if ((node = OF_finddevice("mpp")) != 0) + if ((node = OF_finddevice("mpp")) != -1) if (fdt_is_compatible(node, "mrvl,mpp")) goto moveon; /* * Find the node the long way. */ - if ((node = OF_finddevice("/")) == 0) + if ((node = OF_finddevice("/")) == -1) return (ENXIO); if ((node = fdt_find_compatible(node, "simple-bus", 0)) == 0) @@ -752,7 +752,7 @@ platform_devmap_init(void) /* * PCI range(s). */ - if ((root = OF_finddevice("/")) == 0) + if ((root = OF_finddevice("/")) == -1) return (ENXIO); for (child = OF_child(root); child != 0; child = OF_peer(child)) @@ -779,7 +779,7 @@ platform_devmap_init(void) /* * CESA SRAM range. */ - if ((child = OF_finddevice("sram")) != 0) + if ((child = OF_finddevice("sram")) != -1) if (fdt_is_compatible(child, "mrvl,cesa-sram")) goto moveon; Modified: projects/pseries/arm/mv/mv_pci.c ============================================================================== --- projects/pseries/arm/mv/mv_pci.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/mv/mv_pci.c Thu Jan 12 22:30:41 2012 (r230036) @@ -171,7 +171,6 @@ static device_method_t mv_pcib_methods[] DEVMETHOD(device_attach, mv_pcib_attach), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, mv_pcib_read_ivar), DEVMETHOD(bus_write_ivar, mv_pcib_write_ivar), DEVMETHOD(bus_alloc_resource, mv_pcib_alloc_resource), @@ -194,7 +193,7 @@ static device_method_t mv_pcib_methods[] DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - { 0, 0 } + DEVMETHOD_END }; static driver_t mv_pcib_driver = { Modified: projects/pseries/arm/xscale/i80321/i80321_pci.c ============================================================================== --- projects/pseries/arm/xscale/i80321/i80321_pci.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/xscale/i80321/i80321_pci.c Thu Jan 12 22:30:41 2012 (r230036) @@ -373,7 +373,6 @@ static device_method_t i80321_pci_method DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, i80321_read_ivar), DEVMETHOD(bus_write_ivar, i80321_write_ivar), DEVMETHOD(bus_alloc_resource, i80321_pci_alloc_resource), @@ -389,7 +388,7 @@ static device_method_t i80321_pci_method DEVMETHOD(pcib_write_config, i80321_pci_write_config), DEVMETHOD(pcib_route_interrupt, machdep_pci_route_interrupt), - {0, 0} + DEVMETHOD_END }; static driver_t i80321_pci_driver = { Modified: projects/pseries/arm/xscale/i8134x/i81342_pci.c ============================================================================== --- projects/pseries/arm/xscale/i8134x/i81342_pci.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/xscale/i8134x/i81342_pci.c Thu Jan 12 22:30:41 2012 (r230036) @@ -516,7 +516,6 @@ static device_method_t i81342_pci_method DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, i81342_read_ivar), DEVMETHOD(bus_write_ivar, i81342_write_ivar), DEVMETHOD(bus_alloc_resource, i81342_pci_alloc_resource), @@ -532,7 +531,7 @@ static device_method_t i81342_pci_method DEVMETHOD(pcib_write_config, i81342_pci_write_config), DEVMETHOD(pcib_route_interrupt, i81342_pci_route_interrupt), - {0, 0} + DEVMETHOD_END }; static driver_t i81342_pci_driver = { Modified: projects/pseries/arm/xscale/ixp425/avila_ata.c ============================================================================== --- projects/pseries/arm/xscale/ixp425/avila_ata.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/xscale/ixp425/avila_ata.c Thu Jan 12 22:30:41 2012 (r230036) @@ -263,7 +263,7 @@ ata_avila_detach(device_t dev) /* XXX quiesce gpio? */ /* detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); bus_teardown_intr(dev, sc->sc_irq, sc->sc_ih); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_irq); Modified: projects/pseries/arm/xscale/ixp425/ixdp425_pci.c ============================================================================== --- projects/pseries/arm/xscale/ixp425/ixdp425_pci.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/xscale/ixp425/ixdp425_pci.c Thu Jan 12 22:30:41 2012 (r230036) @@ -43,6 +43,9 @@ __FBSDID("$FreeBSD$"); #include #include #include + +#include + #include #include Modified: projects/pseries/arm/xscale/ixp425/ixp425_pci.c ============================================================================== --- projects/pseries/arm/xscale/ixp425/ixp425_pci.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/xscale/ixp425/ixp425_pci.c Thu Jan 12 22:30:41 2012 (r230036) @@ -45,9 +45,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include + #include #include #include @@ -445,7 +448,6 @@ static device_method_t ixppcib_methods[] DEVMETHOD(device_attach, ixppcib_attach), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, ixppcib_read_ivar), DEVMETHOD(bus_write_ivar, ixppcib_write_ivar), DEVMETHOD(bus_setup_intr, ixppcib_setup_intr), @@ -462,7 +464,7 @@ static device_method_t ixppcib_methods[] DEVMETHOD(pcib_write_config, ixppcib_write_config), DEVMETHOD(pcib_route_interrupt, ixppcib_route_interrupt), - {0, 0}, + DEVMETHOD_END }; static driver_t ixppcib_driver = { Modified: projects/pseries/arm/xscale/ixp425/ixp425var.h ============================================================================== --- projects/pseries/arm/xscale/ixp425/ixp425var.h Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/arm/xscale/ixp425/ixp425var.h Thu Jan 12 22:30:41 2012 (r230036) @@ -44,7 +44,6 @@ #include -#include #include /* NB: cputype is setup by set_cpufuncs */ Modified: projects/pseries/boot/arm/at91/libat91/sd-card.c ============================================================================== --- projects/pseries/boot/arm/at91/libat91/sd-card.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/boot/arm/at91/libat91/sd-card.c Thu Jan 12 22:30:41 2012 (r230036) @@ -94,14 +94,14 @@ MCIDeviceWaitReady(unsigned int timeout) } // End of if AT91C_MCI_RXBUFF } -inline static unsigned int +static inline unsigned int swap(unsigned int a) { return (((a & 0xff) << 24) | ((a & 0xff00) << 8) | ((a & 0xff0000) >> 8) | ((a & 0xff000000) >> 24)); } -inline static void +static inline void wait_ready() { int status; Modified: projects/pseries/boot/common/interp_parse.c ============================================================================== --- projects/pseries/boot/common/interp_parse.c Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/boot/common/interp_parse.c Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/boot/common/loader.8 ============================================================================== --- projects/pseries/boot/common/loader.8 Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/boot/common/loader.8 Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/boot/forth/loader.4th ============================================================================== --- projects/pseries/boot/forth/loader.4th Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/boot/forth/loader.4th Thu Jan 12 22:30:41 2012 (r230036) @@ -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/pseries/boot/forth/loader.conf ============================================================================== --- projects/pseries/boot/forth/loader.conf Thu Jan 12 22:21:20 2012 (r230035) +++ projects/pseries/boot/forth/loader.conf Thu Jan 12 22:30:41 2012 (r230036) @@ -260,6 +260,7 @@ pf_load="NO" # packet filter bridgestp_load="NO" # if_bridge(4) support miibus_load="NO" # miibus support, needed for some drivers +carp_load="NO" # carp(4) protocol if_ae_load="NO" # Attansic/Atheros L2 FastEthernet if_age_load="NO" # Attansic/Atheros L1 Gigabit Ethernet if_alc_load="NO" # Atheros AR8131/AR8132 Ethernet @@ -275,7 +276,6 @@ if_bridge_load="NO" # if_bridge(4) devi if_bwi_load="NO" # Broadcom BCM53xx IEEE 802.11b/g wireness NICs if_bwn_load="NO" # Broadcom BCM43xx IEEE 802.11 wireless NICs if_bxe_load="NO" # Broadcom NetXtreme II 10Gb Ethernet -if_carp_load="NO" # carp(4) devices if_cas_load="NO" # Sun Cassini/Cassini+ and NS DP83065 Saturn *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Jan 13 03:38:09 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8081F1065670; Fri, 13 Jan 2012 03:38:09 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E1AF8FC12; Fri, 13 Jan 2012 03:38:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0D3c9YB039580; Fri, 13 Jan 2012 03:38:09 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0D3c9dE039573; Fri, 13 Jan 2012 03:38:09 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201201130338.q0D3c9dE039573@svn.freebsd.org> From: Rick Macklem Date: Fri, 13 Jan 2012 03:38:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230041 - in projects/nfsv4.1-client/sys/fs: nfs nfsclient X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2012 03:38:09 -0000 Author: rmacklem Date: Fri Jan 13 03:38:08 2012 New Revision: 230041 URL: http://svn.freebsd.org/changeset/base/230041 Log: Update the layout handling functions and add new functions that hang the layouts and device info structures for pNFS off of the client id structure. Also, cleaned up the indentation of the client id structure. This code is still untested at this point. Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h projects/nfsv4.1-client/sys/fs/nfs/nfsport.h projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c Fri Jan 13 02:33:55 2012 (r230040) +++ projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c Fri Jan 13 03:38:08 2012 (r230041) @@ -104,6 +104,7 @@ MALLOC_DEFINE(M_NEWNFSDIROFF, "NFSCL dir "New NFS directory offset data"); MALLOC_DEFINE(M_NEWNFSDROLLBACK, "NFSD rollback", "New NFS local lock rollback"); +MALLOC_DEFINE(M_NEWNFSLAYOUT, "NFSCL layout", "NFSv4.1 Layout"); MALLOC_DEFINE(M_NEWNFSFLAYOUT, "NFSCL flayout", "NFSv4.1 File Layout"); MALLOC_DEFINE(M_NEWNFSDEVINFO, "NFSCL devinfo", "NFSv4.1 Device Info"); Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h Fri Jan 13 02:33:55 2012 (r230040) +++ projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h Fri Jan 13 03:38:08 2012 (r230041) @@ -74,7 +74,7 @@ struct nfscllockowner; struct nfscllock; struct nfscldeleg; struct nfscllayout; -struct nfsclfldevinfo; +struct nfscldevinfo; struct nfsv4lock; struct nfsvattr; struct nfs_vattr; @@ -444,10 +444,11 @@ int nfsrpc_destroysession(struct nfsmoun struct ucred *, NFSPROC_T *); int nfsrpc_destroyclient(struct nfsmount *, struct nfsclclient *, struct ucred *, NFSPROC_T *); -int nfsrpc_layoutget(vnode_t, int, uint64_t, uint64_t, uint64_t, - struct nfscllayout *, struct ucred *, NFSPROC_T *, void *); +int nfsrpc_layoutget(struct nfsmount *, uint8_t *, int, int, uint64_t, uint64_t, + uint64_t, nfsv4stateid_t *, int *, struct nfsclflayouthead *, + struct ucred *, NFSPROC_T *, void *); int nfsrpc_getdeviceinfo(struct nfsmount *, uint8_t *, int, uint32_t *, - struct nfsclfldevinfo **, struct ucred *, NFSPROC_T *); + struct nfscldevinfo **, struct ucred *, NFSPROC_T *); int nfsrpc_layoutcommit(vnode_t, off_t, uint64_t, int, nfsv4stateid_t *, int, off_t, int, struct timespec, int, int, uint8_t *, int *, uint64_t *, struct ucred *, NFSPROC_T *, void *); @@ -514,6 +515,13 @@ void nfscl_deleggetmodtime(vnode_t, stru int nfscl_tryclose(struct nfsclopen *, struct ucred *, struct nfsmount *, NFSPROC_T *); void nfscl_cleanup(NFSPROC_T *); +int nfscl_layout(struct nfsmount *, u_int8_t *, int, nfsv4stateid_t *, int, + struct nfsclflayouthead *, struct nfscllayout **, struct ucred *, + NFSPROC_T *); +struct nfscllayout *nfscl_getlayout(struct nfsmount *, uint8_t *, int); +void nfscl_rellayout(struct nfscllayout *); +void nfscl_reldevinfo(struct nfscldevinfo *); +void nfscl_adddevinfo(struct nfsmount *, struct nfscldevinfo *); /* nfs_clport.c */ int nfscl_nget(mount_t, vnode_t, struct nfsfh *, Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h Fri Jan 13 02:33:55 2012 (r230040) +++ projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h Fri Jan 13 03:38:08 2012 (r230041) @@ -43,9 +43,18 @@ LIST_HEAD(nfscldeleghash, nfscldeleg); TAILQ_HEAD(nfscllayouthead, nfscllayout); LIST_HEAD(nfscllayouthash, nfscllayout); LIST_HEAD(nfsclflayouthead, nfsclflayout); +TAILQ_HEAD(nfscldevinfohead, nfscldevinfo); +LIST_HEAD(nfscldevinfohash, nfscldevinfo); #define NFSCLDELEGHASHSIZE 256 -#define NFSCLDELEGHASH(c, f, l) \ +#define NFSCLDELEGHASH(c, f, l) \ (&((c)->nfsc_deleghash[ncl_hash((f), (l)) % NFSCLDELEGHASHSIZE])) +#define NFSCLLAYOUTHASHSIZE 256 +#define NFSCLLAYOUTHASH(c, f, l) \ + (&((c)->nfsc_layouthash[ncl_hash((f), (l)) % NFSCLLAYOUTHASHSIZE])) +#define NFSCLDEVINFOHASHSIZE 16 +#define NFSCLDEVINFOHASH(c, f) \ + (&((c)->nfsc_devinfohash[ncl_hash((f), NFSX_V4DEVICEID) % \ + NFSCLDEVINFOHASHSIZE])) /* Structure for NFSv4.1 session stuff. */ struct nfsclsession { @@ -64,18 +73,22 @@ struct nfsclclient { struct nfsclownerhead nfsc_owner; struct nfscldeleghead nfsc_deleg; struct nfscldeleghash nfsc_deleghash[NFSCLDELEGHASHSIZE]; - struct nfsv4lock nfsc_lock; + struct nfscllayouthead nfsc_layout; + struct nfscllayouthash nfsc_layouthash[NFSCLLAYOUTHASHSIZE]; + struct nfscldevinfohead nfsc_devinfo; + struct nfscldevinfohash nfsc_devinfohash[NFSCLDEVINFOHASHSIZE]; + struct nfsv4lock nfsc_lock; struct nfsclsession nfsc_sess; - struct proc *nfsc_renewthread; - struct nfsmount *nfsc_nmp; - time_t nfsc_expire; - u_int32_t nfsc_clientidrev; - u_int32_t nfsc_renew; - u_int32_t nfsc_cbident; - u_int16_t nfsc_flags; - u_int16_t nfsc_backslots; /* Number of back channel slots. */ - u_int16_t nfsc_idlen; - u_int8_t nfsc_id[1]; /* Malloc'd to correct length */ + struct proc *nfsc_renewthread; + struct nfsmount *nfsc_nmp; + time_t nfsc_expire; + u_int32_t nfsc_clientidrev; + u_int32_t nfsc_renew; + u_int32_t nfsc_cbident; + u_int16_t nfsc_flags; + u_int16_t nfsc_backslots; /* # of back channel slots. */ + u_int16_t nfsc_idlen; + u_int8_t nfsc_id[1]; /* Malloc'd to correct length */ }; #define nfsc_mtx nfsc_sess.nfsess_mtx @@ -209,6 +222,7 @@ struct nfscllayout { nfsv4stateid_t nfsly_stateid; struct nfsclflayouthead nfsly_flay; struct nfsclclient *nfsly_clp; + uint32_t nfsly_refcnt; uint16_t nfsly_retonclose; uint16_t nfsly_fhlen; uint8_t nfsly_fh[1]; @@ -240,11 +254,12 @@ struct nfsclflayout { * of them. (This implies a limit of 256 on nfsdi_addrcnt, since the * indices select which address.) */ -struct nfsclfldevinfo { - TAILQ_ENTRY(nfsclfldevinfo) nfsdi_list; - LIST_ENTRY(nfsclfldevinfo) nfsdi_hash; +struct nfscldevinfo { + TAILQ_ENTRY(nfscldevinfo) nfsdi_list; + LIST_ENTRY(nfscldevinfo) nfsdi_hash; uint8_t nfsdi_deviceid[NFSX_V4DEVICEID]; struct nfsclclient *nfsdi_clp; + uint32_t nfsdi_refcnt; uint16_t nfsdi_stripecnt; uint16_t nfsdi_addrcnt; struct sockaddr_storage nfsdi_data[1]; @@ -255,7 +270,7 @@ struct nfsclfldevinfo { * Return a pointer to the address at "pos". */ static __inline struct sockaddr_storage * -nfsfldi_addr(struct nfsclfldevinfo *ndi, int pos) +nfsfldi_addr(struct nfscldevinfo *ndi, int pos) { if (pos >= ndi->nfsdi_addrcnt) @@ -267,7 +282,7 @@ nfsfldi_addr(struct nfsclfldevinfo *ndi, * Return the Nth ("pos") stripe index. */ static __inline int -nfsfldi_stripeindex(struct nfsclfldevinfo *ndi, int pos) +nfsfldi_stripeindex(struct nfscldevinfo *ndi, int pos) { uint8_t *valp; @@ -282,7 +297,7 @@ nfsfldi_stripeindex(struct nfsclfldevinf * Set the Nth ("pos") stripe index to "val". */ static __inline void -nfsfldi_setstripeindex(struct nfsclfldevinfo *ndi, int pos, uint8_t val) +nfsfldi_setstripeindex(struct nfscldevinfo *ndi, int pos, uint8_t val) { uint8_t *valp; Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsport.h ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfsport.h Fri Jan 13 02:33:55 2012 (r230040) +++ projects/nfsv4.1-client/sys/fs/nfs/nfsport.h Fri Jan 13 03:38:08 2012 (r230041) @@ -428,13 +428,13 @@ struct ext_nfsstats { #include #include #include +#include #include #include #include #include #include #include -#include #include #include @@ -732,6 +732,7 @@ MALLOC_DECLARE(M_NEWNFSV4NODE); MALLOC_DECLARE(M_NEWNFSDIRECTIO); MALLOC_DECLARE(M_NEWNFSMNT); MALLOC_DECLARE(M_NEWNFSDROLLBACK); +MALLOC_DECLARE(M_NEWNFSLAYOUT); MALLOC_DECLARE(M_NEWNFSFLAYOUT); MALLOC_DECLARE(M_NEWNFSDEVINFO); #define M_NFSRVCACHE M_NEWNFSRVCACHE @@ -753,6 +754,7 @@ MALLOC_DECLARE(M_NEWNFSDEVINFO); #define M_NFSV4NODE M_NEWNFSV4NODE #define M_NFSDIRECTIO M_NEWNFSDIRECTIO #define M_NFSDROLLBACK M_NEWNFSDROLLBACK +#define M_NFSLAYOUT M_NEWNFSLAYOUT #define M_NFSFLAYOUT M_NEWNFSFLAYOUT #define M_NFSDEVINFO M_NEWNFSDEVINFO Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Fri Jan 13 02:33:55 2012 (r230040) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Fri Jan 13 03:38:08 2012 (r230041) @@ -85,6 +85,8 @@ static int nfsrpc_locku(struct nfsrv_des u_int32_t, struct ucred *, NFSPROC_T *, int); static int nfsrpc_setaclrpc(vnode_t, struct ucred *, NFSPROC_T *, struct acl *, nfsv4stateid_t *, void *); +static int nfsrpc_getlayout(struct nfsmount *, struct nfsfh *, int, uint32_t *, + nfsv4stateid_t *, struct ucred *, NFSPROC_T *); /* * nfs null call from vfs. @@ -222,6 +224,8 @@ nfsrpc_open(vnode_t vp, int amode, struc struct nfsmount *nmp = VFSTONFS(vnode_mount(vp)); u_int32_t mode, clidrev; int ret, newone, error, expireret = 0, retrycnt; + int iomode; + nfsv4stateid_t stateid; /* * For NFSv4, Open Ops are only done on Regular Files. @@ -229,10 +233,13 @@ nfsrpc_open(vnode_t vp, int amode, struc if (vnode_vtype(vp) != VREG) return (0); mode = 0; + iomode = NFSLAYOUTIOMODE_READ; if (amode & FREAD) mode |= NFSV4OPEN_ACCESSREAD; - if (amode & FWRITE) + if (amode & FWRITE) { mode |= NFSV4OPEN_ACCESSWRITE; + iomode = NFSLAYOUTIOMODE_RW; + } nfhp = np->n_fhp; retrycnt = 0; @@ -284,6 +291,16 @@ else printf(" fhl=0\n"); op->nfso_own->nfsow_clp, nfhp->nfh_fh, nfhp->nfh_len, cred, p, &dp); } + + /* Try and get a Layout, if it is supported. */ + if (error == 0 && NFSHASPNFS(nmp)) { + stateid.seqid = op->nfso_stateid.seqid; + stateid.other[0] = op->nfso_stateid.other[0]; + stateid.other[1] = op->nfso_stateid.other[1]; + stateid.other[2] = op->nfso_stateid.other[2]; + (void)nfsrpc_getlayout(nmp, nfhp, iomode, + NULL, &stateid, cred, p); + } } else { error = EIO; } @@ -4301,6 +4318,11 @@ printf("exch err=%d reps=%d\n",error,nd- clp->nfsc_sequenceid = fxdr_unsigned(uint32_t, *tl++); v41flags = fxdr_unsigned(uint32_t, *tl); printf("v41fl=0x%x\n", v41flags); + if ((v41flags & NFSV4EXCH_USEPNFSMDS) != 0) { + NFSLOCKMNT(nmp); + nmp->nm_state |= NFSSTA_PNFS; + NFSUNLOCKMNT(nmp); + } } error = nd->nd_repstat; nfsmout: @@ -4457,21 +4479,20 @@ nfsrpc_destroyclient(struct nfsmount *nm * Do the NFSv4.1 LayoutGet. */ int -nfsrpc_layoutget(vnode_t vp, int iomode, uint64_t offset, uint64_t len, - uint64_t minlen, struct nfscllayout *lp, struct ucred *cred, +nfsrpc_layoutget(struct nfsmount *nmp, uint8_t *fhp, int fhlen, int iomode, + uint64_t offset, uint64_t len, uint64_t minlen, nfsv4stateid_t *stateidp, + int *retonclosep, struct nfsclflayouthead *flhp, struct ucred *cred, NFSPROC_T *p, void *stuff) { uint32_t *tl; struct nfsrv_descript nfsd, *nd = &nfsd; - struct nfsfh *fhp; - struct nfsclflayout *flp, *nflp, *tflp; - struct nfsnode *np; - int cnt, error, fhcnt, fhlen, i, j; + struct nfsfh *nfhp; + struct nfsclflayout *flp, *prevflp, *tflp; + int cnt, error, fhcnt, nfhlen, i, j; uint8_t *cp; - np = VTONFS(vp); flp = NULL; - NFSCL_REQSTART(nd, NFSPROC_LAYOUTGET, vp); + nfscl_reqstart(nd, NFSPROC_LAYOUTGET, nmp, fhp, fhlen, NULL, NULL); NFSM_BUILD(tl, uint32_t *, 4 * NFSX_UNSIGNED + 3 * NFSX_HYPER + NFSX_STATEID); *tl++ = newnfs_false; /* Don't signal availability. */ @@ -4483,25 +4504,27 @@ nfsrpc_layoutget(vnode_t vp, int iomode, tl += 2; txdr_hyper(minlen, tl); tl += 2; - *tl++ = lp->nfsly_stateid.seqid; - *tl++ = lp->nfsly_stateid.other[0]; - *tl++ = lp->nfsly_stateid.other[1]; - *tl++ = lp->nfsly_stateid.other[2]; + *tl++ = stateidp->seqid; + *tl++ = stateidp->other[0]; + *tl++ = stateidp->other[1]; + *tl++ = stateidp->other[2]; *tl = txdr_unsigned(100000); /* take a large layout list */ nd->nd_flag |= ND_USEGSSNAME; - error = nfscl_request(nd, vp, p, cred, stuff); + error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, + NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); if (error) return (error); if (nd->nd_repstat == 0) { NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED + NFSX_STATEID); - if (*tl++ != 0) { - lp->nfsly_retonclose = 1; -printf("layg setting retonclose\n"); - } - lp->nfsly_stateid.seqid = *tl++; - lp->nfsly_stateid.other[0] = *tl++; - lp->nfsly_stateid.other[1] = *tl++; - lp->nfsly_stateid.other[2] = *tl++; + if (*tl++ != 0) + *retonclosep = 1; + else + *retonclosep = 0; +printf("retonclose=%d\n", *retonclosep); + stateidp->seqid = *tl++; + stateidp->other[0] = *tl++; + stateidp->other[1] = *tl++; + stateidp->other[2] = *tl++; cnt = fxdr_unsigned(int, *tl); printf("layg cnt=%d\n", cnt); if (cnt <= 0 || cnt > 10000) { @@ -4551,35 +4574,31 @@ printf("layg iom=%d\n", iomode); } for (j = 0; j < fhcnt; j++) { NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); - fhlen = fxdr_unsigned(int, *tl); - if (fhlen <= 0 || fhlen > NFSX_V4FHMAX) { + nfhlen = fxdr_unsigned(int, *tl); + if (nfhlen <= 0 || nfhlen > NFSX_V4FHMAX) { error = NFSERR_BADXDR; goto nfsmout; } - fhp = malloc(sizeof(*fhp) + fhlen - 1, + nfhp = malloc(sizeof(*nfhp) + nfhlen - 1, M_NFSFH, M_WAITOK); - flp->nfsfl_fh[j] = fhp; + flp->nfsfl_fh[j] = nfhp; flp->nfsfl_fhcnt++; - fhp->nfh_len = fhlen; + nfhp->nfh_len = nfhlen; NFSM_DISSECT(cp, uint8_t *, NFSM_RNDUP(fhlen)); - NFSBCOPY(cp, fhp->nfh_fh, fhlen); + NFSBCOPY(cp, nfhp->nfh_fh, nfhlen); } - if (LIST_EMPTY(&lp->nfsly_flay) || - LIST_FIRST(&lp->nfsly_flay)->nfsfl_off >= - flp->nfsfl_off) - LIST_INSERT_HEAD(&lp->nfsly_flay, flp, - nfsfl_list); - else { - nflp = LIST_FIRST(&lp->nfsly_flay); - tflp = LIST_NEXT(nflp, nfsfl_list); - while (tflp != NULL) { - if (tflp->nfsfl_off >= flp->nfsfl_off) - break; - nflp = tflp; - tflp = LIST_NEXT(tflp, nfsfl_list); - } - LIST_INSERT_AFTER(nflp, flp, nfsfl_list); + /* Maintain the list in increasing offset order. */ + tflp = LIST_FIRST(flhp); + prevflp = NULL; + while (tflp != NULL && + tflp->nfsfl_off < flp->nfsfl_off) { + prevflp = tflp; + tflp = LIST_NEXT(tflp, nfsfl_list); } + if (prevflp == NULL) + LIST_INSERT_HEAD(flhp, flp, nfsfl_list); + else + LIST_INSERT_AFTER(prevflp, flp, nfsfl_list); flp = NULL; } } @@ -4600,14 +4619,14 @@ nfsmout: */ int nfsrpc_getdeviceinfo(struct nfsmount *nmp, uint8_t *deviceid, int layouttype, - uint32_t *notifybitsp, struct nfsclfldevinfo **ndip, struct ucred *cred, + uint32_t *notifybitsp, struct nfscldevinfo **ndip, struct ucred *cred, NFSPROC_T *p) { uint32_t cnt, *tl; struct nfsrv_descript nfsd; struct sockaddr_storage ss, *sa; struct nfsrv_descript *nd = &nfsd; - struct nfsclfldevinfo *ndi; + struct nfscldevinfo *ndi; int addrcnt, bitcnt, error, i, isudp, j, pos, safilled, stripecnt; uint8_t stripeindex; @@ -4659,6 +4678,7 @@ nfsrpc_getdeviceinfo(struct nfsmount *nm sizeof(struct sockaddr_storage), M_NFSDEVINFO, M_WAITOK); NFSBCOPY(deviceid, ndi->nfsdi_deviceid, NFSX_V4DEVICEID); + ndi->nfsdi_refcnt = 0; ndi->nfsdi_stripecnt = stripecnt; ndi->nfsdi_addrcnt = addrcnt; /* Fill in the stripe indices. */ @@ -4877,3 +4897,43 @@ nfsmout: return (error); } +/* + * Called from nfsrpc_open() to acquire a layout and associated device + * info. A separate function mostly to avoid excessive indentation in + * nfsrpc_open(). + */ +static int +nfsrpc_getlayout(struct nfsmount *nmp, struct nfsfh *nfhp, int iomode, + uint32_t *notifybitsp, nfsv4stateid_t *stateidp, struct ucred *cred, + NFSPROC_T *p) +{ + struct nfscllayout *lyp; + struct nfsclflayout *flp; + struct nfscldevinfo *dip; + struct nfsclflayouthead flh; + int error = 0, retonclose; + + lyp = nfscl_getlayout(nmp, nfhp->nfh_fh, nfhp->nfh_len); + if (lyp == NULL) { + LIST_INIT(&flh); + error = nfsrpc_layoutget(nmp, nfhp->nfh_fh, nfhp->nfh_len, + iomode, (uint64_t)0, INT64_MAX, (uint64_t)(4 * NFS_MAXDATA), + stateidp, &retonclose, &flh, cred, p, NULL); + if (error == 0) + LIST_FOREACH(flp, &flh, nfsfl_list) { + error = nfsrpc_getdeviceinfo(nmp, + flp->nfsfl_dev, NFSLAYOUT_NFSV4_1_FILES, + notifybitsp, &dip, cred, p); + if (error != 0) + break; + nfscl_adddevinfo(nmp, dip); + } + if (error == 0) + error = nfscl_layout(nmp, nfhp->nfh_fh, nfhp->nfh_len, + stateidp, retonclose, &flh, &lyp, cred, p); + } + if (lyp != NULL) + nfscl_rellayout(lyp); + return (error); +} + Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c Fri Jan 13 02:33:55 2012 (r230040) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c Fri Jan 13 03:38:08 2012 (r230041) @@ -92,9 +92,11 @@ NFSCLSTATEMUTEX; int nfscl_inited = 0; struct nfsclhead nfsclhead; /* Head of clientid list */ int nfscl_deleghighwater = NFSCLDELEGHIGHWATER; +int nfscl_layouthighwater = NFSCLLAYOUTHIGHWATER; #endif /* !APPLEKEXT */ static int nfscl_delegcnt = 0; +static int nfscl_layoutcnt = 0; static int nfscl_getopen(struct nfsclownerhead *, u_int8_t *, int, u_int8_t *, u_int8_t *, u_int32_t, struct nfscllockowner **, struct nfsclopen **); static void nfscl_clrelease(struct nfsclclient *); @@ -115,6 +117,9 @@ static struct nfsclclient *nfscl_getclnt static struct nfsclclient *nfscl_getclntsess(uint8_t *); static struct nfscldeleg *nfscl_finddeleg(struct nfsclclient *, u_int8_t *, int); +static struct nfscllayout *nfscl_findlayout(struct nfsclclient *, u_int8_t *, + int); +static struct nfscldevinfo *nfscl_finddevinfo(struct nfsclclient *, uint8_t *); static int nfscl_checkconflict(struct nfscllockownerhead *, struct nfscllock *, u_int8_t *, struct nfscllock **); static void nfscl_freealllocks(struct nfscllockownerhead *, int); @@ -148,6 +153,8 @@ static int nfscl_trydelegreturn(struct n struct nfsmount *, NFSPROC_T *); static void nfscl_emptylockowner(struct nfscllockowner *, struct nfscllockownerfhhead *); +static void nfscl_mergeflayouts(struct nfsclflayouthead *, + struct nfsclflayouthead *); static short nfscberr_null[] = { 0, @@ -749,8 +756,14 @@ nfscl_getcl(struct mount *mp, struct ucr clp->nfsc_idlen = idlen; LIST_INIT(&clp->nfsc_owner); TAILQ_INIT(&clp->nfsc_deleg); + TAILQ_INIT(&clp->nfsc_layout); + TAILQ_INIT(&clp->nfsc_devinfo); for (i = 0; i < NFSCLDELEGHASHSIZE; i++) LIST_INIT(&clp->nfsc_deleghash[i]); + for (i = 0; i < NFSCLLAYOUTHASHSIZE; i++) + LIST_INIT(&clp->nfsc_layouthash[i]); + for (i = 0; i < NFSCLDEVINFOHASHSIZE; i++) + LIST_INIT(&clp->nfsc_devinfohash[i]); clp->nfsc_flags = NFSCLFLAGS_INITED; clp->nfsc_clientidrev = 1; clp->nfsc_cbident = nfscl_nextcbident(); @@ -4373,3 +4386,200 @@ nfscl_errmap(struct nfsrv_descript *nd) return (txdr_unsigned(*defaulterrp)); } +/* + * Called to find/add a layout to a client. + */ +APPLESTATIC int +nfscl_layout(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, + nfsv4stateid_t *stateidp, int retonclose, + struct nfsclflayouthead *fhlp, struct nfscllayout **lypp, + struct ucred *cred, NFSPROC_T *p) +{ + struct nfsclclient *clp; + struct nfscllayout *lyp, *tlyp; + + *lypp = NULL; + tlyp = malloc(sizeof(*tlyp) + fhlen - 1, M_NFSLAYOUT, M_WAITOK); + + NFSLOCKCLSTATE(); + clp = nmp->nm_clp; + if (clp == NULL) { + NFSUNLOCKCLSTATE(); + free(tlyp, M_NFSLAYOUT); + return (EPERM); + } + lyp = nfscl_findlayout(clp, fhp, fhlen); + if (lyp == NULL) { + lyp = tlyp; + tlyp = NULL; + lyp->nfsly_stateid.seqid = stateidp->seqid; + lyp->nfsly_stateid.other[0] = stateidp->other[0]; + lyp->nfsly_stateid.other[1] = stateidp->other[1]; + lyp->nfsly_stateid.other[2] = stateidp->other[2]; + LIST_INIT(&lyp->nfsly_flay); + lyp->nfsly_clp = clp; + lyp->nfsly_retonclose = retonclose; + lyp->nfsly_refcnt = 1; /* Return with a reference cnt. */ + lyp->nfsly_fhlen = fhlen; + NFSBCOPY(fhp, lyp->nfsly_fh, fhlen); + TAILQ_INSERT_HEAD(&clp->nfsc_layout, lyp, nfsly_list); + LIST_INSERT_HEAD(NFSCLLAYOUTHASH(clp, fhp, fhlen), lyp, + nfsly_hash); +#ifdef notyet + lyp->nfsly_timestamp = NFSD_MONOSEC + 120; +#endif + nfscl_layoutcnt++; + } else { + lyp->nfsly_refcnt++; + TAILQ_REMOVE(&clp->nfsc_layout, lyp, nfsly_list); + TAILQ_INSERT_HEAD(&clp->nfsc_layout, lyp, nfsly_list); + } + + /* Merge the new list of File Layouts into the list. */ + nfscl_mergeflayouts(&lyp->nfsly_flay, fhlp); + NFSUNLOCKCLSTATE(); + if (tlyp != NULL) + free(tlyp, M_NFSLAYOUT); + *lypp = lyp; + return (0); +} + +/* + * Search for a layout by MDS file handle. If one is found, lock it it and + * return a pointer to it. + */ +struct nfscllayout * +nfscl_getlayout(struct nfsmount *nmp, uint8_t *fhp, int fhlen) +{ + struct nfsclclient *clp; + struct nfscllayout *lyp; + + NFSLOCKCLSTATE(); + clp = nmp->nm_clp; + if (clp == NULL) { + NFSUNLOCKCLSTATE(); + return (NULL); + } + lyp = nfscl_findlayout(clp, fhp, fhlen); + if (lyp != NULL) { + lyp->nfsly_refcnt++; + TAILQ_REMOVE(&clp->nfsc_layout, lyp, nfsly_list); + TAILQ_INSERT_HEAD(&clp->nfsc_layout, lyp, nfsly_list); + } + NFSUNLOCKCLSTATE(); + return (lyp); +} + +/* + * Dereference a layout. + */ +void +nfscl_rellayout(struct nfscllayout *lyp) +{ + + NFSLOCKCLSTATE(); + lyp->nfsly_refcnt--; + if (lyp->nfsly_refcnt == 0) + wakeup(&lyp->nfsly_refcnt); + NFSUNLOCKCLSTATE(); +} + +/* + * Dereference a devinfo structure. + */ +void +nfscl_reldevinfo(struct nfscldevinfo *dip) +{ + + NFSLOCKCLSTATE(); + dip->nfsdi_refcnt--; + if (dip->nfsdi_refcnt == 0) + wakeup(&dip->nfsdi_refcnt); + NFSUNLOCKCLSTATE(); +} + +/* + * Find a layout for this file handle. Return NULL upon failure. + */ +static struct nfscllayout * +nfscl_findlayout(struct nfsclclient *clp, u_int8_t *fhp, int fhlen) +{ + struct nfscllayout *lyp; + + LIST_FOREACH(lyp, NFSCLLAYOUTHASH(clp, fhp, fhlen), nfsly_hash) + if (lyp->nfsly_fhlen == fhlen && + !NFSBCMP(lyp->nfsly_fh, fhp, fhlen)) + break; + return (lyp); +} + +/* + * Find a devinfo for this deviceid. Return NULL upon failure. + */ +static struct nfscldevinfo * +nfscl_finddevinfo(struct nfsclclient *clp, uint8_t *deviceid) +{ + struct nfscldevinfo *dip; + + LIST_FOREACH(dip, NFSCLDEVINFOHASH(clp, deviceid), nfsdi_hash) + if (NFSBCMP(dip->nfsdi_deviceid, deviceid, NFSX_V4DEVICEID) + == 0) + break; + return (dip); +} + +/* + * Merge the new file layout list into the main one, maintaining it in + * increasing offset order. + */ +static void +nfscl_mergeflayouts(struct nfsclflayouthead *fhlp, + struct nfsclflayouthead *newfhlp) +{ + struct nfsclflayout *flp, *nflp, *prevflp, *tflp; + + flp = LIST_FIRST(fhlp); + prevflp = NULL; + LIST_FOREACH_SAFE(nflp, newfhlp, nfsfl_list, tflp) { + while (flp != NULL && flp->nfsfl_off < nflp->nfsfl_off) { + prevflp = flp; + flp = LIST_NEXT(flp, nfsfl_list); + } + if (prevflp == NULL) + LIST_INSERT_HEAD(fhlp, nflp, nfsfl_list); + else + LIST_INSERT_AFTER(prevflp, nflp, nfsfl_list); + prevflp = nflp; + } +} + +/* + * Add this nfscldevinfo to the client, if it doesn't already exist. + * This function consumes the structure pointed at by dip. + */ +APPLESTATIC void +nfscl_adddevinfo(struct nfsmount *nmp, struct nfscldevinfo *dip) +{ + struct nfsclclient *clp; + struct nfscldevinfo *tdip; + + NFSLOCKCLSTATE(); + clp = nmp->nm_clp; + if (clp == NULL) { + NFSUNLOCKCLSTATE(); + free(dip, M_NFSDEVINFO); + return; + } + tdip = nfscl_finddevinfo(clp, dip->nfsdi_deviceid); + if (tdip != NULL) { + nfscl_reldevinfo(tdip); + NFSUNLOCKCLSTATE(); + free(dip, M_NFSDEVINFO); + return; + } + TAILQ_INSERT_HEAD(&clp->nfsc_devinfo, dip, nfsdi_list); + LIST_INSERT_HEAD(NFSCLDEVINFOHASH(clp, dip->nfsdi_deviceid), dip, + nfsdi_hash); + NFSUNLOCKCLSTATE(); +} + From owner-svn-src-projects@FreeBSD.ORG Sat Jan 14 00:53:26 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4064106564A; Sat, 14 Jan 2012 00:53:26 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C32D78FC0C; Sat, 14 Jan 2012 00:53:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0E0rQXj087821; Sat, 14 Jan 2012 00:53:26 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0E0rQ2d087819; Sat, 14 Jan 2012 00:53:26 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201201140053.q0E0rQ2d087819@svn.freebsd.org> From: Rick Macklem Date: Sat, 14 Jan 2012 00:53:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230098 - projects/nfsv4.1-client/sys/fs/nfs X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2012 00:53:26 -0000 Author: rmacklem Date: Sat Jan 14 00:53:26 2012 New Revision: 230098 URL: http://svn.freebsd.org/changeset/base/230098 Log: Add the definition of NFSCLLAYOUTHIGHWATER. Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs.h Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs.h ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfs.h Sat Jan 14 00:36:07 2012 (r230097) +++ projects/nfsv4.1-client/sys/fs/nfs/nfs.h Sat Jan 14 00:53:26 2012 (r230098) @@ -101,6 +101,9 @@ #ifndef NFSCLDELEGHIGHWATER #define NFSCLDELEGHIGHWATER 10000 /* limit for client delegations */ #endif +#ifndef NFSCLLAYOUTHIGHWATER +#define NFSCLLAYOUTHIGHWATER 10000 /* limit for client pNFS layouts */ +#endif #ifndef NFSNOOPEN /* Inactive open owner (sec) */ #define NFSNOOPEN 120 #endif