From owner-svn-src-projects@FreeBSD.ORG Mon Oct 25 19:33:45 2010 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 6897C106566C; Mon, 25 Oct 2010 19:33:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 57ECA8FC1D; Mon, 25 Oct 2010 19:33:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9PJXjuY075225; Mon, 25 Oct 2010 19:33:45 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9PJXjpL075223; Mon, 25 Oct 2010 19:33:45 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201010251933.o9PJXjpL075223@svn.freebsd.org> From: Dimitry Andric Date: Mon, 25 Oct 2010 19:33:45 +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: r214354 - projects/binutils-2.17/contrib/binutils/ld 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: Mon, 25 Oct 2010 19:33:45 -0000 Author: dim Date: Mon Oct 25 19:33:45 2010 New Revision: 214354 URL: http://svn.freebsd.org/changeset/base/214354 Log: Apply commit d3a5e914c6ff07c426b026b0cda8d044fd1cdabe from upstream (still under GPLv2 at that time): Author: Nick Clifton Date: Thu Aug 24 14:59:24 2006 +0000 * ldlang.c (lang_size_sections_1, lang_assignment_statement_enum): Adjust the current address of DEFAULT_MEMORY_REGION even when dot hasn't changed. This is a prerequisite for the fix coming just after this. Modified: projects/binutils-2.17/contrib/binutils/ld/ldlang.c Modified: projects/binutils-2.17/contrib/binutils/ld/ldlang.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/ld/ldlang.c Mon Oct 25 17:05:14 2010 (r214353) +++ projects/binutils-2.17/contrib/binutils/ld/ldlang.c Mon Oct 25 19:33:45 2010 (r214354) @@ -4447,7 +4447,7 @@ lang_size_sections_1 output_section_statement->bfd_section, &newdot); - if (newdot != dot && !output_section_statement->ignored) + if (!output_section_statement->ignored) { if (output_section_statement == abs_output_section) { @@ -4456,7 +4456,7 @@ lang_size_sections_1 lang_memory_region_lookup (DEFAULT_MEMORY_REGION, FALSE)->current = newdot; } - else + else if (newdot != dot) { /* Insert a pad after this statement. We can't put the pad before when relaxing, in case the From owner-svn-src-projects@FreeBSD.ORG Mon Oct 25 19:43:22 2010 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 77765106564A; Mon, 25 Oct 2010 19:43:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 661C08FC15; Mon, 25 Oct 2010 19:43:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9PJhMvT075435; Mon, 25 Oct 2010 19:43:22 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9PJhMY7075431; Mon, 25 Oct 2010 19:43:22 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201010251943.o9PJhMY7075431@svn.freebsd.org> From: Dimitry Andric Date: Mon, 25 Oct 2010 19:43:22 +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: r214355 - in projects/binutils-2.17/contrib/binutils: bfd ld 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: Mon, 25 Oct 2010 19:43:22 -0000 Author: dim Date: Mon Oct 25 19:43:22 2010 New Revision: 214355 URL: http://svn.freebsd.org/changeset/base/214355 Log: Apply commit f6c8fecc6fe3d5532691867a7f27820bb1c426a9 from upstream (still under GPLv2 at that time): Author: H.J. Lu Date: Wed Sep 27 04:18:16 2006 +0000 PR ld/3223 PR ld/3267 * bfd/elf.c (assign_file_positions_for_non_load_sections): Don't warn zero size allocated sections. * ld/ldlang.h (lang_output_section_statement_type): Add section_relative_symbol. * ld/ldlang.c (strip_excluded_output_sections): Don't strip a section with a symbol relative to it. (lang_size_sections_1): Mark if an output section has a symbol symbol relative to it. This prevents warnings like the following during stripping of debug info from kernel modules on i386: ===> zlib (all) ... objcopy --only-keep-debug zlib.ko.debug zlib.ko.symbols objcopy --strip-debug --add-gnu-debuglink=zlib.ko.symbols zlib.ko.debug zlib.ko BFD: zlib.ko: warning: allocated section `.plt' not in segment BFD: zlib.ko: warning: allocated section `.got' not in segment Modified: projects/binutils-2.17/contrib/binutils/bfd/elf.c projects/binutils-2.17/contrib/binutils/ld/ldlang.c projects/binutils-2.17/contrib/binutils/ld/ldlang.h Modified: projects/binutils-2.17/contrib/binutils/bfd/elf.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/elf.c Mon Oct 25 19:33:45 2010 (r214354) +++ projects/binutils-2.17/contrib/binutils/bfd/elf.c Mon Oct 25 19:43:22 2010 (r214355) @@ -4787,12 +4787,13 @@ assign_file_positions_except_relocs (bfd hdr->sh_offset = hdr->bfd_section->filepos; else if ((hdr->sh_flags & SHF_ALLOC) != 0) { - ((*_bfd_error_handler) - (_("%B: warning: allocated section `%s' not in segment"), - abfd, - (hdr->bfd_section == NULL - ? "*unknown*" - : hdr->bfd_section->name))); + if (hdr->sh_size != 0) + ((*_bfd_error_handler) + (_("%B: warning: allocated section `%s' not in segment"), + abfd, + (hdr->bfd_section == NULL + ? "*unknown*" + : hdr->bfd_section->name))); if ((abfd->flags & D_PAGED) != 0) off += vma_page_aligned_bias (hdr->sh_addr, off, bed->maxpagesize); Modified: projects/binutils-2.17/contrib/binutils/ld/ldlang.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/ld/ldlang.c Mon Oct 25 19:33:45 2010 (r214354) +++ projects/binutils-2.17/contrib/binutils/ld/ldlang.c Mon Oct 25 19:43:22 2010 (r214355) @@ -3244,6 +3244,7 @@ strip_excluded_output_sections (void) continue; exclude = (output_section->rawsize == 0 + && !os->section_relative_symbol && (output_section->flags & SEC_KEEP) == 0 && !bfd_section_removed_from_list (output_bfd, output_section)); @@ -4442,11 +4443,19 @@ lang_size_sections_1 case lang_assignment_statement_enum: { bfd_vma newdot = dot; + etree_type *tree = s->assignment_statement.exp; - exp_fold_tree (s->assignment_statement.exp, + exp_fold_tree (tree, output_section_statement->bfd_section, &newdot); + /* This symbol is relative to this section. */ + if ((tree->type.node_class == etree_provided + || tree->type.node_class == etree_assign) + && (tree->assign.dst [0] != '.' + || tree->assign.dst [1] != '\0')) + output_section_statement->section_relative_symbol = 1; + if (!output_section_statement->ignored) { if (output_section_statement == abs_output_section) Modified: projects/binutils-2.17/contrib/binutils/ld/ldlang.h ============================================================================== --- projects/binutils-2.17/contrib/binutils/ld/ldlang.h Mon Oct 25 19:33:45 2010 (r214354) +++ projects/binutils-2.17/contrib/binutils/ld/ldlang.h Mon Oct 25 19:43:22 2010 (r214355) @@ -155,7 +155,10 @@ typedef struct lang_output_section_state enum section_type sectype; unsigned int processed : 1; unsigned int all_input_readonly : 1; + /* If this section should be ignored. */ unsigned int ignored : 1; + /* If there is a symbol relative to this section. */ + unsigned int section_relative_symbol : 1; } lang_output_section_statement_type; typedef struct From owner-svn-src-projects@FreeBSD.ORG Mon Oct 25 19:58:29 2010 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 50A851065694; Mon, 25 Oct 2010 19:58:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3B8558FC17; Mon, 25 Oct 2010 19:58:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9PJwTUm075871; Mon, 25 Oct 2010 19:58:29 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9PJwTSg075854; Mon, 25 Oct 2010 19:58:29 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201010251958.o9PJwTSg075854@svn.freebsd.org> From: Dimitry Andric Date: Mon, 25 Oct 2010 19:58:29 +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: r214357 - in projects/binutils-2.17: . bin/sh contrib/bsnmp/snmpd contrib/top etc/mtree lib/libc/mips lib/libfetch lib/libthr/thread sbin/camcontrol sbin/geom/class/part sbin/hastd shar... 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: Mon, 25 Oct 2010 19:58:29 -0000 Author: dim Date: Mon Oct 25 19:58:28 2010 New Revision: 214357 URL: http://svn.freebsd.org/changeset/base/214357 Log: Sync: merge r214221 through r214352 from ^/head. Added: projects/binutils-2.17/share/examples/jails/ - copied from r214352, head/share/examples/jails/ projects/binutils-2.17/share/examples/netgraph/virtual.chain - copied unchanged from r214352, head/share/examples/netgraph/virtual.chain projects/binutils-2.17/share/examples/netgraph/virtual.lan - copied unchanged from r214352, head/share/examples/netgraph/virtual.lan projects/binutils-2.17/sys/net/if_debug.c - copied unchanged from r214352, head/sys/net/if_debug.c projects/binutils-2.17/sys/netinet/in_debug.c - copied unchanged from r214352, head/sys/netinet/in_debug.c projects/binutils-2.17/tools/regression/bin/sh/execution/func3.0 - copied unchanged from r214352, head/tools/regression/bin/sh/execution/func3.0 projects/binutils-2.17/tools/regression/bin/sh/execution/redir3.0 - copied unchanged from r214352, head/tools/regression/bin/sh/execution/redir3.0 projects/binutils-2.17/tools/regression/bin/sh/execution/redir4.0 - copied unchanged from r214352, head/tools/regression/bin/sh/execution/redir4.0 projects/binutils-2.17/tools/regression/bin/sh/parser/alias1.0 - copied unchanged from r214352, head/tools/regression/bin/sh/parser/alias1.0 projects/binutils-2.17/tools/regression/bin/sh/parser/alias2.0 - copied unchanged from r214352, head/tools/regression/bin/sh/parser/alias2.0 projects/binutils-2.17/tools/regression/bin/sh/parser/func1.0 - copied unchanged from r214352, head/tools/regression/bin/sh/parser/func1.0 projects/binutils-2.17/tools/regression/bin/sh/parser/pipe-not1.0 - copied unchanged from r214352, head/tools/regression/bin/sh/parser/pipe-not1.0 Modified: projects/binutils-2.17/UPDATING projects/binutils-2.17/bin/sh/mksyntax.c projects/binutils-2.17/bin/sh/parser.c projects/binutils-2.17/bin/sh/redir.c projects/binutils-2.17/contrib/bsnmp/snmpd/bsnmpd.1 projects/binutils-2.17/etc/mtree/BSD.usr.dist projects/binutils-2.17/lib/libc/mips/SYS.h projects/binutils-2.17/lib/libfetch/common.c projects/binutils-2.17/lib/libthr/thread/thr_attr.c projects/binutils-2.17/lib/libthr/thread/thr_private.h projects/binutils-2.17/sbin/camcontrol/camcontrol.c projects/binutils-2.17/sbin/geom/class/part/geom_part.c projects/binutils-2.17/sbin/geom/class/part/gpart.8 projects/binutils-2.17/sbin/hastd/hastd.c projects/binutils-2.17/sbin/hastd/nv.c projects/binutils-2.17/sbin/hastd/nv.h projects/binutils-2.17/sbin/hastd/parse.y projects/binutils-2.17/sbin/hastd/primary.c projects/binutils-2.17/sbin/hastd/secondary.c projects/binutils-2.17/sbin/hastd/synch.h projects/binutils-2.17/share/examples/Makefile projects/binutils-2.17/share/man/man4/ada.4 projects/binutils-2.17/share/man/man9/Makefile projects/binutils-2.17/share/man/man9/make_dev.9 projects/binutils-2.17/sys/amd64/amd64/fpu.c projects/binutils-2.17/sys/amd64/include/profile.h projects/binutils-2.17/sys/boot/pc98/boot2/boot2.c projects/binutils-2.17/sys/cam/ata/ata_da.c projects/binutils-2.17/sys/cam/cam_xpt.c projects/binutils-2.17/sys/cam/scsi/scsi_da.c projects/binutils-2.17/sys/conf/files projects/binutils-2.17/sys/dev/ahci/ahci.c projects/binutils-2.17/sys/dev/bge/if_bge.c projects/binutils-2.17/sys/dev/bge/if_bgereg.h projects/binutils-2.17/sys/dev/fxp/if_fxp.c projects/binutils-2.17/sys/dev/iwi/if_iwi.c projects/binutils-2.17/sys/dev/mii/mii_physubr.c projects/binutils-2.17/sys/dev/mii/miivar.h projects/binutils-2.17/sys/dev/mii/mlphy.c projects/binutils-2.17/sys/dev/mii/pnaphy.c projects/binutils-2.17/sys/dev/mii/smcphy.c projects/binutils-2.17/sys/dev/mii/tlphy.c projects/binutils-2.17/sys/dev/pci/pci.c projects/binutils-2.17/sys/dev/siis/siis.c projects/binutils-2.17/sys/dev/sound/pcm/channel.c projects/binutils-2.17/sys/dev/tl/if_tl.c projects/binutils-2.17/sys/dev/tl/if_tlreg.h projects/binutils-2.17/sys/dev/usb/controller/ehci.c projects/binutils-2.17/sys/dev/usb/controller/ehcireg.h projects/binutils-2.17/sys/dev/usb/usb_device.c projects/binutils-2.17/sys/dev/usb/usb_freebsd.h projects/binutils-2.17/sys/fs/nfs/nfs_var.h projects/binutils-2.17/sys/fs/nfs/nfsdport.h projects/binutils-2.17/sys/fs/nfsserver/nfs_nfsdport.c projects/binutils-2.17/sys/geom/eli/g_eli.c projects/binutils-2.17/sys/geom/eli/g_eli_ctl.c projects/binutils-2.17/sys/geom/eli/g_eli_key.c projects/binutils-2.17/sys/geom/part/g_part.c projects/binutils-2.17/sys/geom/part/g_part.h projects/binutils-2.17/sys/geom/part/g_part_gpt.c projects/binutils-2.17/sys/geom/part/g_part_if.m projects/binutils-2.17/sys/i386/i386/elan-mmcr.c projects/binutils-2.17/sys/i386/i386/identcpu.c projects/binutils-2.17/sys/i386/i386/initcpu.c projects/binutils-2.17/sys/i386/i386/longrun.c projects/binutils-2.17/sys/i386/i386/perfmon.c projects/binutils-2.17/sys/i386/include/profile.h projects/binutils-2.17/sys/i386/isa/npx.c projects/binutils-2.17/sys/kern/kern_cpuset.c projects/binutils-2.17/sys/kern/kern_kthread.c projects/binutils-2.17/sys/kern/kern_shutdown.c projects/binutils-2.17/sys/kern/kern_thr.c projects/binutils-2.17/sys/kern/subr_acl_nfs4.c projects/binutils-2.17/sys/kern/vfs_bio.c projects/binutils-2.17/sys/net/if.c projects/binutils-2.17/sys/netinet/ip_ipsec.c projects/binutils-2.17/sys/netinet6/ip6_ipsec.c projects/binutils-2.17/sys/netipsec/ipsec_input.c projects/binutils-2.17/sys/netipsec/ipsec_output.c projects/binutils-2.17/sys/netipsec/key.c projects/binutils-2.17/sys/netipsec/keydb.h projects/binutils-2.17/sys/pc98/pc98/machdep.c projects/binutils-2.17/sys/powerpc/mambo/mambo_console.c projects/binutils-2.17/sys/security/mac/mac_vfs.c projects/binutils-2.17/sys/x86/x86/local_apic.c projects/binutils-2.17/tools/tools/syscall_timing/syscall_timing.c projects/binutils-2.17/usr.bin/lex/flex.skl projects/binutils-2.17/usr.sbin/usbconfig/usbconfig.c Directory Properties: projects/binutils-2.17/ (props changed) projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/contrib/bind9/ (props changed) projects/binutils-2.17/contrib/binutils/ (props changed) projects/binutils-2.17/contrib/bzip2/ (props changed) projects/binutils-2.17/contrib/ee/ (props changed) projects/binutils-2.17/contrib/expat/ (props changed) projects/binutils-2.17/contrib/file/ (props changed) projects/binutils-2.17/contrib/gdb/ (props changed) projects/binutils-2.17/contrib/gdtoa/ (props changed) projects/binutils-2.17/contrib/gnu-sort/ (props changed) projects/binutils-2.17/contrib/groff/ (props changed) projects/binutils-2.17/contrib/less/ (props changed) projects/binutils-2.17/contrib/libpcap/ (props changed) projects/binutils-2.17/contrib/llvm/ (props changed) projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed) projects/binutils-2.17/contrib/ncurses/ (props changed) projects/binutils-2.17/contrib/netcat/ (props changed) projects/binutils-2.17/contrib/ntp/ (props changed) projects/binutils-2.17/contrib/one-true-awk/ (props changed) projects/binutils-2.17/contrib/openbsm/ (props changed) projects/binutils-2.17/contrib/openpam/ (props changed) projects/binutils-2.17/contrib/pf/ (props changed) projects/binutils-2.17/contrib/sendmail/ (props changed) projects/binutils-2.17/contrib/tcpdump/ (props changed) projects/binutils-2.17/contrib/tcsh/ (props changed) projects/binutils-2.17/contrib/top/ (props changed) projects/binutils-2.17/contrib/top/install-sh (props changed) projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed) projects/binutils-2.17/contrib/tzcode/zic/ (props changed) projects/binutils-2.17/contrib/tzdata/ (props changed) projects/binutils-2.17/contrib/wpa/ (props changed) projects/binutils-2.17/contrib/xz/ (props changed) projects/binutils-2.17/crypto/openssh/ (props changed) projects/binutils-2.17/crypto/openssl/ (props changed) projects/binutils-2.17/lib/libc/ (props changed) projects/binutils-2.17/lib/libc/stdtime/ (props changed) projects/binutils-2.17/lib/libutil/ (props changed) projects/binutils-2.17/lib/libz/ (props changed) projects/binutils-2.17/sbin/ (props changed) projects/binutils-2.17/sbin/ipfw/ (props changed) projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed) projects/binutils-2.17/share/zoneinfo/ (props changed) projects/binutils-2.17/sys/ (props changed) projects/binutils-2.17/sys/amd64/include/xen/ (props changed) projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed) projects/binutils-2.17/sys/contrib/pf/ (props changed) projects/binutils-2.17/sys/contrib/x86emu/ (props changed) projects/binutils-2.17/sys/dev/xen/xenpci/ (props changed) projects/binutils-2.17/usr.bin/calendar/ (props changed) projects/binutils-2.17/usr.bin/csup/ (props changed) projects/binutils-2.17/usr.bin/procstat/ (props changed) projects/binutils-2.17/usr.sbin/zic/ (props changed) Modified: projects/binutils-2.17/UPDATING ============================================================================== --- projects/binutils-2.17/UPDATING Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/UPDATING Mon Oct 25 19:58:28 2010 (r214357) @@ -35,10 +35,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. 20100915: A workaround for a fixed ld bug has been removed in kernel code, so make sure that your system ld is built from sources after - revision 210245 (r211583 if building head kernel on stable/8, - r211584 for stable/7). A symptom of incorrect ld version is - different addresses for set_pcpu section and __start_set_pcpu - symbol in kernel and/or modules. + revision 210245 from 2010-07-19 (r211583 if building head kernel + on stable/8, r211584 for stable/7; both from 2010-08-21). + A symptom of incorrect ld version is different addresses for + set_pcpu section and __start_set_pcpu symbol in kernel and/or modules. 20100913: The $ipv6_prefer variable in rc.conf(5) has been split into Modified: projects/binutils-2.17/bin/sh/mksyntax.c ============================================================================== --- projects/binutils-2.17/bin/sh/mksyntax.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/bin/sh/mksyntax.c Mon Oct 25 19:58:28 2010 (r214357) @@ -75,6 +75,7 @@ struct synclass synclass[] = { { "CEOF", "end of file" }, { "CCTL", "like CWORD, except it must be escaped" }, { "CSPCL", "these terminate a word" }, + { "CIGN", "character should be ignored" }, { NULL, NULL } }; @@ -232,7 +233,7 @@ main(int argc __unused, char **argv __un add("\n", "CNL"); add("\\", "CBACK"); add("`", "CBQUOTE"); - add("\"", "CDQUOTE"); + add("\"", "CIGN"); add("$", "CVAR"); add("}", "CENDVAR"); add("(", "CLP"); Modified: projects/binutils-2.17/bin/sh/parser.c ============================================================================== --- projects/binutils-2.17/bin/sh/parser.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/bin/sh/parser.c Mon Oct 25 19:58:28 2010 (r214357) @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include "alias.h" #include "show.h" #include "eval.h" +#include "exec.h" /* to check for special builtins */ #ifndef NO_HISTORY #include "myhistedit.h" #endif @@ -328,7 +329,7 @@ pipeline(void) { union node *n1, *n2, *pipenode; struct nodelist *lp, *prev; - int negate; + int negate, t; negate = 0; checkkwd = 2; @@ -347,7 +348,13 @@ pipeline(void) do { prev = lp; lp = (struct nodelist *)stalloc(sizeof (struct nodelist)); - lp->n = command(); + checkkwd = 2; + t = readtoken(); + tokpushback++; + if (t == TNOT) + lp->n = pipeline(); + else + lp->n = command(); prev->next = lp; } while (readtoken() == TPIPE); lp->next = NULL; @@ -372,7 +379,7 @@ command(void) union node *ap, **app; union node *cp, **cpp; union node *redir, **rpp; - int t, negate = 0; + int t; checkkwd = 2; redir = NULL; @@ -387,12 +394,6 @@ command(void) } tokpushback++; - while (readtoken() == TNOT) { - TRACE(("command: TNOT recognized\n")); - negate = !negate; - } - tokpushback++; - switch (readtoken()) { case TIF: n1 = (union node *)stalloc(sizeof (struct nif)); @@ -573,7 +574,7 @@ TRACE(("expecting DO got %s %s\n", tokna case TRP: tokpushback++; n1 = simplecmd(rpp, redir); - goto checkneg; + return n1; default: synexpect(-1); } @@ -596,15 +597,7 @@ TRACE(("expecting DO got %s %s\n", tokna n1->nredir.redirect = redir; } -checkneg: - if (negate) { - n2 = (union node *)stalloc(sizeof (struct nnot)); - n2->type = NNOT; - n2->nnot.com = n1; - return n2; - } - else - return n1; + return n1; } @@ -614,6 +607,7 @@ simplecmd(union node **rpp, union node * union node *args, **app; union node **orig_rpp = rpp; union node *n = NULL; + int special; /* If we don't have any redirections already, then we must reset */ /* rpp to be the address of the local redir variable. */ @@ -647,10 +641,17 @@ simplecmd(union node **rpp, union node * if (readtoken() != TRP) synexpect(TRP); funclinno = plinno; -#ifdef notdef - if (! goodname(n->narg.text)) + /* + * - Require plain text. + * - Functions with '/' cannot be called. + */ + if (!noexpand(n->narg.text) || quoteflag || + strchr(n->narg.text, '/')) synerror("Bad function name"); -#endif + rmescapes(n->narg.text); + if (find_builtin(n->narg.text, &special) >= 0 && + special) + synerror("Cannot override a special builtin with a function"); n->type = NDEFUN; n->narg.next = command(); funclinno = 0; @@ -1223,10 +1224,7 @@ readtoken1(int firstc, char const *initi if (eofmark != NULL && newvarnest == 0) USTPUTC(c, out); else { - if (state[level].category == TSTATE_ARITH) - state[level].syntax = ARISYNTAX; - else - state[level].syntax = BASESYNTAX; + state[level].syntax = BASESYNTAX; quotef++; } break; @@ -1281,6 +1279,8 @@ readtoken1(int firstc, char const *initi break; case CEOF: goto endword; /* exit outer loop */ + case CIGN: + break; default: if (level == 0) goto endword; /* exit outer loop */ Modified: projects/binutils-2.17/bin/sh/redir.c ============================================================================== --- projects/binutils-2.17/bin/sh/redir.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/bin/sh/redir.c Mon Oct 25 19:58:28 2010 (r214357) @@ -217,8 +217,11 @@ movefd: if (redir->ndup.dupfd >= 0) { /* if not ">&-" */ if (memory[redir->ndup.dupfd]) memory[fd] = 1; - else - dup2(redir->ndup.dupfd, fd); + else { + if (dup2(redir->ndup.dupfd, fd) < 0) + error("%d: %s", redir->ndup.dupfd, + strerror(errno)); + } } else { close(fd); } Modified: projects/binutils-2.17/contrib/bsnmp/snmpd/bsnmpd.1 ============================================================================== --- projects/binutils-2.17/contrib/bsnmp/snmpd/bsnmpd.1 Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/contrib/bsnmp/snmpd/bsnmpd.1 Mon Oct 25 19:58:28 2010 (r214357) @@ -31,7 +31,7 @@ .\" .\" $Begemot: bsnmp/snmpd/bsnmpd.1,v 1.12 2006/02/27 09:50:03 brandt_h Exp $ .\" -.Dd August 16, 2010 +.Dd October 23, 2010 .Dt BSNMPD 1 .Os .Sh NAME @@ -68,11 +68,9 @@ Use .Ar file as configuration file instead of the standard one. .It Fl D Ar options -Debugging options are specified with a -.Fl o -flag followed by a comma separated string of options. +Debugging options are specified as a comma separated string. The following options are available. -.Bl -tag -width ".It Cm trace Ns Cm = Ns Cm level" +.Bl -tag -width "trace=level" .It Cm dump Dump all sent and received PDUs to the terminal. .It Cm events Modified: projects/binutils-2.17/etc/mtree/BSD.usr.dist ============================================================================== --- projects/binutils-2.17/etc/mtree/BSD.usr.dist Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/etc/mtree/BSD.usr.dist Mon Oct 25 19:58:28 2010 (r214357) @@ -227,6 +227,8 @@ .. iscsi .. + jails + .. kld cdev module Modified: projects/binutils-2.17/lib/libc/mips/SYS.h ============================================================================== --- projects/binutils-2.17/lib/libc/mips/SYS.h Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/lib/libc/mips/SYS.h Mon Oct 25 19:58:28 2010 (r214357) @@ -91,7 +91,7 @@ #else # define PIC_PROLOGUE(x) # define PIC_TAILCALL(l) j _C_LABEL(l) -# define PIC_RETURN() +# define PIC_RETURN() j ra #endif /* __ABICALLS__ */ # define SYSTRAP(x) li v0,SYS_ ## x; syscall; Modified: projects/binutils-2.17/lib/libfetch/common.c ============================================================================== --- projects/binutils-2.17/lib/libfetch/common.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/lib/libfetch/common.c Mon Oct 25 19:58:28 2010 (r214357) @@ -321,9 +321,9 @@ fetch_connect(const char *host, int port int fetch_ssl(conn_t *conn, int verbose) { +#ifdef WITH_SSL int ret, ssl_err; -#ifdef WITH_SSL /* Init the SSL library and context */ if (!SSL_library_init()){ fprintf(stderr, "SSL library init failed\n"); Modified: projects/binutils-2.17/lib/libthr/thread/thr_attr.c ============================================================================== --- projects/binutils-2.17/lib/libthr/thread/thr_attr.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/lib/libthr/thread/thr_attr.c Mon Oct 25 19:58:28 2010 (r214357) @@ -104,6 +104,8 @@ #include "thr_private.h" +static size_t _get_kern_cpuset_size(void); + __weak_reference(_pthread_attr_destroy, pthread_attr_destroy); int @@ -116,6 +118,8 @@ _pthread_attr_destroy(pthread_attr_t *at /* Invalid argument: */ ret = EINVAL; else { + if ((*attr)->cpuset != NULL) + free((*attr)->cpuset); /* Free the memory allocated to the attribute object: */ free(*attr); @@ -132,28 +136,43 @@ _pthread_attr_destroy(pthread_attr_t *at __weak_reference(_pthread_attr_get_np, pthread_attr_get_np); int -_pthread_attr_get_np(pthread_t pthread, pthread_attr_t *dst) +_pthread_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) { struct pthread *curthread; - struct pthread_attr attr; + struct pthread_attr attr, *dst; int ret; + size_t cpusetsize; - if (pthread == NULL || dst == NULL || *dst == NULL) + if (pthread == NULL || dstattr == NULL || (dst = *dstattr) == NULL) return (EINVAL); - + cpusetsize = _get_kern_cpuset_size(); + if (dst->cpusetsize < cpusetsize) { + char *newset = realloc(dst->cpuset, cpusetsize); + if (newset == NULL) + return (errno); + memset(newset + dst->cpusetsize, 0, cpusetsize - + dst->cpusetsize); + dst->cpuset = (cpuset_t *)newset; + dst->cpusetsize = cpusetsize; + } curthread = _get_curthread(); if ((ret = _thr_find_thread(curthread, pthread, /*include dead*/0)) != 0) return (ret); attr = pthread->attr; if (pthread->flags & THR_FLAGS_DETACHED) attr.flags |= PTHREAD_DETACHED; + ret = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), + dst->cpusetsize, dst->cpuset); + if (ret == -1) + ret = errno; THR_THREAD_UNLOCK(curthread, pthread); - - memcpy(*dst, &attr, sizeof(struct pthread_attr)); - /* XXX */ - (*dst)->cpuset = NULL; - (*dst)->cpusetsize = 0; - return (0); + if (ret == 0) { + memcpy(&dst->pthread_attr_start_copy, + &attr.pthread_attr_start_copy, + offsetof(struct pthread_attr, pthread_attr_end_copy) - + offsetof(struct pthread_attr, pthread_attr_start_copy)); + } + return (ret); } __weak_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate); Modified: projects/binutils-2.17/lib/libthr/thread/thr_private.h ============================================================================== --- projects/binutils-2.17/lib/libthr/thread/thr_private.h Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/lib/libthr/thread/thr_private.h Mon Oct 25 19:58:28 2010 (r214357) @@ -230,6 +230,7 @@ struct pthread_atfork { }; struct pthread_attr { +#define pthread_attr_start_copy sched_policy int sched_policy; int sched_inherit; int prio; @@ -239,6 +240,7 @@ struct pthread_attr { void *stackaddr_attr; size_t stacksize_attr; size_t guardsize_attr; +#define pthread_attr_end_copy cpuset cpuset_t *cpuset; size_t cpusetsize; }; Modified: projects/binutils-2.17/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/binutils-2.17/sbin/camcontrol/camcontrol.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/sbin/camcontrol/camcontrol.c Mon Oct 25 19:58:28 2010 (r214357) @@ -116,7 +116,7 @@ typedef enum { } cam_argmask; struct camcontrol_opts { - const char *optname; + const char *optname; cam_cmdmask cmdnum; cam_argmask argnum; const char *subopt; @@ -204,7 +204,7 @@ static int readdefects(struct cam_device char *combinedopt, int retry_count, int timeout); static void modepage(struct cam_device *device, int argc, char **argv, char *combinedopt, int retry_count, int timeout); -static int scsicmd(struct cam_device *device, int argc, char **argv, +static int scsicmd(struct cam_device *device, int argc, char **argv, char *combinedopt, int retry_count, int timeout); static int tagcontrol(struct cam_device *device, int argc, char **argv, char *combinedopt); @@ -234,7 +234,7 @@ static int atapm(struct cam_device *devi #endif camcontrol_optret -getoption(char *arg, cam_cmdmask *cmdnum, cam_argmask *argnum, +getoption(char *arg, cam_cmdmask *cmdnum, cam_argmask *argnum, const char **subopt) { struct camcontrol_opts *opts; @@ -622,7 +622,7 @@ scsistart(struct cam_device *device, int else fprintf(stdout, "Error received from stop unit command\n"); - + if (arglist & CAM_ARG_VERBOSE) { cam_error_print(device, ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr); @@ -688,7 +688,7 @@ scsiinquiry(struct cam_device *device, i union ccb *ccb; struct scsi_inquiry_data *inq_buf; int error = 0; - + ccb = cam_getccb(device); if (ccb == NULL) { @@ -721,13 +721,13 @@ scsiinquiry(struct cam_device *device, i * scsi_inquiry() will convert an inq_len (which is passed in as * a u_int32_t, but the field in the CDB is only 1 byte) of 256 * to 0. Evidently, very few devices meet the spec in that - * regard. Some devices, like many Seagate disks, take the 0 as + * regard. Some devices, like many Seagate disks, take the 0 as * 0, and don't return any data. One Pioneer DVD-R drive * returns more data than the command asked for. * * So, since there are numerous devices that just don't work * right with the full inquiry size, we don't send the full size. - * + * * - The second reason not to use the full inquiry data length is * that we don't need it here. The only reason we issue a * standard inquiry is to get the vendor name, device name, @@ -1181,7 +1181,7 @@ atacapprint(struct ata_params *parm) } printf("\nFeature " - "Support Enable Value Vendor\n"); + "Support Enabled Value Vendor\n"); printf("read ahead %s %s\n", parm->support.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no"); @@ -1201,16 +1201,13 @@ atacapprint(struct ata_params *parm) ATA_QUEUE_LEN(parm->queue) + 1); } else printf("\n"); - if (parm->satacapabilities && parm->satacapabilities != 0xffff) { - printf("Native Command Queuing (NCQ) %s ", - parm->satacapabilities & ATA_SUPPORT_NCQ ? - "yes" : "no"); - if (parm->satacapabilities & ATA_SUPPORT_NCQ) { - printf(" %d tags\n", - ATA_QUEUE_LEN(parm->queue) + 1); - } else - printf("\n"); - } + printf("Native Command Queuing (NCQ) "); + if (parm->satacapabilities != 0xffff && + (parm->satacapabilities & ATA_SUPPORT_NCQ)) { + printf("yes %d tags\n", + ATA_QUEUE_LEN(parm->queue) + 1); + } else + printf("no\n"); printf("SMART %s %s\n", parm->support.command1 & ATA_SUPPORT_SMART ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_SMART ? "yes" : "no"); @@ -1223,28 +1220,39 @@ atacapprint(struct ata_params *parm) printf("power management %s %s\n", parm->support.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no"); - printf("advanced power management %s %s %d/0x%02X\n", + printf("advanced power management %s %s", parm->support.command2 & ATA_SUPPORT_APM ? "yes" : "no", - parm->enabled.command2 & ATA_SUPPORT_APM ? "yes" : "no", - parm->apm_value, parm->apm_value); - printf("automatic acoustic management %s %s " - "%d/0x%02X %d/0x%02X\n", + parm->enabled.command2 & ATA_SUPPORT_APM ? "yes" : "no"); + if (parm->support.command2 & ATA_SUPPORT_APM) { + printf(" %d/0x%02X\n", + parm->apm_value, parm->apm_value); + } else + printf("\n"); + printf("automatic acoustic management %s %s", parm->support.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no", - parm->enabled.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no", - ATA_ACOUSTIC_CURRENT(parm->acoustic), - ATA_ACOUSTIC_CURRENT(parm->acoustic), - ATA_ACOUSTIC_VENDOR(parm->acoustic), - ATA_ACOUSTIC_VENDOR(parm->acoustic)); + parm->enabled.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no"); + if (parm->support.command2 & ATA_SUPPORT_AUTOACOUSTIC) { + printf(" %d/0x%02X %d/0x%02X\n", + ATA_ACOUSTIC_CURRENT(parm->acoustic), + ATA_ACOUSTIC_CURRENT(parm->acoustic), + ATA_ACOUSTIC_VENDOR(parm->acoustic), + ATA_ACOUSTIC_VENDOR(parm->acoustic)); + } else + printf("\n"); printf("media status notification %s %s\n", parm->support.command2 & ATA_SUPPORT_NOTIFY ? "yes" : "no", parm->enabled.command2 & ATA_SUPPORT_NOTIFY ? "yes" : "no"); printf("power-up in Standby %s %s\n", parm->support.command2 & ATA_SUPPORT_STANDBY ? "yes" : "no", parm->enabled.command2 & ATA_SUPPORT_STANDBY ? "yes" : "no"); - printf("write-read-verify %s %s %d/0x%x\n", + printf("write-read-verify %s %s", parm->support2 & ATA_SUPPORT_WRITEREADVERIFY ? "yes" : "no", - parm->enabled2 & ATA_SUPPORT_WRITEREADVERIFY ? "yes" : "no", - parm->wrv_mode, parm->wrv_mode); + parm->enabled2 & ATA_SUPPORT_WRITEREADVERIFY ? "yes" : "no"); + if (parm->support2 & ATA_SUPPORT_WRITEREADVERIFY) { + printf(" %d/0x%x\n", + parm->wrv_mode, parm->wrv_mode); + } else + printf("\n"); printf("unload %s %s\n", parm->support.extension & ATA_SUPPORT_UNLOAD ? "yes" : "no", parm->enabled.extension & ATA_SUPPORT_UNLOAD ? "yes" : "no"); @@ -1255,7 +1263,6 @@ atacapprint(struct ata_params *parm) parm->support_dsm & ATA_SUPPORT_DSM_TRIM ? "yes" : "no"); } - static int ataidentify(struct cam_device *device, int retry_count, int timeout) { @@ -1902,7 +1909,7 @@ readdefects(struct cam_device *device, i /* * XXX KDM I should probably clean up the printout format for the - * disk defects. + * disk defects. */ switch (returned_format & SRDDH10_DLIST_FORMAT_MASK){ case SRDDH10_PHYSICAL_SECTOR_FORMAT: @@ -2011,7 +2018,7 @@ void reassignblocks(struct cam_device *device, u_int32_t *blocks, int num_blocks) { union ccb *ccb; - + ccb = cam_getccb(device); cam_freeccb(ccb); @@ -2114,7 +2121,7 @@ mode_select(struct cam_device *device, i err(1, "error sending mode select command"); else errx(1, "error sending mode select command"); - + } cam_freeccb(ccb); @@ -2294,7 +2301,7 @@ scsicmd(struct cam_device *device, int a if (arglist & CAM_ARG_CMD_IN) { warnx("command must either be " "read or write, not both"); - error = 1; + error = 1; goto scsicmd_bailout; } arglist |= CAM_ARG_CMD_OUT; @@ -2611,7 +2618,7 @@ camdebug(int argc, char **argv, char *co warnx("bus:target, or bus:target:lun to debug"); } } - + if (error == 0) { ccb.ccb_h.func_code = XPT_DEBUG; @@ -2874,7 +2881,7 @@ cts_print(struct cam_device *device, str } /* - * Get a path inquiry CCB for the specified device. + * Get a path inquiry CCB for the specified device. */ static int get_cpi(struct cam_device *device, struct ccb_pathinq *cpi) @@ -2913,7 +2920,7 @@ get_cpi_bailout: } /* - * Get a get device CCB for the specified device. + * Get a get device CCB for the specified device. */ static int get_cgd(struct cam_device *device, struct ccb_getdev *cgd) @@ -3764,9 +3771,9 @@ doreport: fprintf(stdout, "\rFormatting: %ju.%02u %% " "(%d/%d) done", - (uintmax_t)(percentage / + (uintmax_t)(percentage / (0x10000 * 100)), - (unsigned)((percentage / + (unsigned)((percentage / 0x10000) % 100), val, 0x10000); fflush(stdout); @@ -3956,7 +3963,7 @@ retry: case RPL_LUNDATA_ATYP_PERIPH: if ((lundata->luns[i].lundata[j] & RPL_LUNDATA_PERIPH_BUS_MASK) != 0) - fprintf(stdout, "%d:", + fprintf(stdout, "%d:", lundata->luns[i].lundata[j] & RPL_LUNDATA_PERIPH_BUS_MASK); else if ((j == 0) @@ -3994,7 +4001,7 @@ retry: field_len_code = (lundata->luns[i].lundata[j] & RPL_LUNDATA_EXT_LEN_MASK) >> 4; field_len = field_len_code * 2; - + if ((eam_code == RPL_LUNDATA_EXT_EAM_WK) && (field_len_code == 0x00)) { fprintf(stdout, "%d", @@ -4352,7 +4359,7 @@ bailout: #endif /* MINIMALISTIC */ -void +void usage(int verbose) { fprintf(verbose ? stdout : stderr, @@ -4494,7 +4501,7 @@ usage(int verbose) #endif /* MINIMALISTIC */ } -int +int main(int argc, char **argv) { int c; @@ -4544,7 +4551,7 @@ main(int argc, char **argv) * this. getopt is kinda braindead, so you end up having to run * through the options twice, and give each invocation of getopt * the option string for the other invocation. - * + * * You would think that you could just have two groups of options. * The first group would get parsed by the first invocation of * getopt, and the second group would get parsed by the second @@ -4553,13 +4560,13 @@ main(int argc, char **argv) * to the argument _after_ the first argument in the second group. * So when the second invocation of getopt comes around, it doesn't * recognize the first argument it gets and then bails out. - * + * * A nice alternative would be to have a flag for getopt that says * "just keep parsing arguments even when you encounter an unknown * argument", but there isn't one. So there's no real clean way to * easily parse two sets of arguments without having one invocation * of getopt know about the other. - * + * * Without this hack, the first invocation of getopt would work as * long as the generic arguments are first, but the second invocation * (in the subfunction) would fail in one of two ways. In the case @@ -4573,14 +4580,14 @@ main(int argc, char **argv) * whether optind had been incremented one option too far. The * mechanics of that, however, are more daunting than just giving * both invocations all of the expect options for either invocation. - * + * * Needless to say, I wouldn't mind if someone invented a better * (non-GPL!) command line parsing interface than getopt. I * wouldn't mind if someone added more knobs to getopt to make it * work better. Who knows, I may talk myself into doing it someday, * if the standards weenies let me. As it is, it just leads to * hackery like this and causes people to avoid it in some cases. - * + * * KDM, September 8th, 1998 */ if (subopt != NULL) Modified: projects/binutils-2.17/sbin/geom/class/part/geom_part.c ============================================================================== --- projects/binutils-2.17/sbin/geom/class/part/geom_part.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/sbin/geom/class/part/geom_part.c Mon Oct 25 19:58:28 2010 (r214357) @@ -67,7 +67,6 @@ static char ssize[32]; #define GPART_PARAM_BOOTCODE "bootcode" #define GPART_PARAM_INDEX "index" #define GPART_PARAM_PARTCODE "partcode" -#define GPART_PARAM_FORCE "force" static struct gclass *find_class(struct gmesh *, const char *); static struct ggeom * find_geom(struct gclass *, const char *); @@ -85,7 +84,6 @@ static void gpart_show_geom(struct ggeom static int gpart_show_hasopt(struct gctl_req *, const char *, const char *); static void gpart_write_partcode(struct ggeom *, int, void *, ssize_t); static void gpart_write_partcode_vtoc8(struct ggeom *, int, void *); -static void gpart_destroy(struct gctl_req *, unsigned int); static void gpart_print_error(const char *); struct g_command PUBSYM(class_commands)[] = { @@ -123,8 +121,8 @@ struct g_command PUBSYM(class_commands)[ G_OPT_SENTINEL }, "-i index [-f flags] geom" }, - { "destroy", 0, gpart_destroy, { - { 'F', GPART_PARAM_FORCE, NULL, G_TYPE_BOOL }, + { "destroy", 0, gpart_issue, { + { 'F', "force", NULL, G_TYPE_BOOL }, { 'f', "flags", GPART_FLAGS, G_TYPE_STRING }, G_OPT_SENTINEL }, "[-F] [-f flags] geom" @@ -167,6 +165,11 @@ struct g_command PUBSYM(class_commands)[ G_OPT_SENTINEL }, "[-s size] -i index [-f flags] geom" }, + { "recover", 0, gpart_issue, { + { 'f', "flags", GPART_FLAGS, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "[-f flags] geom" + }, G_CMD_SENTINEL }; @@ -539,13 +542,17 @@ gpart_show_geom(struct ggeom *gp, const s = find_geomcfg(gp, "last"); last = (off_t)strtoimax(s, NULL, 0); wblocks = strlen(s); + s = find_geomcfg(gp, "state"); + if (s != NULL && *s != 'C') + s = NULL; wname = strlen(gp->lg_name); pp = LIST_FIRST(&gp->lg_consumer)->lg_provider; secsz = pp->lg_sectorsize; - printf("=>%*jd %*jd %*s %s (%s)\n", + printf("=>%*jd %*jd %*s %s (%s)%s\n", wblocks, (intmax_t)first, wblocks, (intmax_t)(last - first + 1), wname, gp->lg_name, - scheme, fmtsize(pp->lg_mediasize)); + scheme, fmtsize(pp->lg_mediasize), + s ? " [CORRUPT]": ""); while ((pp = find_provider(gp, first)) != NULL) { s = find_provcfg(pp, "start"); @@ -858,83 +865,6 @@ gpart_bootcode(struct gctl_req *req, uns } static void -gpart_destroy(struct gctl_req *req, unsigned int fl) -{ - struct gmesh mesh; - struct gclass *classp; - struct gctl_req *req2; - struct ggeom *gp; - struct gprovider *pp; - const char *s; - int error, val; - intmax_t idx; - - if (gctl_has_param(req, GPART_PARAM_FORCE)) { - val = gctl_get_int(req, GPART_PARAM_FORCE); - error = gctl_delete_param(req, GPART_PARAM_FORCE); - if (error) - errc(EXIT_FAILURE, error, "internal error"); - if (val == 0) - goto done; - s = gctl_get_ascii(req, "class"); - if (s == NULL) - abort(); - error = geom_gettree(&mesh); - if (error != 0) - errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); - classp = find_class(&mesh, s); - if (classp == NULL) { - geom_deletetree(&mesh); - errx(EXIT_FAILURE, "Class %s not found.", s); - } - s = gctl_get_ascii(req, "arg0"); - if (s == NULL) - abort(); - gp = find_geom(classp, s); - if (gp == NULL) - errx(EXIT_FAILURE, "No such geom: %s.", s); - val = 0; - LIST_FOREACH(pp, &gp->lg_provider, lg_provider){ - s = find_provcfg(pp, "index"); - if (s == NULL) - errx(EXIT_FAILURE, "Index not found for %s.", - pp->lg_name); - idx = strtoimax(s, NULL, 0); - req2 = gctl_get_handle(); - gctl_ro_param(req2, "class", -1, classp->lg_name); - gctl_ro_param(req2, "arg0", -1, gp->lg_name); - gctl_ro_param(req2, "verb", -1, "delete"); - gctl_ro_param(req2, GPART_PARAM_INDEX, - sizeof(intmax_t), &idx); - gctl_ro_param(req2, "flags", -1, "X"); - s = gctl_issue(req2); - if (s != NULL && s[0] != '\0') { - gpart_print_error(s); - gctl_free(req2); - if (val) { /* try to undo changes */ - req2 = gctl_get_handle(); - gctl_ro_param(req2, "verb", -1, - "undo"); - gctl_ro_param(req2, "class", -1, - classp->lg_name); - gctl_ro_param(req2, "arg0", -1, - gp->lg_name); - gctl_issue(req2); - gctl_free(req2); - } - geom_deletetree(&mesh); - exit(EXIT_FAILURE); - } - gctl_free(req2); - val = 1; - } - geom_deletetree(&mesh); - } -done: - gpart_issue(req, fl); -} - -static void gpart_print_error(const char *errstr) { char *errmsg; Modified: projects/binutils-2.17/sbin/geom/class/part/gpart.8 ============================================================================== --- projects/binutils-2.17/sbin/geom/class/part/gpart.8 Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/sbin/geom/class/part/gpart.8 Mon Oct 25 19:58:28 2010 (r214357) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 28, 2010 +.Dd October 25, 2010 .Dt GPART 8 .Os .Sh NAME @@ -129,6 +129,11 @@ utility: .Op Fl t Ar type .Op Fl f Ar flags .Ar geom +.\" ==== RECOVER ==== +.Nm +.Cm recover +.Op Fl f Ar flags +.Ar geom .\" ==== RESIZE ==== .Nm .Cm resize @@ -353,6 +358,23 @@ See the section entitled below for a discussion about its use. .El +.\" ==== RECOVER ==== +.It Cm recover +Recover corrupt partition's scheme metadata on the geom +.Ar geom . +See the section entitled +.Sx "RECOVERING" +below for the additional information. +.Pp +Additional options include: +.Bl -tag -width 10n +.It Fl f Ar flags +Additional operational flags. +See the section entitled +.Sx "OPERATIONAL FLAGS" +below for a discussion +about its use. +.El .\" ==== RESIZE ==== .It Cm resize Resize a partition from geom @@ -629,6 +651,68 @@ the action or reverted with the .Cm undo action. +.Sh RECOVERING +The GEOM class PART supports recovering of partition tables only for GPT. +The GUID partition table has a primary and secondary (backup) copy of +metadata for redundance. They are stored in the begining and in the end +of device respectively. Therefore it is acceptable to have some corruptions +in the metadata that are not fatal to work with GPT. When kernel detects +corrupt metadata it marks this table as corrupt and reports about corruption. +Any changes in corrupt table are prohibited except +.Cm destroy +and +.Cm recover . +.Pp +In case when only first sector is corrupt kernel can not detect GPT even +if partition table is not corrupt. You can write protective MBR with +.Xr dd 1 +command to restore ability of GPT detection. The copy of protective MBR is +usually located in the +.Pa /boot/pmbr +file. +.Pp +In case when some of metadata is corrupt you will get to know about this +from kernel's messages like these: +.Bd -literal -offset indent +GEOM: provider: the primary GPT table is corrupt or invalid. +GEOM: provider: using the secondary instead -- recovery strongly advised. +.Ed +.Pp +or +.Bd -literal -offset indent +GEOM: provider: the secondary GPT table is corrupt or invalid. +GEOM: provider: using the primary only -- recovery suggested. +.Ed +.Pp +Also +.Cm gpart +commands like +.Cm show , +.Cm status +and +.Cm list +will report about corrupt table. +.Pp +In case when the size of device has changed (e.g. volume expansion) the +secondary GPT header will become located not in the last sector. This is +not a metadata corruption, but it is dangerous because any corruption of +the primary GPT will lead to lost of partition table. Kernel reports about +this problem with message: +.Bd -literal -offset indent +GEOM: provider: the secondary GPT header is not in the last LBA. +.Ed +.Pp +A corrupt table can be recovered with +.Cm gpart recover +command. This command does reconstruction of corrupt metadata using +known valid metadata. Also it can relocate secondary GPT to the end of +device. +.Pp +.Pa NOTE : +The GEOM class PART can detect the same partition table on different GEOM +providers and some of them will marked as corrupt. Be careful when choising +a provider for recovering. If you did incorrect choise you can destroy +metadata of another GEOM class, e.g. GEOM MIRROR or GEOM LABEL. .Sh EXIT STATUS Exit status is 0 on success, and 1 if the command fails. .Sh EXAMPLES @@ -687,6 +771,7 @@ After having created all required partit /sbin/gpart bootcode -p /boot/boot1 da0 .Ed .Sh SEE ALSO +.Xr dd 1 , .Xr geom 4 , .Xr geom 8 .Sh HISTORY Modified: projects/binutils-2.17/sbin/hastd/hastd.c ============================================================================== --- projects/binutils-2.17/sbin/hastd/hastd.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/sbin/hastd/hastd.c Mon Oct 25 19:58:28 2010 (r214357) @@ -701,8 +701,6 @@ main(int argc, char *argv[]) int debuglevel; sigset_t mask; - g_gate_load(); - foreground = false; debuglevel = 0; pidfile = HASTD_PIDFILE; @@ -736,6 +734,8 @@ main(int argc, char *argv[]) pjdlog_debug_set(debuglevel); + g_gate_load(); + pfh = pidfile_open(pidfile, 0600, &otherpid); if (pfh == NULL) { if (errno == EEXIST) { Modified: projects/binutils-2.17/sbin/hastd/nv.c ============================================================================== --- projects/binutils-2.17/sbin/hastd/nv.c Mon Oct 25 19:56:02 2010 (r214356) +++ projects/binutils-2.17/sbin/hastd/nv.c Mon Oct 25 19:58:28 2010 (r214357) @@ -46,6 +46,35 @@ __FBSDID("$FreeBSD$"); #include #include +#define NV_TYPE_NONE 0 + +#define NV_TYPE_INT8 1 +#define NV_TYPE_UINT8 2 +#define NV_TYPE_INT16 3 +#define NV_TYPE_UINT16 4 +#define NV_TYPE_INT32 5 +#define NV_TYPE_UINT32 6 +#define NV_TYPE_INT64 7 +#define NV_TYPE_UINT64 8 +#define NV_TYPE_INT8_ARRAY 9 +#define NV_TYPE_UINT8_ARRAY 10 +#define NV_TYPE_INT16_ARRAY 11 +#define NV_TYPE_UINT16_ARRAY 12 +#define NV_TYPE_INT32_ARRAY 13 +#define NV_TYPE_UINT32_ARRAY 14 +#define NV_TYPE_INT64_ARRAY 15 +#define NV_TYPE_UINT64_ARRAY 16 +#define NV_TYPE_STRING 17 + +#define NV_TYPE_MASK 0x7f +#define NV_TYPE_FIRST NV_TYPE_INT8 +#define NV_TYPE_LAST NV_TYPE_STRING + +#define NV_ORDER_NETWORK 0x00 +#define NV_ORDER_HOST 0x80 + +#define NV_ORDER_MASK 0x80 + #define NV_MAGIC 0xaea1e struct nv { int nv_magic; @@ -534,6 +563,29 @@ nv_get_string(struct nv *nv, const char return (str); } +bool +nv_exists(struct nv *nv, const char *namefmt, ...) +{ + struct nvhdr *nvh; + va_list nameap; + int snverror, serrno; + + if (nv == NULL) + return (false); + + serrno = errno; + snverror = nv->nv_error; + + va_start(nameap, namefmt); + nvh = nv_find(nv, NV_TYPE_NONE, namefmt, nameap); + va_end(nameap); + + errno = serrno; + nv->nv_error = snverror; + + return (nvh != NULL); +} + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Oct 25 21:50:00 2010 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 0EA631065694; Mon, 25 Oct 2010 21:50:00 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F171F8FC17; Mon, 25 Oct 2010 21:49:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9PLnxQK078201; Mon, 25 Oct 2010 21:49:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9PLnx0T078199; Mon, 25 Oct 2010 21:49:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201010252149.o9PLnx0T078199@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 25 Oct 2010 21:49:59 +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: r214360 - projects/binutils-2.17/contrib/binutils/bfd 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: Mon, 25 Oct 2010 21:50:00 -0000 Author: nwhitehorn Date: Mon Oct 25 21:49:59 2010 New Revision: 214360 URL: http://svn.freebsd.org/changeset/base/214360 Log: Fix a manifestation of GCC bug 16625 that caused ld >= 2.17 to fail on 64-bit PowerPC when linking multiple C++ files referencing the same method, defined in a common header, when that method had a switch statement with more than 4 cases. This change fixes compilation of LLVM tblgen on 64-bit PPC with binutils 2.17. Lots of help from: dim Upstream after: more testing Modified: projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Modified: projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Mon Oct 25 21:46:23 2010 (r214359) +++ projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c Mon Oct 25 21:49:59 2010 (r214360) @@ -9640,6 +9640,9 @@ ppc64_elf_action_discarded (asection *se if (strcmp (".toc1", sec->name) == 0) return 0; + if (strcmp (".got", sec->name) == 0) + return 0; + return _bfd_elf_default_action_discarded (sec); } From owner-svn-src-projects@FreeBSD.ORG Tue Oct 26 02:34:49 2010 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 433CE106564A; Tue, 26 Oct 2010 02:34:49 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2BD9A8FC14; Tue, 26 Oct 2010 02:34:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9Q2Ynwa085003; Tue, 26 Oct 2010 02:34:49 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9Q2YnFG084993; Tue, 26 Oct 2010 02:34:49 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201010260234.o9Q2YnFG084993@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 26 Oct 2010 02:34:49 +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: r214369 - in projects/altix: lib/libstand sys/amd64/amd64 sys/amd64/conf sys/amd64/ia32 sys/amd64/include sys/amd64/linux32 sys/arm/arm sys/arm/at91 sys/arm/conf sys/arm/econa sys/arm/i... 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, 26 Oct 2010 02:34:49 -0000 Author: marcel Date: Tue Oct 26 02:34:47 2010 New Revision: 214369 URL: http://svn.freebsd.org/changeset/base/214369 Log: Merge svn+ssh://svn.freebsd.org/base/head@214309 Added: projects/altix/sys/arm/at91/at91_pio_sam9g20.h - copied unchanged from r214309, head/sys/arm/at91/at91_pio_sam9g20.h projects/altix/sys/arm/at91/at91_reset.S - copied unchanged from r214309, head/sys/arm/at91/at91_reset.S projects/altix/sys/arm/at91/at91_rst.c - copied unchanged from r214309, head/sys/arm/at91/at91_rst.c projects/altix/sys/arm/at91/at91_rstreg.h - copied unchanged from r214309, head/sys/arm/at91/at91_rstreg.h projects/altix/sys/arm/at91/at91_wdt.c - copied unchanged from r214309, head/sys/arm/at91/at91_wdt.c projects/altix/sys/arm/at91/at91_wdtreg.h - copied unchanged from r214309, head/sys/arm/at91/at91_wdtreg.h projects/altix/sys/arm/at91/at91reg.h - copied unchanged from r214309, head/sys/arm/at91/at91reg.h projects/altix/sys/arm/at91/at91rm9200.c - copied unchanged from r214309, head/sys/arm/at91/at91rm9200.c projects/altix/sys/arm/at91/at91sam9260.c - copied unchanged from r214309, head/sys/arm/at91/at91sam9260.c projects/altix/sys/arm/at91/at91sam9260reg.h - copied unchanged from r214309, head/sys/arm/at91/at91sam9260reg.h projects/altix/sys/arm/at91/at91sam9g20.c - copied unchanged from r214309, head/sys/arm/at91/at91sam9g20.c projects/altix/sys/arm/at91/board_qila9g20.c - copied unchanged from r214309, head/sys/arm/at91/board_qila9g20.c projects/altix/sys/arm/at91/board_sam9g20ek.c - copied unchanged from r214309, head/sys/arm/at91/board_sam9g20ek.c projects/altix/sys/arm/at91/std.qila9g20 - copied unchanged from r214309, head/sys/arm/at91/std.qila9g20 projects/altix/sys/arm/at91/std.sam9g20ek - copied unchanged from r214309, head/sys/arm/at91/std.sam9g20ek projects/altix/sys/arm/conf/DOCKSTAR - copied unchanged from r214309, head/sys/arm/conf/DOCKSTAR projects/altix/sys/arm/conf/QILA9G20 - copied unchanged from r214309, head/sys/arm/conf/QILA9G20 projects/altix/sys/arm/conf/QILA9G20.hints - copied unchanged from r214309, head/sys/arm/conf/QILA9G20.hints projects/altix/sys/arm/conf/SAM9G20EK - copied unchanged from r214309, head/sys/arm/conf/SAM9G20EK projects/altix/sys/arm/conf/SAM9G20EK.hints - copied unchanged from r214309, head/sys/arm/conf/SAM9G20EK.hints projects/altix/sys/boot/Makefile.amd64 - copied unchanged from r214309, head/sys/boot/Makefile.amd64 projects/altix/sys/boot/Makefile.arm - copied unchanged from r214309, head/sys/boot/Makefile.arm projects/altix/sys/boot/Makefile.i386 - copied unchanged from r214309, head/sys/boot/Makefile.i386 projects/altix/sys/boot/Makefile.ia64 - copied unchanged from r214309, head/sys/boot/Makefile.ia64 projects/altix/sys/boot/Makefile.pc98 - copied unchanged from r214309, head/sys/boot/Makefile.pc98 projects/altix/sys/boot/Makefile.powerpc - copied unchanged from r214309, head/sys/boot/Makefile.powerpc projects/altix/sys/boot/Makefile.sparc64 - copied unchanged from r214309, head/sys/boot/Makefile.sparc64 projects/altix/sys/boot/common/crc32.c - copied unchanged from r214309, head/sys/boot/common/crc32.c projects/altix/sys/boot/common/crc32.h - copied unchanged from r214309, head/sys/boot/common/crc32.h projects/altix/sys/boot/common/gpt.c - copied unchanged from r214309, head/sys/boot/common/gpt.c projects/altix/sys/boot/common/gpt.h - copied unchanged from r214309, head/sys/boot/common/gpt.h projects/altix/sys/boot/common/util.c - copied unchanged from r214309, head/sys/boot/common/util.c projects/altix/sys/boot/common/util.h - copied unchanged from r214309, head/sys/boot/common/util.h projects/altix/sys/boot/fdt/dts/dockstar.dts - copied unchanged from r214309, head/sys/boot/fdt/dts/dockstar.dts projects/altix/sys/boot/i386/common/ - copied from r214309, head/sys/boot/i386/common/ projects/altix/sys/cddl/dev/dtrace/amd64/regset.h - copied unchanged from r214309, head/sys/cddl/dev/dtrace/amd64/regset.h projects/altix/sys/cddl/dev/dtrace/i386/regset.h - copied unchanged from r214309, head/sys/cddl/dev/dtrace/i386/regset.h projects/altix/sys/conf/ldscript.mips.64.cfe - copied unchanged from r214309, head/sys/conf/ldscript.mips.64.cfe projects/altix/sys/contrib/dev/acpica/compiler/aslmessages.h - copied unchanged from r214309, head/sys/contrib/dev/acpica/compiler/aslmessages.h projects/altix/sys/contrib/dev/acpica/hardware/hwpci.c - copied unchanged from r214309, head/sys/contrib/dev/acpica/hardware/hwpci.c projects/altix/sys/contrib/dev/acpica/utilities/utxferror.c - copied unchanged from r214309, head/sys/contrib/dev/acpica/utilities/utxferror.c projects/altix/sys/dev/gpio/ - copied from r214309, head/sys/dev/gpio/ projects/altix/sys/dev/iicbus/ds1775.c - copied unchanged from r214309, head/sys/dev/iicbus/ds1775.c projects/altix/sys/dev/iicbus/max6690.c - copied unchanged from r214309, head/sys/dev/iicbus/max6690.c projects/altix/sys/dev/mps/ - copied from r214309, head/sys/dev/mps/ projects/altix/sys/dev/usb/controller/xhci.c - copied unchanged from r214309, head/sys/dev/usb/controller/xhci.c projects/altix/sys/dev/usb/controller/xhci.h - copied unchanged from r214309, head/sys/dev/usb/controller/xhci.h projects/altix/sys/dev/usb/controller/xhci_pci.c - copied unchanged from r214309, head/sys/dev/usb/controller/xhci_pci.c projects/altix/sys/dev/usb/controller/xhcireg.h - copied unchanged from r214309, head/sys/dev/usb/controller/xhcireg.h projects/altix/sys/dev/usb/net/if_ipheth.c - copied unchanged from r214309, head/sys/dev/usb/net/if_ipheth.c projects/altix/sys/dev/usb/net/if_iphethvar.h - copied unchanged from r214309, head/sys/dev/usb/net/if_iphethvar.h projects/altix/sys/dev/xen/control/ - copied from r214309, head/sys/dev/xen/control/ projects/altix/sys/fs/devfs/devfs_dir.c - copied unchanged from r214309, head/sys/fs/devfs/devfs_dir.c projects/altix/sys/kern/vfs_mountroot.c - copied unchanged from r214309, head/sys/kern/vfs_mountroot.c projects/altix/sys/libkern/inet_ntop.c - copied unchanged from r214309, head/sys/libkern/inet_ntop.c projects/altix/sys/libkern/inet_pton.c - copied unchanged from r214309, head/sys/libkern/inet_pton.c projects/altix/sys/mips/atheros/ar71xx_chip.c - copied unchanged from r214309, head/sys/mips/atheros/ar71xx_chip.c projects/altix/sys/mips/atheros/ar71xx_chip.h - copied unchanged from r214309, head/sys/mips/atheros/ar71xx_chip.h projects/altix/sys/mips/atheros/ar71xx_cpudef.h - copied unchanged from r214309, head/sys/mips/atheros/ar71xx_cpudef.h projects/altix/sys/mips/atheros/ar71xx_gpio.c - copied unchanged from r214309, head/sys/mips/atheros/ar71xx_gpio.c projects/altix/sys/mips/atheros/ar71xx_gpiovar.h - copied unchanged from r214309, head/sys/mips/atheros/ar71xx_gpiovar.h projects/altix/sys/mips/atheros/ar71xx_setup.c - copied unchanged from r214309, head/sys/mips/atheros/ar71xx_setup.c projects/altix/sys/mips/atheros/ar71xx_setup.h - copied unchanged from r214309, head/sys/mips/atheros/ar71xx_setup.h projects/altix/sys/mips/atheros/ar724x_chip.c - copied unchanged from r214309, head/sys/mips/atheros/ar724x_chip.c projects/altix/sys/mips/atheros/ar724x_chip.h - copied unchanged from r214309, head/sys/mips/atheros/ar724x_chip.h projects/altix/sys/mips/atheros/ar724xreg.h - copied unchanged from r214309, head/sys/mips/atheros/ar724xreg.h projects/altix/sys/mips/atheros/ar91xx_chip.c - copied unchanged from r214309, head/sys/mips/atheros/ar91xx_chip.c projects/altix/sys/mips/atheros/ar91xx_chip.h - copied unchanged from r214309, head/sys/mips/atheros/ar91xx_chip.h projects/altix/sys/mips/atheros/ar91xxreg.h - copied unchanged from r214309, head/sys/mips/atheros/ar91xxreg.h projects/altix/sys/mips/cavium/octe/ethernet-mv88e61xx.c - copied unchanged from r214309, head/sys/mips/cavium/octe/ethernet-mv88e61xx.c projects/altix/sys/mips/cavium/octe/ethernet-mv88e61xx.h - copied unchanged from r214309, head/sys/mips/cavium/octe/ethernet-mv88e61xx.h projects/altix/sys/mips/cavium/octe/mv88e61xxphy.c - copied unchanged from r214309, head/sys/mips/cavium/octe/mv88e61xxphy.c projects/altix/sys/mips/cavium/octe/mv88e61xxphyreg.h - copied unchanged from r214309, head/sys/mips/cavium/octe/mv88e61xxphyreg.h projects/altix/sys/mips/conf/SWARM64 - copied unchanged from r214309, head/sys/mips/conf/SWARM64 projects/altix/sys/mips/conf/SWARM64_SMP - copied unchanged from r214309, head/sys/mips/conf/SWARM64_SMP projects/altix/sys/mips/conf/SWARM_COMMON - copied unchanged from r214309, head/sys/mips/conf/SWARM_COMMON projects/altix/sys/mips/rmi/dev/nlge/ - copied from r214309, head/sys/mips/rmi/dev/nlge/ projects/altix/sys/mips/rmi/dev/xlr/debug.h - copied unchanged from r214309, head/sys/mips/rmi/dev/xlr/debug.h projects/altix/sys/mips/rmi/fmn.c - copied unchanged from r214309, head/sys/mips/rmi/fmn.c projects/altix/sys/mips/rmi/rmi_boot_info.h - copied unchanged from r214309, head/sys/mips/rmi/rmi_boot_info.h projects/altix/sys/mips/rmi/xlr_pcmcia.c - copied unchanged from r214309, head/sys/mips/rmi/xlr_pcmcia.c projects/altix/sys/modules/mps/ - copied from r214309, head/sys/modules/mps/ projects/altix/sys/modules/send/ - copied from r214309, head/sys/modules/send/ projects/altix/sys/modules/usb/ipheth/ - copied from r214309, head/sys/modules/usb/ipheth/ projects/altix/sys/modules/usb/xhci/ - copied from r214309, head/sys/modules/usb/xhci/ projects/altix/sys/net80211/ieee80211_ratectl_none.c - copied unchanged from r214309, head/sys/net80211/ieee80211_ratectl_none.c projects/altix/sys/netinet/in_debug.c - copied unchanged from r214309, head/sys/netinet/in_debug.c projects/altix/sys/netinet6/send.c - copied unchanged from r214309, head/sys/netinet6/send.c projects/altix/sys/netinet6/send.h - copied unchanged from r214309, head/sys/netinet6/send.h projects/altix/sys/nfs/nfs_mountcommon.h - copied unchanged from r214309, head/sys/nfs/nfs_mountcommon.h projects/altix/sys/powerpc/powermac/fcu.c - copied unchanged from r214309, head/sys/powerpc/powermac/fcu.c projects/altix/sys/powerpc/powermac/platform_powermac.c - copied unchanged from r214309, head/sys/powerpc/powermac/platform_powermac.c projects/altix/sys/sys/gpio.h - copied unchanged from r214309, head/sys/sys/gpio.h projects/altix/sys/x86/pci/ - copied from r214309, head/sys/x86/pci/ projects/altix/sys/xen/blkif.h - copied unchanged from r214309, head/sys/xen/blkif.h projects/altix/sys/xen/xenbus/xenbus.c - copied unchanged from r214309, head/sys/xen/xenbus/xenbus.c projects/altix/sys/xen/xenbus/xenbusb.c - copied unchanged from r214309, head/sys/xen/xenbus/xenbusb.c projects/altix/sys/xen/xenbus/xenbusb.h - copied unchanged from r214309, head/sys/xen/xenbus/xenbusb.h projects/altix/sys/xen/xenbus/xenbusb_back.c - copied unchanged from r214309, head/sys/xen/xenbus/xenbusb_back.c projects/altix/sys/xen/xenbus/xenbusb_front.c - copied unchanged from r214309, head/sys/xen/xenbus/xenbusb_front.c projects/altix/sys/xen/xenbus/xenbusb_if.m - copied unchanged from r214309, head/sys/xen/xenbus/xenbusb_if.m projects/altix/sys/xen/xenstore/ - copied from r214309, head/sys/xen/xenstore/ Replaced: projects/altix/sys/kern/Makefile - copied unchanged from r214309, head/sys/kern/Makefile Deleted: projects/altix/sys/arm/at91/at91_pio_sam9.h projects/altix/sys/arm/at91/at91sam9.c projects/altix/sys/arm/at91/at91sam9_machdep.c projects/altix/sys/dev/mii/axphyreg.h projects/altix/sys/mips/mips/psraccess.S projects/altix/sys/mips/rmi/clock.c projects/altix/sys/mips/rmi/clock.h projects/altix/sys/mips/rmi/debug.h projects/altix/sys/mips/rmi/dev/sec/stats.h projects/altix/sys/mips/rmi/on_chip.c projects/altix/sys/mips/rmi/shared_structs.h projects/altix/sys/mips/rmi/shared_structs_func.h projects/altix/sys/mips/rmi/shared_structs_offsets.h projects/altix/sys/mips/rmi/xlrconfig.h projects/altix/sys/powerpc/aim/platform_chrp.c projects/altix/sys/powerpc/aim/trap_subr.S projects/altix/sys/rpc/inet_ntop.c projects/altix/sys/rpc/inet_pton.c projects/altix/sys/xen/reboot.c projects/altix/sys/xen/xenbus/init.txt projects/altix/sys/xen/xenbus/xenbus_client.c projects/altix/sys/xen/xenbus/xenbus_comms.c projects/altix/sys/xen/xenbus/xenbus_comms.h projects/altix/sys/xen/xenbus/xenbus_dev.c projects/altix/sys/xen/xenbus/xenbus_probe.c projects/altix/sys/xen/xenbus/xenbus_probe_backend.c projects/altix/sys/xen/xenbus/xenbus_xs.c Modified: projects/altix/lib/libstand/Makefile projects/altix/lib/libstand/libstand.3 projects/altix/lib/libstand/net.h projects/altix/lib/libstand/nfs.c projects/altix/sys/amd64/amd64/cpu_switch.S projects/altix/sys/amd64/amd64/exception.S projects/altix/sys/amd64/amd64/identcpu.c projects/altix/sys/amd64/amd64/legacy.c projects/altix/sys/amd64/amd64/machdep.c projects/altix/sys/amd64/amd64/mp_machdep.c projects/altix/sys/amd64/amd64/nexus.c projects/altix/sys/amd64/amd64/pmap.c projects/altix/sys/amd64/amd64/trap.c projects/altix/sys/amd64/conf/GENERIC projects/altix/sys/amd64/conf/NOTES projects/altix/sys/amd64/ia32/ia32_syscall.c projects/altix/sys/amd64/include/apicvar.h projects/altix/sys/amd64/include/cpufunc.h projects/altix/sys/amd64/include/elf.h projects/altix/sys/amd64/include/segments.h projects/altix/sys/amd64/include/specialreg.h projects/altix/sys/amd64/include/trap.h projects/altix/sys/amd64/include/vmparam.h projects/altix/sys/amd64/linux32/linux32_proto.h projects/altix/sys/amd64/linux32/linux32_syscall.h projects/altix/sys/amd64/linux32/linux32_sysent.c projects/altix/sys/amd64/linux32/linux32_sysvec.c projects/altix/sys/amd64/linux32/syscalls.master projects/altix/sys/arm/arm/cpufunc.c projects/altix/sys/arm/arm/cpufunc_asm_sheeva.S projects/altix/sys/arm/arm/nexus.c projects/altix/sys/arm/arm/pmap.c projects/altix/sys/arm/at91/at91.c projects/altix/sys/arm/at91/at91_machdep.c projects/altix/sys/arm/at91/at91_mci.c projects/altix/sys/arm/at91/at91_pio.c projects/altix/sys/arm/at91/at91_pio_rm9200.h projects/altix/sys/arm/at91/at91_pioreg.h projects/altix/sys/arm/at91/at91_pit.c projects/altix/sys/arm/at91/at91_pmc.c projects/altix/sys/arm/at91/at91_pmcreg.h projects/altix/sys/arm/at91/at91_pmcvar.h projects/altix/sys/arm/at91/at91_twi.c projects/altix/sys/arm/at91/at91_twireg.h projects/altix/sys/arm/at91/at91rm92reg.h projects/altix/sys/arm/at91/at91sam9g20reg.h projects/altix/sys/arm/at91/at91var.h projects/altix/sys/arm/at91/board_hl201.c projects/altix/sys/arm/at91/board_kb920x.c projects/altix/sys/arm/at91/files.at91 projects/altix/sys/arm/at91/files.at91sam9 projects/altix/sys/arm/at91/if_ate.c projects/altix/sys/arm/at91/if_atereg.h projects/altix/sys/arm/at91/if_macb.c projects/altix/sys/arm/at91/std.at91sam9 projects/altix/sys/arm/at91/std.kb920x projects/altix/sys/arm/at91/uart_cpu_at91rm9200usart.c projects/altix/sys/arm/at91/uart_dev_at91usart.c projects/altix/sys/arm/econa/if_ece.c projects/altix/sys/arm/include/cpufunc.h projects/altix/sys/arm/include/elf.h projects/altix/sys/arm/mv/mv_sata.c projects/altix/sys/arm/mv/timer.c projects/altix/sys/arm/xscale/ixp425/if_npe.c projects/altix/sys/arm/xscale/ixp425/ixp425.c projects/altix/sys/boot/Makefile projects/altix/sys/boot/arm/ixp425/boot2/Makefile projects/altix/sys/boot/arm/uboot/Makefile projects/altix/sys/boot/common/Makefile.inc projects/altix/sys/boot/common/loader.8 projects/altix/sys/boot/common/ufsread.c projects/altix/sys/boot/efi/libefi/Makefile projects/altix/sys/boot/ficl/Makefile projects/altix/sys/boot/forth/beastie.4th projects/altix/sys/boot/forth/loader.conf projects/altix/sys/boot/i386/Makefile.inc projects/altix/sys/boot/i386/boot2/Makefile projects/altix/sys/boot/i386/boot2/boot2.c projects/altix/sys/boot/i386/efi/Makefile projects/altix/sys/boot/i386/gptboot/Makefile projects/altix/sys/boot/i386/gptboot/gptboot.c projects/altix/sys/boot/i386/gptzfsboot/Makefile projects/altix/sys/boot/i386/libfirewire/Makefile projects/altix/sys/boot/i386/libi386/Makefile projects/altix/sys/boot/i386/libi386/biosdisk.c projects/altix/sys/boot/i386/libi386/pxe.c projects/altix/sys/boot/i386/loader/Makefile projects/altix/sys/boot/i386/zfsboot/Makefile projects/altix/sys/boot/i386/zfsboot/zfsboot.c projects/altix/sys/boot/i386/zfsloader/Makefile projects/altix/sys/boot/ia64/common/Makefile projects/altix/sys/boot/ia64/efi/Makefile projects/altix/sys/boot/ia64/ski/Makefile projects/altix/sys/boot/ofw/libofw/Makefile projects/altix/sys/boot/ofw/libofw/ofw_copy.c projects/altix/sys/boot/pc98/boot2/Makefile projects/altix/sys/boot/pc98/boot2/boot2.c projects/altix/sys/boot/sparc64/boot1/boot1.c projects/altix/sys/boot/uboot/lib/Makefile projects/altix/sys/boot/zfs/Makefile projects/altix/sys/boot/zfs/zfs.c projects/altix/sys/boot/zfs/zfsimpl.c projects/altix/sys/cam/ata/ata_da.c projects/altix/sys/cam/cam_xpt.c projects/altix/sys/cam/scsi/scsi_da.c projects/altix/sys/cam/scsi/scsi_pass.c projects/altix/sys/cddl/boot/zfs/zfsimpl.h projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c projects/altix/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c projects/altix/sys/cddl/compat/opensolaris/sys/misc.h projects/altix/sys/cddl/compat/opensolaris/sys/policy.h projects/altix/sys/cddl/compat/opensolaris/sys/vnode.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/Makefile.files projects/altix/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/altix/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h projects/altix/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/altix/sys/cddl/dev/dtrace/amd64/dtrace_isa.c projects/altix/sys/cddl/dev/dtrace/amd64/instr_size.c projects/altix/sys/cddl/dev/dtrace/dtrace_cddl.h projects/altix/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/altix/sys/cddl/dev/dtrace/dtrace_load.c projects/altix/sys/cddl/dev/dtrace/dtrace_unload.c projects/altix/sys/cddl/dev/dtrace/i386/dtrace_isa.c projects/altix/sys/cddl/dev/dtrace/i386/instr_size.c projects/altix/sys/cddl/dev/systrace/systrace.c projects/altix/sys/compat/freebsd32/freebsd32_misc.c projects/altix/sys/compat/linprocfs/linprocfs.c projects/altix/sys/compat/linux/linux_futex.c projects/altix/sys/compat/linux/linux_ioctl.c projects/altix/sys/compat/linux/linux_util.h projects/altix/sys/compat/ndis/subr_ntoskrnl.c projects/altix/sys/compat/svr4/svr4_sysvec.c projects/altix/sys/compat/x86bios/x86bios.c projects/altix/sys/compat/x86bios/x86bios.h projects/altix/sys/conf/Makefile.mips projects/altix/sys/conf/NOTES projects/altix/sys/conf/files projects/altix/sys/conf/files.amd64 projects/altix/sys/conf/files.i386 projects/altix/sys/conf/files.mips projects/altix/sys/conf/files.powerpc projects/altix/sys/conf/kern.mk projects/altix/sys/conf/kern.post.mk projects/altix/sys/conf/kern.pre.mk projects/altix/sys/conf/kmod.mk projects/altix/sys/conf/ldscript.mips.octeon1.64 projects/altix/sys/conf/makeLINT.mk projects/altix/sys/conf/newvers.sh projects/altix/sys/conf/options projects/altix/sys/conf/options.arm projects/altix/sys/contrib/dev/acpica/acpica_prep.sh projects/altix/sys/contrib/dev/acpica/changes.txt projects/altix/sys/contrib/dev/acpica/common/adfile.c projects/altix/sys/contrib/dev/acpica/common/adisasm.c projects/altix/sys/contrib/dev/acpica/common/adwalk.c projects/altix/sys/contrib/dev/acpica/common/dmrestag.c projects/altix/sys/contrib/dev/acpica/common/getopt.c projects/altix/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/altix/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/altix/sys/contrib/dev/acpica/compiler/aslcompile.c projects/altix/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/altix/sys/contrib/dev/acpica/compiler/asldefine.h projects/altix/sys/contrib/dev/acpica/compiler/aslerror.c projects/altix/sys/contrib/dev/acpica/compiler/aslfiles.c projects/altix/sys/contrib/dev/acpica/compiler/asllisting.c projects/altix/sys/contrib/dev/acpica/compiler/asllookup.c projects/altix/sys/contrib/dev/acpica/compiler/aslmain.c projects/altix/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/altix/sys/contrib/dev/acpica/compiler/aslpredef.c projects/altix/sys/contrib/dev/acpica/compiler/aslresource.c projects/altix/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/altix/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/altix/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/altix/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/altix/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/altix/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/altix/sys/contrib/dev/acpica/compiler/aslstartup.c projects/altix/sys/contrib/dev/acpica/compiler/asltypes.h projects/altix/sys/contrib/dev/acpica/compiler/aslutils.c projects/altix/sys/contrib/dev/acpica/compiler/dtcompile.c projects/altix/sys/contrib/dev/acpica/compiler/dtio.c projects/altix/sys/contrib/dev/acpica/compiler/dttemplate.c projects/altix/sys/contrib/dev/acpica/debugger/dbexec.c projects/altix/sys/contrib/dev/acpica/events/evrgnini.c projects/altix/sys/contrib/dev/acpica/events/evxfregn.c projects/altix/sys/contrib/dev/acpica/executer/exmutex.c projects/altix/sys/contrib/dev/acpica/include/acapps.h projects/altix/sys/contrib/dev/acpica/include/acglobal.h projects/altix/sys/contrib/dev/acpica/include/achware.h projects/altix/sys/contrib/dev/acpica/include/aclocal.h projects/altix/sys/contrib/dev/acpica/include/acmacros.h projects/altix/sys/contrib/dev/acpica/include/acnamesp.h projects/altix/sys/contrib/dev/acpica/include/acpiosxf.h projects/altix/sys/contrib/dev/acpica/include/acpixf.h projects/altix/sys/contrib/dev/acpica/include/actypes.h projects/altix/sys/contrib/dev/acpica/include/acutils.h projects/altix/sys/contrib/dev/acpica/include/platform/acenv.h projects/altix/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/altix/sys/contrib/dev/acpica/include/platform/acgcc.h projects/altix/sys/contrib/dev/acpica/namespace/nsrepair2.c projects/altix/sys/contrib/dev/acpica/namespace/nsutils.c projects/altix/sys/contrib/dev/acpica/osunixxf.c projects/altix/sys/contrib/dev/acpica/tables/tbfadt.c projects/altix/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h projects/altix/sys/contrib/dev/acpica/utilities/utdebug.c projects/altix/sys/contrib/dev/acpica/utilities/utglobal.c projects/altix/sys/contrib/dev/acpica/utilities/utids.c projects/altix/sys/contrib/dev/acpica/utilities/utmath.c projects/altix/sys/contrib/dev/acpica/utilities/utmisc.c projects/altix/sys/contrib/dev/acpica/utilities/utmutex.c projects/altix/sys/contrib/dev/acpica/utilities/utosi.c projects/altix/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/altix/sys/contrib/ngatm/netnatm/api/cc_conn.c projects/altix/sys/contrib/ngatm/netnatm/msg/privmsg.c projects/altix/sys/contrib/ngatm/netnatm/msg/uni_ie.c projects/altix/sys/contrib/ngatm/netnatm/sig/sig_call.c projects/altix/sys/contrib/ngatm/netnatm/sig/sig_reset.c projects/altix/sys/contrib/octeon-sdk/cvmx-app-init.h projects/altix/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper-spi.c projects/altix/sys/contrib/octeon-sdk/cvmx-helper.c projects/altix/sys/contrib/octeon-sdk/cvmx-spi.c projects/altix/sys/contrib/pf/net/pf.c projects/altix/sys/contrib/pf/netinet/in4_cksum.c projects/altix/sys/crypto/aesni/aeskeys_i386.S projects/altix/sys/crypto/aesni/aesni.c projects/altix/sys/crypto/aesni/aesni.h projects/altix/sys/crypto/aesni/aesni_wrap.c projects/altix/sys/dev/aac/aac.c projects/altix/sys/dev/aac/aac_cam.c projects/altix/sys/dev/aac/aac_disk.c projects/altix/sys/dev/aac/aacreg.h projects/altix/sys/dev/aac/aacvar.h projects/altix/sys/dev/acpi_support/acpi_hp.c projects/altix/sys/dev/acpi_support/acpi_wmi.c projects/altix/sys/dev/acpica/Osd/OsdHardware.c projects/altix/sys/dev/acpica/acpi.c projects/altix/sys/dev/acpica/acpi_cpu.c projects/altix/sys/dev/acpica/acpi_ec.c projects/altix/sys/dev/acpica/acpi_hpet.c projects/altix/sys/dev/acpica/acpi_if.m projects/altix/sys/dev/acpica/acpi_pci.c projects/altix/sys/dev/acpica/acpi_pcib.c projects/altix/sys/dev/acpica/acpi_pcib_acpi.c projects/altix/sys/dev/acpica/acpi_pcib_pci.c projects/altix/sys/dev/acpica/acpi_pcibvar.h projects/altix/sys/dev/acpica/acpivar.h projects/altix/sys/dev/ae/if_ae.c projects/altix/sys/dev/ae/if_aevar.h projects/altix/sys/dev/age/if_age.c projects/altix/sys/dev/ahci/ahci.c projects/altix/sys/dev/aic7xxx/aicasm/Makefile projects/altix/sys/dev/alc/if_alc.c projects/altix/sys/dev/ale/if_ale.c projects/altix/sys/dev/ata/ata-all.c projects/altix/sys/dev/ata/ata-all.h projects/altix/sys/dev/ata/ata-lowlevel.c projects/altix/sys/dev/ata/ata-pci.c projects/altix/sys/dev/ata/ata-pci.h projects/altix/sys/dev/ata/ata-sata.c projects/altix/sys/dev/ata/chipsets/ata-ahci.c projects/altix/sys/dev/ata/chipsets/ata-intel.c projects/altix/sys/dev/ata/chipsets/ata-marvell.c projects/altix/sys/dev/ata/chipsets/ata-nvidia.c projects/altix/sys/dev/ata/chipsets/ata-promise.c projects/altix/sys/dev/ata/chipsets/ata-serverworks.c projects/altix/sys/dev/ata/chipsets/ata-siliconimage.c projects/altix/sys/dev/ata/chipsets/ata-via.c projects/altix/sys/dev/atkbdc/atkbdc_isa.c projects/altix/sys/dev/atkbdc/psm.c projects/altix/sys/dev/bce/if_bce.c projects/altix/sys/dev/bce/if_bcereg.h projects/altix/sys/dev/bfe/if_bfe.c projects/altix/sys/dev/bge/if_bge.c projects/altix/sys/dev/bge/if_bgereg.h projects/altix/sys/dev/bm/if_bm.c projects/altix/sys/dev/bwn/if_bwn.c projects/altix/sys/dev/cas/if_cas.c projects/altix/sys/dev/cas/if_casvar.h projects/altix/sys/dev/ciss/ciss.c projects/altix/sys/dev/cxgb/common/cxgb_common.h projects/altix/sys/dev/cxgb/common/cxgb_t3_hw.c projects/altix/sys/dev/cxgb/common/cxgb_xgmac.c projects/altix/sys/dev/cxgb/cxgb_main.c projects/altix/sys/dev/cxgb/cxgb_sge.c projects/altix/sys/dev/dc/dcphy.c projects/altix/sys/dev/dc/if_dc.c projects/altix/sys/dev/dc/if_dcreg.h projects/altix/sys/dev/dc/pnphy.c projects/altix/sys/dev/e1000/e1000_82571.c projects/altix/sys/dev/e1000/e1000_82571.h projects/altix/sys/dev/e1000/e1000_82575.c projects/altix/sys/dev/e1000/e1000_82575.h projects/altix/sys/dev/e1000/e1000_api.c projects/altix/sys/dev/e1000/e1000_api.h projects/altix/sys/dev/e1000/e1000_defines.h projects/altix/sys/dev/e1000/e1000_hw.h projects/altix/sys/dev/e1000/e1000_ich8lan.c projects/altix/sys/dev/e1000/e1000_ich8lan.h projects/altix/sys/dev/e1000/e1000_mac.c projects/altix/sys/dev/e1000/e1000_nvm.c projects/altix/sys/dev/e1000/e1000_nvm.h projects/altix/sys/dev/e1000/e1000_phy.c projects/altix/sys/dev/e1000/e1000_phy.h projects/altix/sys/dev/e1000/e1000_regs.h projects/altix/sys/dev/e1000/if_em.c projects/altix/sys/dev/e1000/if_em.h projects/altix/sys/dev/e1000/if_igb.c projects/altix/sys/dev/e1000/if_igb.h projects/altix/sys/dev/e1000/if_lem.c projects/altix/sys/dev/e1000/if_lem.h projects/altix/sys/dev/ed/if_ed.c projects/altix/sys/dev/ed/if_ed_isa.c projects/altix/sys/dev/ed/if_ed_novell.c projects/altix/sys/dev/ed/if_ed_pccard.c projects/altix/sys/dev/ed/if_ed_pci.c projects/altix/sys/dev/et/if_et.c projects/altix/sys/dev/fb/vesa.c projects/altix/sys/dev/firewire/firewire.c projects/altix/sys/dev/firewire/fwohci.c projects/altix/sys/dev/firewire/fwohci_pci.c projects/altix/sys/dev/flash/mx25l.c projects/altix/sys/dev/fxp/if_fxp.c projects/altix/sys/dev/gem/if_gem.c projects/altix/sys/dev/gem/if_gem_pci.c projects/altix/sys/dev/gem/if_gem_sbus.c projects/altix/sys/dev/gem/if_gemvar.h projects/altix/sys/dev/hifn/hifn7751.c projects/altix/sys/dev/hifn/hifn7751var.h projects/altix/sys/dev/hme/if_hme.c projects/altix/sys/dev/hptrr/hptrr_osm_bsd.c projects/altix/sys/dev/hwpmc/hwpmc_core.c projects/altix/sys/dev/hwpmc/pmc_events.h projects/altix/sys/dev/ichsmb/ichsmb_pci.c projects/altix/sys/dev/ichwd/ichwd.c projects/altix/sys/dev/ichwd/ichwd.h projects/altix/sys/dev/if_ndis/if_ndis.c projects/altix/sys/dev/if_ndis/if_ndis_usb.c projects/altix/sys/dev/iicbus/iicbus.c projects/altix/sys/dev/iscsi/initiator/iscsi.c projects/altix/sys/dev/iscsi/initiator/iscsivar.h projects/altix/sys/dev/iwi/if_iwi.c projects/altix/sys/dev/iwi/if_iwivar.h projects/altix/sys/dev/iwn/if_iwn.c projects/altix/sys/dev/iwn/if_iwnvar.h projects/altix/sys/dev/ixgb/if_ixgb.c projects/altix/sys/dev/ixgb/if_ixgb.h projects/altix/sys/dev/ixgbe/ixgbe.c projects/altix/sys/dev/ixgbe/ixgbe.h projects/altix/sys/dev/jme/if_jme.c projects/altix/sys/dev/kbd/kbd.c projects/altix/sys/dev/kbdmux/kbdmux.c projects/altix/sys/dev/led/led.c projects/altix/sys/dev/lge/if_lge.c projects/altix/sys/dev/malo/if_malo_pci.c projects/altix/sys/dev/md/md.c projects/altix/sys/dev/mfi/mfireg.h projects/altix/sys/dev/mge/if_mge.c projects/altix/sys/dev/mge/if_mgevar.h projects/altix/sys/dev/mii/acphy.c projects/altix/sys/dev/mii/amphy.c projects/altix/sys/dev/mii/atphy.c projects/altix/sys/dev/mii/axphy.c projects/altix/sys/dev/mii/bmtphy.c projects/altix/sys/dev/mii/brgphy.c projects/altix/sys/dev/mii/brgphyreg.h projects/altix/sys/dev/mii/ciphy.c projects/altix/sys/dev/mii/e1000phy.c projects/altix/sys/dev/mii/exphy.c projects/altix/sys/dev/mii/gentbi.c projects/altix/sys/dev/mii/icsphy.c projects/altix/sys/dev/mii/inphy.c projects/altix/sys/dev/mii/ip1000phy.c projects/altix/sys/dev/mii/jmphy.c projects/altix/sys/dev/mii/lxtphy.c projects/altix/sys/dev/mii/mii.c projects/altix/sys/dev/mii/mii.h projects/altix/sys/dev/mii/mii_physubr.c projects/altix/sys/dev/mii/miivar.h projects/altix/sys/dev/mii/mlphy.c projects/altix/sys/dev/mii/nsgphy.c projects/altix/sys/dev/mii/nsphy.c projects/altix/sys/dev/mii/nsphyter.c projects/altix/sys/dev/mii/pnaphy.c projects/altix/sys/dev/mii/qsphy.c projects/altix/sys/dev/mii/rgephy.c projects/altix/sys/dev/mii/rlphy.c projects/altix/sys/dev/mii/rlswitch.c projects/altix/sys/dev/mii/ruephy.c projects/altix/sys/dev/mii/smcphy.c projects/altix/sys/dev/mii/tdkphy.c projects/altix/sys/dev/mii/tlphy.c projects/altix/sys/dev/mii/tlphyreg.h projects/altix/sys/dev/mii/truephy.c projects/altix/sys/dev/mii/ukphy.c projects/altix/sys/dev/mii/ukphy_subr.c projects/altix/sys/dev/mii/xmphy.c projects/altix/sys/dev/mpt/mpt.c projects/altix/sys/dev/mpt/mpt.h projects/altix/sys/dev/msk/if_msk.c projects/altix/sys/dev/mvs/mvs.c projects/altix/sys/dev/mvs/mvs_pci.c projects/altix/sys/dev/mvs/mvs_soc.c projects/altix/sys/dev/mwl/if_mwl_pci.c projects/altix/sys/dev/nfe/if_nfe.c projects/altix/sys/dev/nge/if_nge.c projects/altix/sys/dev/nve/if_nve.c projects/altix/sys/dev/ofw/ofw_fdt.c projects/altix/sys/dev/ofw/ofw_if.m projects/altix/sys/dev/ofw/ofw_iicbus.c projects/altix/sys/dev/ofw/ofw_standard.c projects/altix/sys/dev/ofw/openfirm.c projects/altix/sys/dev/pci/pci.c projects/altix/sys/dev/pci/pci_pci.c projects/altix/sys/dev/pci/pci_private.h projects/altix/sys/dev/pci/pcib_if.m projects/altix/sys/dev/pci/pcireg.h projects/altix/sys/dev/pci/pcivar.h projects/altix/sys/dev/pcn/if_pcn.c projects/altix/sys/dev/powermac_nvram/powermac_nvram.c projects/altix/sys/dev/powermac_nvram/powermac_nvramvar.h projects/altix/sys/dev/ppbus/ppbconf.c projects/altix/sys/dev/ral/rt2560.c projects/altix/sys/dev/re/if_re.c projects/altix/sys/dev/sf/if_sf.c projects/altix/sys/dev/sge/if_sge.c projects/altix/sys/dev/siba/siba.c projects/altix/sys/dev/siis/siis.c projects/altix/sys/dev/sis/if_sis.c projects/altix/sys/dev/sis/if_sisreg.h projects/altix/sys/dev/sk/if_sk.c projects/altix/sys/dev/smc/if_smc.c projects/altix/sys/dev/sound/pci/envy24ht.c projects/altix/sys/dev/sound/pci/hda/hdac.c projects/altix/sys/dev/sound/pci/spicds.c projects/altix/sys/dev/spibus/spibus.c projects/altix/sys/dev/ste/if_ste.c projects/altix/sys/dev/stge/if_stge.c projects/altix/sys/dev/syscons/scvgarndr.c projects/altix/sys/dev/syscons/syscons.c projects/altix/sys/dev/tl/if_tl.c projects/altix/sys/dev/tl/if_tlreg.h projects/altix/sys/dev/tsec/if_tsec.c projects/altix/sys/dev/twa/tw_cl.h projects/altix/sys/dev/twa/tw_cl_externs.h projects/altix/sys/dev/twa/tw_cl_fwif.h projects/altix/sys/dev/twa/tw_cl_init.c projects/altix/sys/dev/twa/tw_cl_intr.c projects/altix/sys/dev/twa/tw_cl_io.c projects/altix/sys/dev/twa/tw_cl_misc.c projects/altix/sys/dev/twa/tw_cl_share.h projects/altix/sys/dev/twa/tw_osl.h projects/altix/sys/dev/twa/tw_osl_cam.c projects/altix/sys/dev/twa/tw_osl_freebsd.c projects/altix/sys/dev/twa/tw_osl_share.h projects/altix/sys/dev/tx/if_tx.c projects/altix/sys/dev/usb/controller/at91dci.c projects/altix/sys/dev/usb/controller/atmegadci.c projects/altix/sys/dev/usb/controller/avr32dci.c projects/altix/sys/dev/usb/controller/ehci.c projects/altix/sys/dev/usb/controller/ehci.h projects/altix/sys/dev/usb/controller/ehci_pci.c projects/altix/sys/dev/usb/controller/ehcireg.h projects/altix/sys/dev/usb/controller/musb_otg.c projects/altix/sys/dev/usb/controller/ohci.c projects/altix/sys/dev/usb/controller/uhci.c projects/altix/sys/dev/usb/controller/usb_controller.c projects/altix/sys/dev/usb/controller/uss820dci.c projects/altix/sys/dev/usb/input/atp.c projects/altix/sys/dev/usb/input/uep.c projects/altix/sys/dev/usb/input/uhid.c projects/altix/sys/dev/usb/input/ukbd.c projects/altix/sys/dev/usb/input/ums.c projects/altix/sys/dev/usb/misc/udbp.c projects/altix/sys/dev/usb/misc/ufm.c projects/altix/sys/dev/usb/net/if_aue.c projects/altix/sys/dev/usb/net/if_axe.c projects/altix/sys/dev/usb/net/if_axereg.h projects/altix/sys/dev/usb/net/if_cdce.c projects/altix/sys/dev/usb/net/if_cdcereg.h projects/altix/sys/dev/usb/net/if_cue.c projects/altix/sys/dev/usb/net/if_kue.c projects/altix/sys/dev/usb/net/if_rue.c projects/altix/sys/dev/usb/net/if_udav.c projects/altix/sys/dev/usb/net/uhso.c projects/altix/sys/dev/usb/net/usb_ethernet.c projects/altix/sys/dev/usb/quirk/usb_quirk.c projects/altix/sys/dev/usb/serial/u3g.c projects/altix/sys/dev/usb/serial/uark.c projects/altix/sys/dev/usb/serial/ubsa.c projects/altix/sys/dev/usb/serial/ubser.c projects/altix/sys/dev/usb/serial/uchcom.c projects/altix/sys/dev/usb/serial/ucycom.c projects/altix/sys/dev/usb/serial/ufoma.c projects/altix/sys/dev/usb/serial/uftdi.c projects/altix/sys/dev/usb/serial/ugensa.c projects/altix/sys/dev/usb/serial/uipaq.c projects/altix/sys/dev/usb/serial/ulpt.c projects/altix/sys/dev/usb/serial/umct.c projects/altix/sys/dev/usb/serial/umoscom.c projects/altix/sys/dev/usb/serial/usb_serial.c projects/altix/sys/dev/usb/serial/uvisor.c projects/altix/sys/dev/usb/storage/umass.c projects/altix/sys/dev/usb/storage/urio.c projects/altix/sys/dev/usb/usb.h projects/altix/sys/dev/usb/usb_busdma.c projects/altix/sys/dev/usb/usb_cdc.h projects/altix/sys/dev/usb/usb_compat_linux.c projects/altix/sys/dev/usb/usb_controller.h projects/altix/sys/dev/usb/usb_dev.c projects/altix/sys/dev/usb/usb_device.c projects/altix/sys/dev/usb/usb_device.h projects/altix/sys/dev/usb/usb_freebsd.h projects/altix/sys/dev/usb/usb_generic.c projects/altix/sys/dev/usb/usb_handle_request.c projects/altix/sys/dev/usb/usb_hub.c projects/altix/sys/dev/usb/usb_hub.h projects/altix/sys/dev/usb/usb_ioctl.h projects/altix/sys/dev/usb/usb_msctest.c projects/altix/sys/dev/usb/usb_msctest.h projects/altix/sys/dev/usb/usb_parse.c projects/altix/sys/dev/usb/usb_request.c projects/altix/sys/dev/usb/usb_request.h projects/altix/sys/dev/usb/usb_transfer.c projects/altix/sys/dev/usb/usb_transfer.h projects/altix/sys/dev/usb/usbdevs projects/altix/sys/dev/usb/usbdi.h projects/altix/sys/dev/usb/usbdi_util.h projects/altix/sys/dev/usb/wlan/if_rum.c projects/altix/sys/dev/usb/wlan/if_run.c projects/altix/sys/dev/usb/wlan/if_uath.c projects/altix/sys/dev/usb/wlan/if_upgt.c projects/altix/sys/dev/usb/wlan/if_ural.c projects/altix/sys/dev/usb/wlan/if_urtw.c projects/altix/sys/dev/usb/wlan/if_zyd.c projects/altix/sys/dev/vge/if_vge.c projects/altix/sys/dev/vr/if_vr.c projects/altix/sys/dev/vr/if_vrreg.h projects/altix/sys/dev/wb/if_wb.c projects/altix/sys/dev/xen/balloon/balloon.c projects/altix/sys/dev/xen/blkback/blkback.c projects/altix/sys/dev/xen/blkfront/blkfront.c projects/altix/sys/dev/xen/blkfront/block.h projects/altix/sys/dev/xen/netfront/netfront.c projects/altix/sys/dev/xen/xenpci/evtchn.c projects/altix/sys/dev/xen/xenpci/xenpci.c projects/altix/sys/dev/xl/if_xl.c projects/altix/sys/dev/xl/if_xlreg.h projects/altix/sys/fs/cd9660/cd9660_mount.h projects/altix/sys/fs/cd9660/cd9660_vfsops.c projects/altix/sys/fs/devfs/devfs.h projects/altix/sys/fs/devfs/devfs_devs.c projects/altix/sys/fs/devfs/devfs_int.h projects/altix/sys/fs/devfs/devfs_vnops.c projects/altix/sys/fs/ext2fs/ext2_alloc.c projects/altix/sys/fs/hpfs/hpfs_vfsops.c projects/altix/sys/fs/hpfs/hpfsmount.h projects/altix/sys/fs/msdosfs/msdosfs_denode.c projects/altix/sys/fs/msdosfs/msdosfs_lookup.c projects/altix/sys/fs/msdosfs/msdosfs_vfsops.c projects/altix/sys/fs/msdosfs/msdosfs_vnops.c projects/altix/sys/fs/msdosfs/msdosfsmount.h projects/altix/sys/fs/nfs/nfs_commonsubs.c projects/altix/sys/fs/nfs/nfs_var.h projects/altix/sys/fs/nfs/nfsdport.h projects/altix/sys/fs/nfsclient/nfs_clbio.c projects/altix/sys/fs/nfsclient/nfs_clnode.c projects/altix/sys/fs/nfsclient/nfs_clport.c projects/altix/sys/fs/nfsclient/nfs_clrpcops.c projects/altix/sys/fs/nfsclient/nfs_clvfsops.c projects/altix/sys/fs/nfsclient/nfs_clvnops.c projects/altix/sys/fs/nfsclient/nfsmount.h projects/altix/sys/fs/nfsclient/nfsnode.h projects/altix/sys/fs/nfsserver/nfs_nfsdport.c projects/altix/sys/fs/nfsserver/nfs_nfsdsocket.c projects/altix/sys/fs/nfsserver/nfs_nfsdstate.c projects/altix/sys/fs/ntfs/ntfs_vfsops.c projects/altix/sys/fs/ntfs/ntfsmount.h projects/altix/sys/fs/nullfs/null_vnops.c projects/altix/sys/fs/nwfs/nwfs_node.c projects/altix/sys/fs/nwfs/nwfs_vfsops.c projects/altix/sys/fs/pseudofs/pseudofs_vncache.c projects/altix/sys/fs/smbfs/smbfs_node.c projects/altix/sys/fs/smbfs/smbfs_vfsops.c projects/altix/sys/fs/tmpfs/tmpfs.h projects/altix/sys/fs/tmpfs/tmpfs_subr.c projects/altix/sys/fs/tmpfs/tmpfs_vnops.c projects/altix/sys/fs/unionfs/union_subr.c projects/altix/sys/fs/unionfs/union_vfsops.c projects/altix/sys/gdb/gdb_cons.c projects/altix/sys/geom/concat/g_concat.c projects/altix/sys/geom/eli/g_eli.c projects/altix/sys/geom/eli/g_eli.h projects/altix/sys/geom/eli/g_eli_crypto.c projects/altix/sys/geom/eli/g_eli_ctl.c projects/altix/sys/geom/eli/g_eli_integrity.c projects/altix/sys/geom/eli/g_eli_key.c projects/altix/sys/geom/eli/g_eli_privacy.c projects/altix/sys/geom/geom_dev.c projects/altix/sys/geom/geom_io.c projects/altix/sys/geom/mirror/g_mirror.c projects/altix/sys/geom/mirror/g_mirror_ctl.c projects/altix/sys/geom/part/g_part.c projects/altix/sys/geom/part/g_part_ebr.c projects/altix/sys/geom/part/g_part_gpt.c projects/altix/sys/geom/part/g_part_mbr.c projects/altix/sys/geom/part/g_part_pc98.c projects/altix/sys/geom/sched/subr_disk.c projects/altix/sys/geom/vinum/geom_vinum_move.c projects/altix/sys/geom/vinum/geom_vinum_rename.c projects/altix/sys/geom/virstor/g_virstor.c projects/altix/sys/gnu/fs/reiserfs/reiserfs_mount.h projects/altix/sys/gnu/fs/reiserfs/reiserfs_vfsops.c projects/altix/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c projects/altix/sys/i386/acpica/Makefile projects/altix/sys/i386/conf/GENERIC projects/altix/sys/i386/conf/NOTES projects/altix/sys/i386/i386/exception.s projects/altix/sys/i386/i386/identcpu.c projects/altix/sys/i386/i386/legacy.c projects/altix/sys/i386/i386/locore.s projects/altix/sys/i386/i386/machdep.c projects/altix/sys/i386/i386/mp_machdep.c projects/altix/sys/i386/i386/nexus.c projects/altix/sys/i386/i386/pmap.c projects/altix/sys/i386/i386/support.s projects/altix/sys/i386/i386/trap.c projects/altix/sys/i386/ibcs2/ibcs2_sysvec.c projects/altix/sys/i386/include/apicvar.h projects/altix/sys/i386/include/cpufunc.h projects/altix/sys/i386/include/elf.h projects/altix/sys/i386/include/pmap.h projects/altix/sys/i386/include/segments.h projects/altix/sys/i386/include/specialreg.h projects/altix/sys/i386/include/trap.h projects/altix/sys/i386/include/vm86.h projects/altix/sys/i386/linux/linux_sysvec.c projects/altix/sys/i386/xen/xen_machdep.c projects/altix/sys/ia64/ia64/nexus.c projects/altix/sys/ia64/ia64/trap.c projects/altix/sys/ia64/include/_stdint.h projects/altix/sys/ia64/include/bus.h projects/altix/sys/ia64/include/elf.h projects/altix/sys/isa/isa_common.c projects/altix/sys/kern/bus_if.m projects/altix/sys/kern/imgact_elf.c projects/altix/sys/kern/imgact_shell.c projects/altix/sys/kern/init_main.c projects/altix/sys/kern/init_sysent.c projects/altix/sys/kern/kern_clock.c projects/altix/sys/kern/kern_clocksource.c projects/altix/sys/kern/kern_conf.c projects/altix/sys/kern/kern_dtrace.c projects/altix/sys/kern/kern_et.c projects/altix/sys/kern/kern_exec.c projects/altix/sys/kern/kern_exit.c projects/altix/sys/kern/kern_fork.c projects/altix/sys/kern/kern_jail.c projects/altix/sys/kern/kern_kthread.c projects/altix/sys/kern/kern_ktrace.c projects/altix/sys/kern/kern_linker.c projects/altix/sys/kern/kern_lock.c projects/altix/sys/kern/kern_malloc.c projects/altix/sys/kern/kern_ntptime.c projects/altix/sys/kern/kern_priv.c projects/altix/sys/kern/kern_proc.c projects/altix/sys/kern/kern_resource.c projects/altix/sys/kern/kern_rmlock.c projects/altix/sys/kern/kern_shutdown.c projects/altix/sys/kern/kern_sig.c projects/altix/sys/kern/kern_syscalls.c projects/altix/sys/kern/kern_sysctl.c projects/altix/sys/kern/kern_tc.c projects/altix/sys/kern/kern_thr.c projects/altix/sys/kern/kern_thread.c projects/altix/sys/kern/kern_time.c projects/altix/sys/kern/kern_timeout.c projects/altix/sys/kern/kern_umtx.c projects/altix/sys/kern/link_elf.c projects/altix/sys/kern/link_elf_obj.c projects/altix/sys/kern/p1003_1b.c projects/altix/sys/kern/sched_4bsd.c projects/altix/sys/kern/sched_ule.c projects/altix/sys/kern/subr_acl_nfs4.c projects/altix/sys/kern/subr_acl_posix1e.c projects/altix/sys/kern/subr_bus.c projects/altix/sys/kern/subr_busdma.c projects/altix/sys/kern/subr_clock.c projects/altix/sys/kern/subr_disk.c projects/altix/sys/kern/subr_kdb.c projects/altix/sys/kern/subr_lock.c projects/altix/sys/kern/subr_sbuf.c projects/altix/sys/kern/subr_sleepqueue.c projects/altix/sys/kern/subr_smp.c projects/altix/sys/kern/subr_stack.c projects/altix/sys/kern/subr_taskqueue.c projects/altix/sys/kern/subr_trap.c projects/altix/sys/kern/subr_witness.c projects/altix/sys/kern/sys_generic.c projects/altix/sys/kern/sys_process.c projects/altix/sys/kern/syscalls.c projects/altix/sys/kern/syscalls.master projects/altix/sys/kern/systrace_args.c projects/altix/sys/kern/tty.c projects/altix/sys/kern/uipc_mqueue.c projects/altix/sys/kern/uipc_socket.c projects/altix/sys/kern/uipc_syscalls.c projects/altix/sys/kern/vfs_aio.c projects/altix/sys/kern/vfs_cache.c projects/altix/sys/kern/vfs_default.c projects/altix/sys/kern/vfs_lookup.c projects/altix/sys/kern/vfs_mount.c projects/altix/sys/kern/vfs_subr.c projects/altix/sys/kern/vfs_syscalls.c projects/altix/sys/mips/adm5120/obio.c projects/altix/sys/mips/alchemy/obio.c projects/altix/sys/mips/atheros/apb.c projects/altix/sys/mips/atheros/ar71xx_machdep.c projects/altix/sys/mips/atheros/ar71xx_pci.c projects/altix/sys/mips/atheros/ar71xx_wdog.c projects/altix/sys/mips/atheros/ar71xxreg.h projects/altix/sys/mips/atheros/files.ar71xx projects/altix/sys/mips/atheros/if_arge.c projects/altix/sys/mips/atheros/if_argevar.h projects/altix/sys/mips/atheros/uart_bus_ar71xx.c projects/altix/sys/mips/atheros/uart_cpu_ar71xx.c projects/altix/sys/mips/cavium/ciu.c projects/altix/sys/mips/cavium/files.octeon1 projects/altix/sys/mips/cavium/obio.c projects/altix/sys/mips/cavium/octe/cavium-ethernet.h projects/altix/sys/mips/cavium/octe/ethernet-common.c projects/altix/sys/mips/cavium/octe/ethernet-headers.h projects/altix/sys/mips/cavium/octe/ethernet-mdio.c projects/altix/sys/mips/cavium/octe/ethernet-rgmii.c projects/altix/sys/mips/cavium/octe/ethernet-rx.c projects/altix/sys/mips/cavium/octe/ethernet-sgmii.c projects/altix/sys/mips/cavium/octe/ethernet-tx.c projects/altix/sys/mips/cavium/octe/ethernet-xaui.c projects/altix/sys/mips/cavium/octe/ethernet.c projects/altix/sys/mips/cavium/octe/octe.c projects/altix/sys/mips/cavium/octeon_machdep.c projects/altix/sys/mips/cavium/octeon_mp.c projects/altix/sys/mips/cavium/octopci.c projects/altix/sys/mips/cavium/octopcireg.h projects/altix/sys/mips/cavium/std.octeon1 projects/altix/sys/mips/cavium/uart_bus_octeonusart.c projects/altix/sys/mips/cavium/uart_cpu_octeonusart.c projects/altix/sys/mips/cavium/uart_dev_oct16550.c projects/altix/sys/mips/cavium/usb/octusb.c projects/altix/sys/mips/conf/AR71XX projects/altix/sys/mips/conf/AR71XX.hints projects/altix/sys/mips/conf/MALTA64 projects/altix/sys/mips/conf/OCTEON1 projects/altix/sys/mips/conf/SWARM projects/altix/sys/mips/conf/SWARM_SMP projects/altix/sys/mips/idt/if_kr.c projects/altix/sys/mips/idt/obio.c projects/altix/sys/mips/include/atomic.h projects/altix/sys/mips/include/cpufunc.h projects/altix/sys/mips/include/cpuregs.h projects/altix/sys/mips/include/elf.h projects/altix/sys/mips/include/locore.h projects/altix/sys/mips/include/md_var.h projects/altix/sys/mips/include/memdev.h projects/altix/sys/mips/include/pcb.h projects/altix/sys/mips/include/pmap.h projects/altix/sys/mips/include/pte.h projects/altix/sys/mips/include/regnum.h projects/altix/sys/mips/include/smp.h projects/altix/sys/mips/include/ucontext.h projects/altix/sys/mips/include/vmparam.h projects/altix/sys/mips/mips/busdma_machdep.c projects/altix/sys/mips/mips/exception.S projects/altix/sys/mips/mips/locore.S projects/altix/sys/mips/mips/machdep.c projects/altix/sys/mips/mips/mainbus.c projects/altix/sys/mips/mips/mp_machdep.c projects/altix/sys/mips/mips/nexus.c projects/altix/sys/mips/mips/pmap.c projects/altix/sys/mips/mips/trap.c projects/altix/sys/mips/rmi/board.c projects/altix/sys/mips/rmi/board.h projects/altix/sys/mips/rmi/dev/sec/desc.h projects/altix/sys/mips/rmi/dev/sec/rmilib.c projects/altix/sys/mips/rmi/dev/sec/rmilib.h projects/altix/sys/mips/rmi/dev/sec/rmisec.c projects/altix/sys/mips/rmi/dev/xlr/rge.c projects/altix/sys/mips/rmi/dev/xlr/rge.h projects/altix/sys/mips/rmi/files.xlr projects/altix/sys/mips/rmi/interrupt.h projects/altix/sys/mips/rmi/intr_machdep.c projects/altix/sys/mips/rmi/iodi.c projects/altix/sys/mips/rmi/iomap.h projects/altix/sys/mips/rmi/msgring.h projects/altix/sys/mips/rmi/pic.h projects/altix/sys/mips/rmi/rmi_mips_exts.h projects/altix/sys/mips/rmi/tick.c projects/altix/sys/mips/rmi/xlr_machdep.c projects/altix/sys/mips/rmi/xlr_pci.c projects/altix/sys/mips/sibyte/sb_machdep.c projects/altix/sys/mips/sibyte/sb_zbbus.c projects/altix/sys/mips/sibyte/sb_zbpci.c projects/altix/sys/modules/Makefile projects/altix/sys/modules/aac/Makefile projects/altix/sys/modules/acpi/acpi/Makefile projects/altix/sys/modules/agp/Makefile projects/altix/sys/modules/amr/Makefile projects/altix/sys/modules/asr/Makefile projects/altix/sys/modules/bge/Makefile projects/altix/sys/modules/cpufreq/Makefile projects/altix/sys/modules/crypto/Makefile projects/altix/sys/modules/cryptodev/Makefile projects/altix/sys/modules/cxgb/Makefile projects/altix/sys/modules/cyclic/Makefile projects/altix/sys/modules/dtrace/Makefile projects/altix/sys/modules/dtrace/Makefile.inc projects/altix/sys/modules/dtrace/dtrace/Makefile projects/altix/sys/modules/dtrace/dtraceall/dtraceall.c projects/altix/sys/modules/dtrace/fasttrap/Makefile projects/altix/sys/modules/em/Makefile projects/altix/sys/modules/gem/Makefile projects/altix/sys/modules/hptmv/Makefile projects/altix/sys/modules/hptrr/Makefile projects/altix/sys/modules/hwpmc/Makefile projects/altix/sys/modules/i2c/controllers/pcf/Makefile projects/altix/sys/modules/igb/Makefile projects/altix/sys/modules/io/Makefile projects/altix/sys/modules/ixgbe/Makefile projects/altix/sys/modules/krpc/Makefile projects/altix/sys/modules/le/Makefile projects/altix/sys/modules/linprocfs/Makefile projects/altix/sys/modules/linsysfs/Makefile projects/altix/sys/modules/linux/Makefile projects/altix/sys/modules/mem/Makefile projects/altix/sys/modules/mfi/Makefile projects/altix/sys/modules/mii/Makefile projects/altix/sys/modules/ndis/Makefile projects/altix/sys/modules/opensolaris/Makefile projects/altix/sys/modules/ppc/Makefile projects/altix/sys/modules/procfs/Makefile projects/altix/sys/modules/scc/Makefile projects/altix/sys/modules/smbfs/Makefile projects/altix/sys/modules/sound/driver/Makefile projects/altix/sys/modules/sound/sound/Makefile projects/altix/sys/modules/svr4/Makefile projects/altix/sys/modules/syscons/Makefile projects/altix/sys/modules/sysvipc/sysvmsg/Makefile projects/altix/sys/modules/sysvipc/sysvsem/Makefile projects/altix/sys/modules/uart/Makefile projects/altix/sys/modules/usb/Makefile projects/altix/sys/modules/vx/Makefile projects/altix/sys/modules/wlan/Makefile projects/altix/sys/modules/zfs/Makefile projects/altix/sys/net/bpf.c projects/altix/sys/net/if.c projects/altix/sys/net/if.h projects/altix/sys/net/if_epair.c projects/altix/sys/net/if_lagg.c projects/altix/sys/net/if_llatbl.c projects/altix/sys/net/if_llatbl.h projects/altix/sys/net/if_tap.c projects/altix/sys/net/if_tun.c projects/altix/sys/net/rtsock.c projects/altix/sys/net/vnet.c projects/altix/sys/net80211/ieee80211_node.c projects/altix/sys/net80211/ieee80211_ratectl.c projects/altix/sys/net80211/ieee80211_ratectl.h projects/altix/sys/net80211/ieee80211_scan_sta.c projects/altix/sys/netgraph/ng_UI.c projects/altix/sys/netgraph/ng_async.c projects/altix/sys/netgraph/ng_frame_relay.c projects/altix/sys/netgraph/ng_gif_demux.c projects/altix/sys/netgraph/ng_iface.c projects/altix/sys/netgraph/ng_rfc1490.c projects/altix/sys/netgraph/ng_socket.c projects/altix/sys/netgraph/ng_tty.c projects/altix/sys/netinet/igmp.c projects/altix/sys/netinet/in.c projects/altix/sys/netinet/in.h projects/altix/sys/netinet/in_rmx.c projects/altix/sys/netinet/ip_carp.c projects/altix/sys/netinet/ip_divert.c projects/altix/sys/netinet/ip_input.c projects/altix/sys/netinet/ip_ipsec.c projects/altix/sys/netinet/ip_options.c projects/altix/sys/netinet/ip_output.c projects/altix/sys/netinet/ip_var.h projects/altix/sys/netinet/ipfw/dn_sched.h projects/altix/sys/netinet/ipfw/dn_sched_qfq.c projects/altix/sys/netinet/ipfw/dn_sched_wf2q.c projects/altix/sys/netinet/ipfw/ip_dn_glue.c projects/altix/sys/netinet/ipfw/ip_dn_io.c projects/altix/sys/netinet/ipfw/ip_dn_private.h projects/altix/sys/netinet/ipfw/ip_dummynet.c projects/altix/sys/netinet/ipfw/ip_fw_log.c projects/altix/sys/netinet/ipfw/ip_fw_nat.c projects/altix/sys/netinet/ipfw/ip_fw_pfil.c projects/altix/sys/netinet/libalias/libalias.3 projects/altix/sys/netinet/raw_ip.c projects/altix/sys/netinet/sctp.h projects/altix/sys/netinet/sctp_asconf.c projects/altix/sys/netinet/sctp_asconf.h projects/altix/sys/netinet/sctp_auth.c projects/altix/sys/netinet/sctp_bsd_addr.c projects/altix/sys/netinet/sctp_cc_functions.c projects/altix/sys/netinet/sctp_constants.h projects/altix/sys/netinet/sctp_crc32.c projects/altix/sys/netinet/sctp_crc32.h projects/altix/sys/netinet/sctp_indata.c projects/altix/sys/netinet/sctp_input.c projects/altix/sys/netinet/sctp_os_bsd.h projects/altix/sys/netinet/sctp_output.c projects/altix/sys/netinet/sctp_output.h projects/altix/sys/netinet/sctp_pcb.c projects/altix/sys/netinet/sctp_pcb.h projects/altix/sys/netinet/sctp_peeloff.c projects/altix/sys/netinet/sctp_sysctl.c projects/altix/sys/netinet/sctp_sysctl.h projects/altix/sys/netinet/sctp_timer.c projects/altix/sys/netinet/sctp_uio.h projects/altix/sys/netinet/sctp_usrreq.c projects/altix/sys/netinet/sctputil.c projects/altix/sys/netinet/siftr.c projects/altix/sys/netinet/tcp.h projects/altix/sys/netinet/tcp_input.c projects/altix/sys/netinet/tcp_output.c projects/altix/sys/netinet/tcp_reass.c projects/altix/sys/netinet/tcp_subr.c projects/altix/sys/netinet/tcp_timer.h projects/altix/sys/netinet/tcp_usrreq.c projects/altix/sys/netinet/tcp_var.h projects/altix/sys/netinet/udp_usrreq.c projects/altix/sys/netinet6/icmp6.c projects/altix/sys/netinet6/in6_cksum.c projects/altix/sys/netinet6/in6_rmx.c projects/altix/sys/netinet6/ip6_input.c projects/altix/sys/netinet6/ip6_ipsec.c projects/altix/sys/netinet6/ip6_output.c projects/altix/sys/netinet6/ip6_var.h projects/altix/sys/netinet6/nd6.c projects/altix/sys/netinet6/nd6_nbr.c projects/altix/sys/netinet6/raw_ip6.c projects/altix/sys/netinet6/sctp6_usrreq.c projects/altix/sys/netipsec/ipsec_output.c projects/altix/sys/netipsec/key.c projects/altix/sys/netipsec/keydb.h projects/altix/sys/nfs/nfs_lock.c projects/altix/sys/nfs/nfs_lock.h projects/altix/sys/nfsclient/nfs.h projects/altix/sys/nfsclient/nfs_bio.c projects/altix/sys/nfsclient/nfs_diskless.c projects/altix/sys/nfsclient/nfs_nfsiod.c projects/altix/sys/nfsclient/nfs_node.c projects/altix/sys/nfsclient/nfs_subs.c projects/altix/sys/nfsclient/nfs_vfsops.c projects/altix/sys/nfsclient/nfs_vnops.c projects/altix/sys/nfsclient/nfsmount.h projects/altix/sys/nfsclient/nfsnode.h projects/altix/sys/nfsserver/nfs_serv.c projects/altix/sys/nlm/nlm_advlock.c projects/altix/sys/nlm/nlm_prot_impl.c projects/altix/sys/opencrypto/cryptodev.c projects/altix/sys/opencrypto/cryptodev.h projects/altix/sys/opencrypto/cryptosoft.c projects/altix/sys/opencrypto/deflate.c projects/altix/sys/opencrypto/xform.c projects/altix/sys/opencrypto/xform.h projects/altix/sys/pc98/conf/GENERIC projects/altix/sys/pc98/pc98/canbus.c projects/altix/sys/pc98/pc98/machdep.c projects/altix/sys/pci/if_rl.c projects/altix/sys/powerpc/aim/clock.c projects/altix/sys/powerpc/aim/copyinout.c projects/altix/sys/powerpc/aim/interrupt.c projects/altix/sys/powerpc/aim/machdep.c projects/altix/sys/powerpc/aim/mmu_oea.c projects/altix/sys/powerpc/aim/mmu_oea64.c projects/altix/sys/powerpc/aim/nexus.c projects/altix/sys/powerpc/aim/ofw_machdep.c projects/altix/sys/powerpc/aim/slb.c projects/altix/sys/powerpc/aim/trap.c projects/altix/sys/powerpc/aim/trap_subr64.S projects/altix/sys/powerpc/aim/vm_machdep.c projects/altix/sys/powerpc/booke/clock.c projects/altix/sys/powerpc/booke/interrupt.c projects/altix/sys/powerpc/booke/machdep.c projects/altix/sys/powerpc/booke/platform_bare.c projects/altix/sys/powerpc/booke/pmap.c projects/altix/sys/powerpc/booke/trap.c projects/altix/sys/powerpc/conf/GENERIC projects/altix/sys/powerpc/conf/GENERIC64 projects/altix/sys/powerpc/conf/Makefile projects/altix/sys/powerpc/conf/NOTES projects/altix/sys/powerpc/include/altivec.h projects/altix/sys/powerpc/include/elf.h projects/altix/sys/powerpc/include/intr_machdep.h projects/altix/sys/powerpc/include/md_var.h projects/altix/sys/powerpc/include/memdev.h projects/altix/sys/powerpc/include/mmuvar.h projects/altix/sys/powerpc/include/ofw_machdep.h projects/altix/sys/powerpc/include/param.h projects/altix/sys/powerpc/include/pcb.h projects/altix/sys/powerpc/include/pcpu.h projects/altix/sys/powerpc/include/pmap.h projects/altix/sys/powerpc/include/smp.h projects/altix/sys/powerpc/include/sr.h projects/altix/sys/powerpc/include/trap_aim.h projects/altix/sys/powerpc/include/vm.h projects/altix/sys/powerpc/mpc85xx/mpc85xx.c projects/altix/sys/powerpc/ofw/ofw_real.c projects/altix/sys/powerpc/ofw/ofw_syscons.c projects/altix/sys/powerpc/powermac/ata_kauai.c projects/altix/sys/powerpc/powermac/cuda.c projects/altix/sys/powerpc/powermac/kiic.c projects/altix/sys/powerpc/powermac/pmu.c projects/altix/sys/powerpc/powermac/smu.c projects/altix/sys/powerpc/powerpc/bus_machdep.c projects/altix/sys/powerpc/powerpc/busdma_machdep.c projects/altix/sys/powerpc/powerpc/exec_machdep.c projects/altix/sys/powerpc/powerpc/intr_machdep.c projects/altix/sys/powerpc/powerpc/mem.c projects/altix/sys/powerpc/powerpc/mmu_if.m projects/altix/sys/powerpc/powerpc/mp_machdep.c projects/altix/sys/powerpc/powerpc/platform.c projects/altix/sys/powerpc/powerpc/platform_if.m projects/altix/sys/powerpc/powerpc/pmap_dispatch.c projects/altix/sys/rpc/clnt_dg.c projects/altix/sys/rpc/clnt_vc.c projects/altix/sys/rpc/replay.c projects/altix/sys/rpc/rpc_com.h projects/altix/sys/rpc/rpc_generic.c projects/altix/sys/security/audit/audit_bsm_klib.c projects/altix/sys/security/mac/mac_framework.c projects/altix/sys/security/mac/mac_internal.h projects/altix/sys/security/mac/mac_vfs.c projects/altix/sys/sparc64/conf/GENERIC projects/altix/sys/sparc64/include/asm.h projects/altix/sys/sparc64/include/elf.h projects/altix/sys/sparc64/include/endian.h projects/altix/sys/sparc64/include/intr_machdep.h projects/altix/sys/sparc64/include/md_var.h projects/altix/sys/sparc64/include/smp.h projects/altix/sys/sparc64/include/tick.h projects/altix/sys/sparc64/pci/schizo.c projects/altix/sys/sparc64/sparc64/bus_machdep.c projects/altix/sys/sparc64/sparc64/elf_machdep.c projects/altix/sys/sparc64/sparc64/intr_machdep.c projects/altix/sys/sparc64/sparc64/iommu.c projects/altix/sys/sparc64/sparc64/machdep.c projects/altix/sys/sparc64/sparc64/mp_machdep.c projects/altix/sys/sparc64/sparc64/nexus.c projects/altix/sys/sparc64/sparc64/pmap.c projects/altix/sys/sparc64/sparc64/support.S projects/altix/sys/sparc64/sparc64/tick.c projects/altix/sys/sparc64/sparc64/trap.c projects/altix/sys/sparc64/sparc64/vm_machdep.c projects/altix/sys/sun4v/conf/GENERIC projects/altix/sys/sun4v/include/elf.h projects/altix/sys/sun4v/include/endian.h projects/altix/sys/sun4v/include/intr_machdep.h projects/altix/sys/sun4v/include/smp.h projects/altix/sys/sun4v/sun4v/bus_machdep.c projects/altix/sys/sun4v/sun4v/hviommu.c projects/altix/sys/sun4v/sun4v/intr_machdep.c projects/altix/sys/sun4v/sun4v/mp_machdep.c projects/altix/sys/sun4v/sun4v/nexus.c projects/altix/sys/sun4v/sun4v/trap.c projects/altix/sys/sun4v/sun4v/vnex.c projects/altix/sys/sys/_rmlock.h projects/altix/sys/sys/_task.h projects/altix/sys/sys/acl.h projects/altix/sys/sys/bio.h projects/altix/sys/sys/bus.h projects/altix/sys/sys/callout.h projects/altix/sys/sys/cdefs.h projects/altix/sys/sys/conf.h projects/altix/sys/sys/copyright.h projects/altix/sys/sys/disklabel.h projects/altix/sys/sys/dtrace_bsd.h projects/altix/sys/sys/elf_common.h projects/altix/sys/sys/exec.h projects/altix/sys/sys/gpt.h projects/altix/sys/sys/imgact.h projects/altix/sys/sys/ktrace.h projects/altix/sys/sys/link_elf.h projects/altix/sys/sys/lock.h projects/altix/sys/sys/lockmgr.h projects/altix/sys/sys/mbuf.h projects/altix/sys/sys/mman.h projects/altix/sys/sys/module.h projects/altix/sys/sys/mount.h projects/altix/sys/sys/mutex.h projects/altix/sys/sys/param.h projects/altix/sys/sys/pcpu.h projects/altix/sys/sys/proc.h projects/altix/sys/sys/rmlock.h projects/altix/sys/sys/sbuf.h projects/altix/sys/sys/sched.h projects/altix/sys/sys/sdt.h projects/altix/sys/sys/signal.h projects/altix/sys/sys/signalvar.h projects/altix/sys/sys/socketvar.h projects/altix/sys/sys/sockio.h projects/altix/sys/sys/syscall.h projects/altix/sys/sys/syscall.mk projects/altix/sys/sys/sysctl.h projects/altix/sys/sys/sysent.h projects/altix/sys/sys/sysproto.h projects/altix/sys/sys/systm.h projects/altix/sys/sys/taskqueue.h projects/altix/sys/sys/time.h projects/altix/sys/sys/timeet.h projects/altix/sys/sys/timetc.h projects/altix/sys/sys/unistd.h projects/altix/sys/sys/user.h projects/altix/sys/sys/vnode.h projects/altix/sys/tools/vnode_if.awk projects/altix/sys/ufs/ffs/ffs_softdep.c projects/altix/sys/ufs/ffs/ffs_vfsops.c projects/altix/sys/ufs/ffs/fs.h projects/altix/sys/ufs/ffs/softdep.h projects/altix/sys/ufs/ufs/ufsmount.h projects/altix/sys/vm/memguard.c projects/altix/sys/vm/memguard.h projects/altix/sys/vm/swap_pager.c projects/altix/sys/vm/uma.h projects/altix/sys/vm/uma_core.c projects/altix/sys/vm/vm_kern.c projects/altix/sys/vm/vm_map.c projects/altix/sys/vm/vm_map.h projects/altix/sys/vm/vm_mmap.c projects/altix/sys/vm/vm_page.c projects/altix/sys/vm/vm_pageout.c projects/altix/sys/vm/vm_phys.c projects/altix/sys/vm/vm_reserv.c projects/altix/sys/x86/cpufreq/est.c projects/altix/sys/x86/isa/atrtc.c projects/altix/sys/x86/isa/clock.c projects/altix/sys/x86/x86/local_apic.c projects/altix/sys/xen/evtchn/evtchn.c projects/altix/sys/xen/gnttab.c projects/altix/sys/xen/gnttab.h projects/altix/sys/xen/interface/grant_table.h projects/altix/sys/xen/interface/hvm/params.h projects/altix/sys/xen/interface/io/blkif.h projects/altix/sys/xen/interface/io/protocols.h projects/altix/sys/xen/interface/io/ring.h projects/altix/sys/xen/interface/io/xenbus.h projects/altix/sys/xen/xen_intr.h projects/altix/sys/xen/xenbus/xenbus_if.m projects/altix/sys/xen/xenbus/xenbusvar.h Directory Properties: projects/altix/lib/libstand/ (props changed) projects/altix/sys/ (props changed) projects/altix/sys/amd64/include/xen/ (props changed) projects/altix/sys/cddl/contrib/opensolaris/ (props changed) projects/altix/sys/contrib/dev/acpica/ (props changed) projects/altix/sys/contrib/x86emu/ (props changed) projects/altix/sys/dev/usb/controller/ (props changed) projects/altix/sys/dev/xen/xenpci/ (props changed) Modified: projects/altix/lib/libstand/Makefile ============================================================================== --- projects/altix/lib/libstand/Makefile Tue Oct 26 01:20:30 2010 (r214368) +++ projects/altix/lib/libstand/Makefile Tue Oct 26 02:34:47 2010 (r214369) @@ -20,23 +20,23 @@ WARNS?= 0 CFLAGS+= -ffreestanding -Wformat CFLAGS+= -I${.CURDIR} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -mpreferred-stack-boundary=2 CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" CFLAGS+= -mno-sse3 .endif .if ${MACHINE} == "pc98" CFLAGS+= -Os .endif -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" +.if ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -msoft-float -D_STANDALONE -DNETIF_DEBUG .endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" CFLAGS+= -m32 -I. .endif -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" CFLAGS+= -msoft-float -D_STANDALONE .endif @@ -54,19 +54,19 @@ SRCS+= ntoh.c # string functions from libc .PATH: ${.CURDIR}/../libc/string -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "sparc64" || \ - ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "powerpc" || \ + ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "arm" SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ memcpy.c memmove.c memset.c qdivrem.c rindex.c strcat.c strchr.c \ strcmp.c strcpy.c strcspn.c strlen.c strncat.c strncmp.c strncpy.c \ strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c .endif -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" .PATH: ${.CURDIR}/../libc/arm/gen SRCS+= divsi3.S .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" .PATH: ${.CURDIR}/../libc/ia64/string SRCS+= bcmp.c bcopy.S bzero.S ffs.S index.c memccpy.c memchr.c memcmp.c \ memcpy.S memmove.S memset.c rindex.c strcat.c strchr.c \ @@ -78,7 +78,7 @@ SRCS+= bcmp.c bcopy.S bzero.S ffs.S inde SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S .endif -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" +.if ${MACHINE_CPUARCH} == "powerpc" .PATH: ${.CURDIR}/../libc/quad SRCS+= ashldi3.c ashrdi3.c .PATH: ${.CURDIR}/../libc/powerpc/gen @@ -90,12 +90,12 @@ SRCS+= syncicache.c SRCS+= uuid_equal.c uuid_is_nil.c # _setjmp/_longjmp -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" .PATH: ${.CURDIR}/i386 .elif ${MACHINE_ARCH} == "powerpc64" .PATH: ${.CURDIR}/powerpc .else -.PATH: ${.CURDIR}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/${MACHINE_CPUARCH} .endif SRCS+= _setjmp.S @@ -157,7 +157,7 @@ SRCS+= splitfs.c .include -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine cleandepend: cleanmachine cleanmachine: Modified: projects/altix/lib/libstand/libstand.3 ============================================================================== --- projects/altix/lib/libstand/libstand.3 Tue Oct 26 01:20:30 2010 (r214368) +++ projects/altix/lib/libstand/libstand.3 Tue Oct 26 02:34:47 2010 (r214369) @@ -270,7 +270,6 @@ The .Li b conversion is provided to decode error registers. Its usage is: -.Pp .Bd -ragged -offset indent printf( .Qq reg=%b\en , @@ -285,7 +284,6 @@ Each is a sequence of characters, which gives the bit number to be inspected (origin 1) and the next characters (up to a character less than 32) give the text to be displayed if the bit is set. Thus -.Pp .Bd -ragged -offset indent printf( .Qq reg=%b\en , @@ -295,7 +293,6 @@ printf( .Ed .Pp would give the output -.Pp .Bd -ragged -offset indent reg=3 .Ed @@ -303,7 +300,6 @@ reg=3 The .Li D conversion provides a hexdump facility, e.g. -.Pp .Bd -ragged -offset indent printf( .Qq %6D , Modified: projects/altix/lib/libstand/net.h ============================================================================== --- projects/altix/lib/libstand/net.h Tue Oct 26 01:20:30 2010 (r214368) +++ projects/altix/lib/libstand/net.h Tue Oct 26 02:34:47 2010 (r214369) @@ -50,7 +50,7 @@ #define MACPY(s, d) bcopy((char *)s, (char *)d, 6) -#define MAXTMO 20 /* seconds */ +#define MAXTMO 120 /* seconds */ #define MINTMO 2 /* seconds */ #define FNAME_SIZE 128 Modified: projects/altix/lib/libstand/nfs.c ============================================================================== --- projects/altix/lib/libstand/nfs.c Tue Oct 26 01:20:30 2010 (r214368) +++ projects/altix/lib/libstand/nfs.c Tue Oct 26 02:34:47 2010 (r214369) @@ -50,7 +50,10 @@ __FBSDID("$FreeBSD$"); #define NFS_DEBUGxx +#define NFSREAD_SIZE 1024 + /* Define our own NFS attributes without NQNFS stuff. */ +#ifdef OLD_NFSV2 struct nfsv2_fattrs { n_long fa_type; n_long fa_mode; @@ -68,7 +71,6 @@ struct nfsv2_fattrs { struct nfsv2_time fa_ctime; }; - struct nfs_read_args { u_char fh[NFS_FHSIZE]; n_long off; @@ -77,7 +79,6 @@ struct nfs_read_args { }; /* Data part of nfs rpc reply (also the largest thing we receive) */ -#define NFSREAD_SIZE 1024 struct nfs_read_repl { n_long errno; struct nfsv2_fattrs fa; @@ -116,6 +117,72 @@ struct nfs_iodesc { u_char fh[NFS_FHSIZE]; struct nfsv2_fattrs fa; /* all in network order */ }; +#else /* !OLD_NFSV2 */ + +/* NFSv3 definitions */ +#define NFS_V3MAXFHSIZE 64 +#define NFS_VER3 3 +#define RPCMNT_VER3 3 +#define NFSPROCV3_LOOKUP 3 +#define NFSPROCV3_READLINK 5 +#define NFSPROCV3_READ 6 +#define NFSPROCV3_READDIR 16 + +typedef struct { + uint32_t val[2]; +} n_quad; + +struct nfsv3_time { + uint32_t nfs_sec; + uint32_t nfs_nsec; +}; + +struct nfsv3_fattrs { + uint32_t fa_type; + uint32_t fa_mode; + uint32_t fa_nlink; + uint32_t fa_uid; + uint32_t fa_gid; + n_quad fa_size; + n_quad fa_used; + n_quad fa_rdev; + n_quad fa_fsid; + n_quad fa_fileid; + struct nfsv3_time fa_atime; + struct nfsv3_time fa_mtime; + struct nfsv3_time fa_ctime; +}; + +/* + * For NFSv3, the file handle is variable in size, so most fixed sized + * structures for arguments won't work. For most cases, a structure + * that starts with any fixed size section is followed by an array + * that covers the maximum size required. + */ +struct nfsv3_readdir_repl { + uint32_t errno; + uint32_t ok; + struct nfsv3_fattrs fa; + uint32_t cookiev0; + uint32_t cookiev1; +}; + +struct nfsv3_readdir_entry { + uint32_t follows; + uint32_t fid0; + uint32_t fid1; + uint32_t len; + uint32_t nameplus[0]; +}; + +struct nfs_iodesc { + struct iodesc *iodesc; + off_t off; + uint32_t fhsize; + u_char fh[NFS_V3MAXFHSIZE]; + struct nfsv3_fattrs fa; /* all in network order */ +}; +#endif /* OLD_NFSV2 */ /* * XXX interactions with tftp? See nfswrapper.c for a confusing @@ -142,6 +209,7 @@ struct fs_ops nfs_fsops = { nfs_readdir }; +#ifdef OLD_NFSV2 /* * Fetch the root file handle (call mount daemon) * Return zero or error number. @@ -745,3 +813,675 @@ nfs_readdir(struct open_file *f, struct cookie = ntohl(roff->cookie); return 0; } +#else /* !OLD_NFSV2 */ +/* + * Fetch the root file handle (call mount daemon) + * Return zero or error number. + */ +int +nfs_getrootfh(struct iodesc *d, char *path, uint32_t *fhlenp, u_char *fhp) +{ + int len; + struct args { + uint32_t len; + char path[FNAME_SIZE]; + } *args; + struct repl { + uint32_t errno; + uint32_t fhsize; + u_char fh[NFS_V3MAXFHSIZE]; + uint32_t authcnt; + uint32_t auth[7]; + } *repl; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct args d; + } sdata; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct repl d; + } rdata; + size_t cc; + +#ifdef NFS_DEBUG + if (debug) + printf("nfs_getrootfh: %s\n", path); +#endif + + args = &sdata.d; + repl = &rdata.d; + + bzero(args, sizeof(*args)); + len = strlen(path); + if (len > sizeof(args->path)) + len = sizeof(args->path); + args->len = htonl(len); + bcopy(path, args->path, len); + len = sizeof(uint32_t) + roundup(len, sizeof(uint32_t)); + + cc = rpc_call(d, RPCPROG_MNT, RPCMNT_VER3, RPCMNT_MOUNT, + args, len, repl, sizeof(*repl)); + if (cc == -1) + /* errno was set by rpc_call */ + return (errno); + if (cc < 2 * sizeof (uint32_t)) + return (EBADRPC); + if (repl->errno != 0) + return (ntohl(repl->errno)); + *fhlenp = ntohl(repl->fhsize); + bcopy(repl->fh, fhp, *fhlenp); + return (0); +} + +/* + * Lookup a file. Store handle and attributes. + * Return zero or error number. + */ +int +nfs_lookupfh(struct nfs_iodesc *d, const char *name, struct nfs_iodesc *newfd) +{ + int len, rlen, pos; + struct args { + uint32_t fhsize; + uint32_t fhplusname[1 + + (NFS_V3MAXFHSIZE + FNAME_SIZE) / sizeof(uint32_t)]; + } *args; + struct repl { + uint32_t errno; + uint32_t fhsize; + uint32_t fhplusattr[(NFS_V3MAXFHSIZE + + 2 * (sizeof(uint32_t) + + sizeof(struct nfsv3_fattrs))) / sizeof(uint32_t)]; + } *repl; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct args d; + } sdata; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct repl d; + } rdata; + ssize_t cc; + +#ifdef NFS_DEBUG + if (debug) + printf("lookupfh: called\n"); +#endif + + args = &sdata.d; + repl = &rdata.d; + + bzero(args, sizeof(*args)); + args->fhsize = htonl(d->fhsize); + bcopy(d->fh, args->fhplusname, d->fhsize); + len = strlen(name); + if (len > FNAME_SIZE) + len = FNAME_SIZE; + pos = roundup(d->fhsize, sizeof(uint32_t)) / sizeof(uint32_t); + args->fhplusname[pos++] = htonl(len); + bcopy(name, &args->fhplusname[pos], len); + len = sizeof(uint32_t) + pos * sizeof(uint32_t) + + roundup(len, sizeof(uint32_t)); + + rlen = sizeof(*repl); + + cc = rpc_call(d->iodesc, NFS_PROG, NFS_VER3, NFSPROCV3_LOOKUP, + args, len, repl, rlen); + if (cc == -1) + return (errno); /* XXX - from rpc_call */ + if (cc < 2 * sizeof(uint32_t)) + return (EIO); + if (repl->errno != 0) + /* saerrno.h now matches NFS error numbers. */ + return (ntohl(repl->errno)); + newfd->fhsize = ntohl(repl->fhsize); + bcopy(repl->fhplusattr, &newfd->fh, newfd->fhsize); + pos = roundup(newfd->fhsize, sizeof(uint32_t)) / sizeof(uint32_t); + if (repl->fhplusattr[pos++] == 0) + return (EIO); + bcopy(&repl->fhplusattr[pos], &newfd->fa, sizeof(newfd->fa)); + return (0); +} + +#ifndef NFS_NOSYMLINK +/* + * Get the destination of a symbolic link. + */ +int +nfs_readlink(struct nfs_iodesc *d, char *buf) +{ + struct args { + uint32_t fhsize; + u_char fh[NFS_V3MAXFHSIZE]; + } *args; + struct repl { + uint32_t errno; + uint32_t ok; + struct nfsv3_fattrs fa; + uint32_t len; + u_char path[NFS_MAXPATHLEN]; + } *repl; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct args d; + } sdata; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct repl d; + } rdata; + ssize_t cc; + +#ifdef NFS_DEBUG + if (debug) + printf("readlink: called\n"); +#endif + + args = &sdata.d; + repl = &rdata.d; + + bzero(args, sizeof(*args)); + args->fhsize = htonl(d->fhsize); + bcopy(d->fh, args->fh, d->fhsize); + cc = rpc_call(d->iodesc, NFS_PROG, NFS_VER3, NFSPROCV3_READLINK, + args, sizeof(uint32_t) + roundup(d->fhsize, sizeof(uint32_t)), + repl, sizeof(*repl)); + if (cc == -1) + return (errno); + + if (cc < 2 * sizeof(uint32_t)) + return (EIO); + + if (repl->errno != 0) + return (ntohl(repl->errno)); + + if (repl->ok == 0) + return (EIO); + + repl->len = ntohl(repl->len); + if (repl->len > NFS_MAXPATHLEN) + return (ENAMETOOLONG); + + bcopy(repl->path, buf, repl->len); + buf[repl->len] = 0; + return (0); +} +#endif + +/* + * Read data from a file. + * Return transfer count or -1 (and set errno) + */ +ssize_t +nfs_readdata(struct nfs_iodesc *d, off_t off, void *addr, size_t len) +{ + struct args { + uint32_t fhsize; + uint32_t fhoffcnt[NFS_V3MAXFHSIZE / sizeof(uint32_t) + 3]; + } *args; + struct repl { + uint32_t errno; + uint32_t ok; + struct nfsv3_fattrs fa; + uint32_t count; + uint32_t eof; + uint32_t len; + u_char data[NFSREAD_SIZE]; + } *repl; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct args d; + } sdata; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct repl d; + } rdata; + size_t cc; + long x; + int hlen, rlen, pos; + + args = &sdata.d; + repl = &rdata.d; + + bzero(args, sizeof(*args)); + args->fhsize = htonl(d->fhsize); + bcopy(d->fh, args->fhoffcnt, d->fhsize); + pos = roundup(d->fhsize, sizeof(uint32_t)) / sizeof(uint32_t); + args->fhoffcnt[pos++] = 0; + args->fhoffcnt[pos++] = htonl((uint32_t)off); + if (len > NFSREAD_SIZE) + len = NFSREAD_SIZE; + args->fhoffcnt[pos] = htonl((uint32_t)len); + hlen = sizeof(*repl) - NFSREAD_SIZE; + + cc = rpc_call(d->iodesc, NFS_PROG, NFS_VER3, NFSPROCV3_READ, + args, 4 * sizeof(uint32_t) + roundup(d->fhsize, sizeof(uint32_t)), + repl, sizeof(*repl)); + if (cc == -1) + /* errno was already set by rpc_call */ + return (-1); + if (cc < hlen) { + errno = EBADRPC; + return (-1); + } + if (repl->errno != 0) { + errno = ntohl(repl->errno); + return (-1); + } + rlen = cc - hlen; + x = ntohl(repl->count); + if (rlen < x) { + printf("nfsread: short packet, %d < %ld\n", rlen, x); + errno = EBADRPC; + return (-1); + } + bcopy(repl->data, addr, x); + return (x); +} + +/* + * Open a file. + * return zero or error number + */ +int +nfs_open(const char *upath, struct open_file *f) +{ + struct iodesc *desc; + struct nfs_iodesc *currfd; + char buf[2 * NFS_V3MAXFHSIZE + 3]; + u_char *fh; + char *cp; + int i; +#ifndef NFS_NOSYMLINK + struct nfs_iodesc *newfd; + struct nfsv3_fattrs *fa; + char *ncp; + int c; + char namebuf[NFS_MAXPATHLEN + 1]; + char linkbuf[NFS_MAXPATHLEN + 1]; + int nlinks = 0; +#endif + int error; + char *path; + +#ifdef NFS_DEBUG + if (debug) + printf("nfs_open: %s (rootpath=%s)\n", upath, rootpath); +#endif + if (!rootpath[0]) { + printf("no rootpath, no nfs\n"); + return (ENXIO); + } + + /* + * This is silly - we should look at dv_type but that value is + * arch dependant and we can't use it here. + */ +#ifndef __i386__ + if (strcmp(f->f_dev->dv_name, "net") != 0) + return (EINVAL); +#else + if (strcmp(f->f_dev->dv_name, "pxe") != 0) + return (EINVAL); +#endif + + if (!(desc = socktodesc(*(int *)(f->f_devdata)))) + return (EINVAL); + + /* Bind to a reserved port. */ + desc->myport = htons(--rpc_port); + desc->destip = rootip; + if ((error = nfs_getrootfh(desc, rootpath, &nfs_root_node.fhsize, + nfs_root_node.fh))) + return (error); + nfs_root_node.iodesc = desc; + + fh = &nfs_root_node.fh[0]; + buf[0] = 'X'; + cp = &buf[1]; + for (i = 0; i < nfs_root_node.fhsize; i++, cp += 2) + sprintf(cp, "%02x", fh[i]); + sprintf(cp, "X"); + setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); + setenv("boot.nfsroot.path", rootpath, 1); + setenv("boot.nfsroot.nfshandle", buf, 1); + sprintf(buf, "%d", nfs_root_node.fhsize); + setenv("boot.nfsroot.nfshandlelen", buf, 1); + +#ifndef NFS_NOSYMLINK + /* Fake up attributes for the root dir. */ + fa = &nfs_root_node.fa; + fa->fa_type = htonl(NFDIR); + fa->fa_mode = htonl(0755); + fa->fa_nlink = htonl(2); + + currfd = &nfs_root_node; + newfd = 0; + + cp = path = strdup(upath); + if (path == NULL) { + error = ENOMEM; + goto out; + } + while (*cp) { + /* + * Remove extra separators + */ + while (*cp == '/') + cp++; + + if (*cp == '\0') + break; + /* + * Check that current node is a directory. + */ + if (currfd->fa.fa_type != htonl(NFDIR)) { + error = ENOTDIR; + goto out; + } + + /* allocate file system specific data structure */ + newfd = malloc(sizeof(*newfd)); + if (newfd == NULL) { + error = ENOMEM; + goto out; + } + newfd->iodesc = currfd->iodesc; + newfd->off = 0; + + /* + * Get next component of path name. + */ + { + int len = 0; + + ncp = cp; + while ((c = *cp) != '\0' && c != '/') { + if (++len > NFS_MAXNAMLEN) { + error = ENOENT; + goto out; + } + cp++; + } + *cp = '\0'; + } + + /* lookup a file handle */ + error = nfs_lookupfh(currfd, ncp, newfd); + *cp = c; + if (error) + goto out; + + /* + * Check for symbolic link + */ + if (newfd->fa.fa_type == htonl(NFLNK)) { + int link_len, len; + + error = nfs_readlink(newfd, linkbuf); + if (error) + goto out; + + link_len = strlen(linkbuf); + len = strlen(cp); + + if (link_len + len > MAXPATHLEN + || ++nlinks > MAXSYMLINKS) { + error = ENOENT; + goto out; + } + + bcopy(cp, &namebuf[link_len], len + 1); + bcopy(linkbuf, namebuf, link_len); + + /* + * If absolute pathname, restart at root. + * If relative pathname, restart at parent directory. + */ + cp = namebuf; + if (*cp == '/') { + if (currfd != &nfs_root_node) + free(currfd); + currfd = &nfs_root_node; + } + + free(newfd); + newfd = 0; + + continue; + } + + if (currfd != &nfs_root_node) + free(currfd); + currfd = newfd; + newfd = 0; + } + + error = 0; + +out: + free(newfd); + free(path); +#else + /* allocate file system specific data structure */ + currfd = malloc(sizeof(*currfd)); + if (currfd != NULL) { + currfd->iodesc = desc; + currfd->off = 0; + + error = nfs_lookupfh(&nfs_root_node, upath, currfd); + } else + error = ENOMEM; +#endif + if (!error) { + f->f_fsdata = (void *)currfd; + return (0); + } + +#ifdef NFS_DEBUG + if (debug) + printf("nfs_open: %s lookupfh failed: %s\n", + path, strerror(error)); +#endif +#ifndef NFS_NOSYMLINK + if (currfd != &nfs_root_node) +#endif + free(currfd); + + return (error); +} + +int +nfs_close(struct open_file *f) +{ + struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata; + +#ifdef NFS_DEBUG + if (debug) + printf("nfs_close: fp=0x%lx\n", (u_long)fp); +#endif + + if (fp != &nfs_root_node && fp) + free(fp); + f->f_fsdata = (void *)0; + + return (0); +} + +/* + * read a portion of a file + */ +int +nfs_read(struct open_file *f, void *buf, size_t size, size_t *resid) +{ + struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata; + ssize_t cc; + char *addr = buf; + +#ifdef NFS_DEBUG + if (debug) + printf("nfs_read: size=%lu off=%d\n", (u_long)size, + (int)fp->off); +#endif + while ((int)size > 0) { + twiddle(); + cc = nfs_readdata(fp, fp->off, (void *)addr, size); + /* XXX maybe should retry on certain errors */ + if (cc == -1) { +#ifdef NFS_DEBUG + if (debug) + printf("nfs_read: read: %s", strerror(errno)); +#endif + return (errno); /* XXX - from nfs_readdata */ + } + if (cc == 0) { +#ifdef NFS_DEBUG + if (debug) + printf("nfs_read: hit EOF unexpectantly"); +#endif + goto ret; + } + fp->off += cc; + addr += cc; + size -= cc; + } +ret: + if (resid) + *resid = size; + + return (0); +} + +/* + * Not implemented. + */ +int +nfs_write(struct open_file *f, void *buf, size_t size, size_t *resid) +{ + return (EROFS); +} + +off_t +nfs_seek(struct open_file *f, off_t offset, int where) +{ + struct nfs_iodesc *d = (struct nfs_iodesc *)f->f_fsdata; + uint32_t size = ntohl(d->fa.fa_size.val[1]); + + switch (where) { + case SEEK_SET: + d->off = offset; + break; + case SEEK_CUR: + d->off += offset; + break; + case SEEK_END: + d->off = size - offset; + break; + default: + errno = EINVAL; + return (-1); + } + + return (d->off); +} + +/* NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5, NFSOCK=6, NFFIFO=7 */ +int nfs_stat_types[9] = { + 0, S_IFREG, S_IFDIR, S_IFBLK, S_IFCHR, S_IFLNK, S_IFSOCK, S_IFIFO, 0 }; + +int +nfs_stat(struct open_file *f, struct stat *sb) +{ + struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata; + uint32_t ftype, mode; + + ftype = ntohl(fp->fa.fa_type); + mode = ntohl(fp->fa.fa_mode); + mode |= nfs_stat_types[ftype & 7]; + + sb->st_mode = mode; + sb->st_nlink = ntohl(fp->fa.fa_nlink); + sb->st_uid = ntohl(fp->fa.fa_uid); + sb->st_gid = ntohl(fp->fa.fa_gid); + sb->st_size = ntohl(fp->fa.fa_size.val[1]); + + return (0); +} + +static int +nfs_readdir(struct open_file *f, struct dirent *d) +{ + struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata; + struct nfsv3_readdir_repl *repl; + struct nfsv3_readdir_entry *rent; + static char *buf; + static uint32_t cookie0 = 0; + static uint32_t cookie1 = 0; + size_t cc; + static uint32_t cookieverf0 = 0; + static uint32_t cookieverf1 = 0; + int pos; + + struct args { + uint32_t fhsize; + uint32_t fhpluscookie[5 + NFS_V3MAXFHSIZE]; + } *args; + struct { + uint32_t h[RPC_HEADER_WORDS]; + struct args d; + } sdata; + static struct { + uint32_t h[RPC_HEADER_WORDS]; + u_char d[NFS_READDIRSIZE]; + } rdata; + + if (cookie0 == 0 && cookie1 == 0) { + refill: + args = &sdata.d; + bzero(args, sizeof(*args)); + + args->fhsize = htonl(fp->fhsize); + bcopy(fp->fh, args->fhpluscookie, fp->fhsize); + pos = roundup(fp->fhsize, sizeof(uint32_t)) / sizeof(uint32_t); + args->fhpluscookie[pos++] = cookie0; + args->fhpluscookie[pos++] = cookie1; + args->fhpluscookie[pos++] = cookieverf0; + args->fhpluscookie[pos++] = cookieverf1; + args->fhpluscookie[pos] = htonl(NFS_READDIRSIZE); + + cc = rpc_call(fp->iodesc, NFS_PROG, NFS_VER3, NFSPROCV3_READDIR, + args, 6 * sizeof(uint32_t) + + roundup(fp->fhsize, sizeof(uint32_t)), + rdata.d, sizeof(rdata.d)); + buf = rdata.d; + repl = (struct nfsv3_readdir_repl *)buf; + if (repl->errno != 0) + return (ntohl(repl->errno)); + cookieverf0 = repl->cookiev0; + cookieverf1 = repl->cookiev1; + buf += sizeof (struct nfsv3_readdir_repl); + } + rent = (struct nfsv3_readdir_entry *)buf; + + if (rent->follows == 0) { + /* fid0 is actually eof */ + if (rent->fid0 != 0) { + cookie0 = 0; + cookie1 = 0; + cookieverf0 = 0; + cookieverf1 = 0; + return (ENOENT); + } + goto refill; + } + + d->d_namlen = ntohl(rent->len); + bcopy(rent->nameplus, d->d_name, d->d_namlen); + d->d_name[d->d_namlen] = '\0'; + + pos = roundup(d->d_namlen, sizeof(uint32_t)) / sizeof(uint32_t); + cookie0 = rent->nameplus[pos++]; + cookie1 = rent->nameplus[pos++]; + buf = (u_char *)&rent->nameplus[pos]; + return (0); +} +#endif /* OLD_NFSV2 */ Modified: projects/altix/sys/amd64/amd64/cpu_switch.S ============================================================================== --- projects/altix/sys/amd64/amd64/cpu_switch.S Tue Oct 26 01:20:30 2010 (r214368) +++ projects/altix/sys/amd64/amd64/cpu_switch.S Tue Oct 26 02:34:47 2010 (r214369) @@ -338,19 +338,16 @@ ENTRY(savectx) movl $MSR_FSBASE,%ecx rdmsr - shlq $32,%rdx - leaq (%rax,%rdx),%rax - movq %rax,PCB_FSBASE(%rdi) + movl %eax,PCB_FSBASE(%rdi) + movl %edx,PCB_FSBASE+4(%rdi) movl $MSR_GSBASE,%ecx rdmsr - shlq $32,%rdx - leaq (%rax,%rdx),%rax - movq %rax,PCB_GSBASE(%rdi) + movl %eax,PCB_GSBASE(%rdi) + movl %edx,PCB_GSBASE+4(%rdi) movl $MSR_KGSBASE,%ecx rdmsr - shlq $32,%rdx - leaq (%rax,%rdx),%rax - movq %rax,PCB_KGSBASE(%rdi) + movl %eax,PCB_KGSBASE(%rdi) + movl %edx,PCB_KGSBASE+4(%rdi) sgdt PCB_GDT(%rdi) sidt PCB_IDT(%rdi) Modified: projects/altix/sys/amd64/amd64/exception.S ============================================================================== --- projects/altix/sys/amd64/amd64/exception.S Tue Oct 26 01:20:30 2010 (r214368) +++ projects/altix/sys/amd64/amd64/exception.S Tue Oct 26 02:34:47 2010 (r214369) @@ -108,6 +108,10 @@ IDTVEC(dbg) TRAP_NOEN(T_TRCTRAP) IDTVEC(bpt) TRAP_NOEN(T_BPTFLT) +#ifdef KDTRACE_HOOKS +IDTVEC(dtrace_ret) + TRAP_NOEN(T_DTRACE_RET) +#endif /* Regular traps; The cpu does not supply tf_err for these. */ #define TRAP(a) \ Modified: projects/altix/sys/amd64/amd64/identcpu.c ============================================================================== --- projects/altix/sys/amd64/amd64/identcpu.c Tue Oct 26 01:20:30 2010 (r214368) +++ projects/altix/sys/amd64/amd64/identcpu.c Tue Oct 26 02:34:47 2010 (r214369) @@ -278,7 +278,7 @@ printcpuinfo(void) "\017xTPR" /* Send Task Priority Messages*/ "\020PDCM" /* Perf/Debug Capability MSR */ "\021" - "\022" + "\022PCID" /* Process-context Identifiers */ "\023DCA" /* Direct Cache Access */ "\024SSE4.1" "\025SSE4.2" Modified: projects/altix/sys/amd64/amd64/legacy.c ============================================================================== --- projects/altix/sys/amd64/amd64/legacy.c Tue Oct 26 01:20:30 2010 (r214368) +++ projects/altix/sys/amd64/amd64/legacy.c Tue Oct 26 02:34:47 2010 (r214369) @@ -60,7 +60,7 @@ struct legacy_device { static int legacy_probe(device_t); static int legacy_attach(device_t); static int legacy_print_child(device_t, device_t); -static device_t legacy_add_child(device_t bus, int order, const char *name, +static device_t legacy_add_child(device_t bus, u_int order, const char *name, int unit); static int legacy_read_ivar(device_t, device_t, int, uintptr_t *); static int legacy_write_ivar(device_t, device_t, int, uintptr_t); @@ -149,7 +149,7 @@ legacy_print_child(device_t bus, device_ } static device_t -legacy_add_child(device_t bus, int order, const char *name, int unit) +legacy_add_child(device_t bus, u_int order, const char *name, int unit) { device_t child; struct legacy_device *atdev; @@ -213,7 +213,7 @@ legacy_write_ivar(device_t dev, device_t static void cpu_identify(driver_t *driver, device_t parent); static int cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result); -static device_t cpu_add_child(device_t bus, int order, const char *name, +static device_t cpu_add_child(device_t bus, u_int order, const char *name, int unit); static struct resource_list *cpu_get_rlist(device_t dev, device_t child); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Oct 26 10:29:13 2010 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 F24181065674 for ; Tue, 26 Oct 2010 10:29:13 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (lev.vlakno.cz [77.93.215.190]) by mx1.freebsd.org (Postfix) with ESMTP id ACC308FC0C for ; Tue, 26 Oct 2010 10:29:13 +0000 (UTC) Received: from lev.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 29CEA9CB0B9; Tue, 26 Oct 2010 12:11:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by lev.vlakno.cz (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ssW2d7jKpQTy; Tue, 26 Oct 2010 12:11:22 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 78DCD9CB117; Tue, 26 Oct 2010 12:11:22 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.4/8.14.4/Submit) id o9QABMNn092490; Tue, 26 Oct 2010 12:11:22 +0200 (CEST) (envelope-from rdivacky) Date: Tue, 26 Oct 2010 12:11:22 +0200 From: Roman Divacky To: Nathan Whitehorn Message-ID: <20101026101122.GA92250@freebsd.org> References: <201010252149.o9PLnx0T078199@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201010252149.o9PLnx0T078199@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r214360 - projects/binutils-2.17/contrib/binutils/bfd 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, 26 Oct 2010 10:29:14 -0000 On Mon, Oct 25, 2010 at 09:49:59PM +0000, Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Mon Oct 25 21:49:59 2010 > New Revision: 214360 > URL: http://svn.freebsd.org/changeset/base/214360 > > Log: > Fix a manifestation of GCC bug 16625 that caused ld >= 2.17 to fail on > 64-bit PowerPC when linking multiple C++ files referencing the same > method, defined in a common header, when that method had a switch > statement with more than 4 cases. This change fixes compilation of LLVM > tblgen on 64-bit PPC with binutils 2.17. was this manifested when using clang too? From owner-svn-src-projects@FreeBSD.ORG Tue Oct 26 14:07:01 2010 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 884871065673; Tue, 26 Oct 2010 14:07:01 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 723E68FC15; Tue, 26 Oct 2010 14:07:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9QE71mS034054; Tue, 26 Oct 2010 14:07:01 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9QE71lk034037; Tue, 26 Oct 2010 14:07:01 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201010261407.o9QE71lk034037@svn.freebsd.org> From: Attilio Rao Date: Tue, 26 Oct 2010 14:07:01 +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: r214375 - in projects/sv: . bin/sh contrib/bsnmp/lib contrib/bsnmp/snmpd contrib/llvm contrib/llvm/autoconf contrib/llvm/bindings contrib/llvm/include/llvm contrib/llvm/include/llvm/Con... 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, 26 Oct 2010 14:07:01 -0000 Author: attilio Date: Tue Oct 26 14:06:59 2010 New Revision: 214375 URL: http://svn.freebsd.org/changeset/base/214375 Log: MFC @ 214363 Added: projects/sv/contrib/xz/po/de.po - copied unchanged from r214374, head/contrib/xz/po/de.po projects/sv/contrib/xz/po/it.po - copied unchanged from r214374, head/contrib/xz/po/it.po projects/sv/contrib/xz/src/common/tuklib_mbstr.h - copied unchanged from r214374, head/contrib/xz/src/common/tuklib_mbstr.h projects/sv/contrib/xz/src/common/tuklib_mbstr_fw.c - copied unchanged from r214374, head/contrib/xz/src/common/tuklib_mbstr_fw.c projects/sv/contrib/xz/src/common/tuklib_mbstr_width.c - copied unchanged from r214374, head/contrib/xz/src/common/tuklib_mbstr_width.c projects/sv/share/examples/jails/ - copied from r214374, head/share/examples/jails/ projects/sv/share/examples/netgraph/virtual.chain - copied unchanged from r214374, head/share/examples/netgraph/virtual.chain projects/sv/share/examples/netgraph/virtual.lan - copied unchanged from r214374, head/share/examples/netgraph/virtual.lan projects/sv/share/man/man9/vm_page_sleep_if_busy.9 - copied unchanged from r214374, head/share/man/man9/vm_page_sleep_if_busy.9 projects/sv/sys/contrib/dev/acpica/compiler/aslmessages.h - copied unchanged from r214374, head/sys/contrib/dev/acpica/compiler/aslmessages.h projects/sv/sys/dev/iicbus/ds1775.c - copied unchanged from r214374, head/sys/dev/iicbus/ds1775.c projects/sv/sys/dev/iicbus/max6690.c - copied unchanged from r214374, head/sys/dev/iicbus/max6690.c projects/sv/sys/dev/usb/net/if_ipheth.c - copied unchanged from r214374, head/sys/dev/usb/net/if_ipheth.c projects/sv/sys/dev/usb/net/if_iphethvar.h - copied unchanged from r214374, head/sys/dev/usb/net/if_iphethvar.h projects/sv/sys/dev/xen/control/ - copied from r214374, head/sys/dev/xen/control/ projects/sv/sys/mips/cavium/octe/mv88e61xxphy.c - copied unchanged from r214374, head/sys/mips/cavium/octe/mv88e61xxphy.c projects/sv/sys/mips/cavium/octe/mv88e61xxphyreg.h - copied unchanged from r214374, head/sys/mips/cavium/octe/mv88e61xxphyreg.h projects/sv/sys/modules/usb/ipheth/ - copied from r214374, head/sys/modules/usb/ipheth/ projects/sv/sys/net/if_debug.c - copied unchanged from r214374, head/sys/net/if_debug.c projects/sv/sys/net80211/ieee80211_ratectl_none.c - copied unchanged from r214374, head/sys/net80211/ieee80211_ratectl_none.c projects/sv/sys/netinet/in_debug.c - copied unchanged from r214374, head/sys/netinet/in_debug.c projects/sv/sys/nfs/nfs_mountcommon.h - copied unchanged from r214374, head/sys/nfs/nfs_mountcommon.h projects/sv/sys/powerpc/powermac/fcu.c - copied unchanged from r214374, head/sys/powerpc/powermac/fcu.c projects/sv/sys/x86/x86/dump_machdep.c - copied, changed from r214374, head/sys/x86/x86/dump_machdep.c projects/sv/sys/xen/blkif.h - copied unchanged from r214374, head/sys/xen/blkif.h projects/sv/sys/xen/xenbus/xenbus.c - copied unchanged from r214374, head/sys/xen/xenbus/xenbus.c projects/sv/sys/xen/xenbus/xenbusb.c - copied unchanged from r214374, head/sys/xen/xenbus/xenbusb.c projects/sv/sys/xen/xenbus/xenbusb.h - copied unchanged from r214374, head/sys/xen/xenbus/xenbusb.h projects/sv/sys/xen/xenbus/xenbusb_back.c - copied unchanged from r214374, head/sys/xen/xenbus/xenbusb_back.c projects/sv/sys/xen/xenbus/xenbusb_front.c - copied unchanged from r214374, head/sys/xen/xenbus/xenbusb_front.c projects/sv/sys/xen/xenbus/xenbusb_if.m - copied unchanged from r214374, head/sys/xen/xenbus/xenbusb_if.m projects/sv/sys/xen/xenstore/ - copied from r214374, head/sys/xen/xenstore/ projects/sv/tools/regression/bin/sh/execution/func3.0 - copied unchanged from r214374, head/tools/regression/bin/sh/execution/func3.0 projects/sv/tools/regression/bin/sh/execution/redir3.0 - copied unchanged from r214374, head/tools/regression/bin/sh/execution/redir3.0 projects/sv/tools/regression/bin/sh/execution/redir4.0 - copied unchanged from r214374, head/tools/regression/bin/sh/execution/redir4.0 projects/sv/tools/regression/bin/sh/expansion/trim4.0 - copied unchanged from r214374, head/tools/regression/bin/sh/expansion/trim4.0 projects/sv/tools/regression/bin/sh/parser/alias1.0 - copied unchanged from r214374, head/tools/regression/bin/sh/parser/alias1.0 projects/sv/tools/regression/bin/sh/parser/alias2.0 - copied unchanged from r214374, head/tools/regression/bin/sh/parser/alias2.0 projects/sv/tools/regression/bin/sh/parser/func1.0 - copied unchanged from r214374, head/tools/regression/bin/sh/parser/func1.0 projects/sv/tools/regression/bin/sh/parser/pipe-not1.0 - copied unchanged from r214374, head/tools/regression/bin/sh/parser/pipe-not1.0 Deleted: projects/sv/contrib/llvm/CMakeLists.txt projects/sv/contrib/llvm/CREDITS.TXT projects/sv/contrib/llvm/LICENSE.TXT projects/sv/contrib/llvm/Makefile projects/sv/contrib/llvm/Makefile.common projects/sv/contrib/llvm/Makefile.config.in projects/sv/contrib/llvm/Makefile.rules projects/sv/contrib/llvm/ModuleInfo.txt projects/sv/contrib/llvm/README.txt projects/sv/contrib/llvm/autoconf/ projects/sv/contrib/llvm/bindings/ projects/sv/contrib/llvm/build-for-llvm-top.sh projects/sv/contrib/llvm/configure projects/sv/contrib/llvm/include/llvm/CMakeLists.txt projects/sv/contrib/llvm/include/llvm/Config/ projects/sv/contrib/llvm/include/llvm/System/DataTypes.h.cmake projects/sv/contrib/llvm/include/llvm/System/DataTypes.h.in projects/sv/contrib/llvm/include/llvm/System/LICENSE.TXT projects/sv/contrib/llvm/lib/Analysis/CMakeLists.txt projects/sv/contrib/llvm/lib/Analysis/IPA/CMakeLists.txt projects/sv/contrib/llvm/lib/Analysis/IPA/Makefile projects/sv/contrib/llvm/lib/Analysis/Makefile projects/sv/contrib/llvm/lib/Analysis/README.txt projects/sv/contrib/llvm/lib/Archive/CMakeLists.txt projects/sv/contrib/llvm/lib/Archive/Makefile projects/sv/contrib/llvm/lib/AsmParser/CMakeLists.txt projects/sv/contrib/llvm/lib/AsmParser/Makefile projects/sv/contrib/llvm/lib/Bitcode/Makefile projects/sv/contrib/llvm/lib/Bitcode/Reader/CMakeLists.txt projects/sv/contrib/llvm/lib/Bitcode/Reader/Makefile projects/sv/contrib/llvm/lib/Bitcode/Writer/CMakeLists.txt projects/sv/contrib/llvm/lib/Bitcode/Writer/Makefile projects/sv/contrib/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/CodeGen/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/CodeGen/CMakeLists.txt projects/sv/contrib/llvm/lib/CodeGen/Makefile projects/sv/contrib/llvm/lib/CodeGen/README.txt projects/sv/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt projects/sv/contrib/llvm/lib/CodeGen/SelectionDAG/Makefile projects/sv/contrib/llvm/lib/CompilerDriver/CMakeLists.txt projects/sv/contrib/llvm/lib/CompilerDriver/Makefile projects/sv/contrib/llvm/lib/ExecutionEngine/CMakeLists.txt projects/sv/contrib/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt projects/sv/contrib/llvm/lib/ExecutionEngine/Interpreter/Makefile projects/sv/contrib/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt projects/sv/contrib/llvm/lib/ExecutionEngine/JIT/Makefile projects/sv/contrib/llvm/lib/ExecutionEngine/Makefile projects/sv/contrib/llvm/lib/Linker/CMakeLists.txt projects/sv/contrib/llvm/lib/Linker/Makefile projects/sv/contrib/llvm/lib/MC/CMakeLists.txt projects/sv/contrib/llvm/lib/MC/MCDisassembler/CMakeLists.txt projects/sv/contrib/llvm/lib/MC/MCDisassembler/Makefile projects/sv/contrib/llvm/lib/MC/MCParser/CMakeLists.txt projects/sv/contrib/llvm/lib/MC/MCParser/Makefile projects/sv/contrib/llvm/lib/MC/Makefile projects/sv/contrib/llvm/lib/Makefile projects/sv/contrib/llvm/lib/Support/CMakeLists.txt projects/sv/contrib/llvm/lib/Support/COPYRIGHT.regex projects/sv/contrib/llvm/lib/Support/Makefile projects/sv/contrib/llvm/lib/System/CMakeLists.txt projects/sv/contrib/llvm/lib/System/Makefile projects/sv/contrib/llvm/lib/System/README.txt projects/sv/contrib/llvm/lib/System/Unix/README.txt projects/sv/contrib/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/ARM/AsmParser/Makefile projects/sv/contrib/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/ARM/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/ARM/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/ARM/Disassembler/Makefile projects/sv/contrib/llvm/lib/Target/ARM/Makefile projects/sv/contrib/llvm/lib/Target/ARM/README-Thumb.txt projects/sv/contrib/llvm/lib/Target/ARM/README-Thumb2.txt projects/sv/contrib/llvm/lib/Target/ARM/README.txt projects/sv/contrib/llvm/lib/Target/ARM/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/ARM/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/Alpha/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Alpha/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/Alpha/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Alpha/Makefile projects/sv/contrib/llvm/lib/Target/Alpha/README.txt projects/sv/contrib/llvm/lib/Target/Alpha/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Alpha/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/Blackfin/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Blackfin/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/Blackfin/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Blackfin/Makefile projects/sv/contrib/llvm/lib/Target/Blackfin/README.txt projects/sv/contrib/llvm/lib/Target/Blackfin/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Blackfin/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/CBackend/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/CBackend/Makefile projects/sv/contrib/llvm/lib/Target/CBackend/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/CBackend/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/CellSPU/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/CellSPU/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/CellSPU/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/CellSPU/Makefile projects/sv/contrib/llvm/lib/Target/CellSPU/README.txt projects/sv/contrib/llvm/lib/Target/CellSPU/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/CellSPU/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/CppBackend/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/CppBackend/Makefile projects/sv/contrib/llvm/lib/Target/CppBackend/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/CppBackend/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/MBlaze/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/MBlaze/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/MBlaze/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/MBlaze/Makefile projects/sv/contrib/llvm/lib/Target/MBlaze/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/MBlaze/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/MSP430/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/MSP430/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/MSP430/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/MSP430/Makefile projects/sv/contrib/llvm/lib/Target/MSP430/README.txt projects/sv/contrib/llvm/lib/Target/MSP430/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/MSP430/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/Makefile projects/sv/contrib/llvm/lib/Target/Mips/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Mips/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/Mips/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Mips/Makefile projects/sv/contrib/llvm/lib/Target/Mips/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Mips/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/PIC16/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/PIC16/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/PIC16/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/PIC16/Makefile projects/sv/contrib/llvm/lib/Target/PIC16/PIC16Passes/Makefile projects/sv/contrib/llvm/lib/Target/PIC16/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/PIC16/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/PowerPC/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/PowerPC/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/PowerPC/Makefile projects/sv/contrib/llvm/lib/Target/PowerPC/README.txt projects/sv/contrib/llvm/lib/Target/PowerPC/README_ALTIVEC.txt projects/sv/contrib/llvm/lib/Target/PowerPC/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/PowerPC/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/README.txt projects/sv/contrib/llvm/lib/Target/Sparc/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Sparc/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/Sparc/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Sparc/Makefile projects/sv/contrib/llvm/lib/Target/Sparc/README.txt projects/sv/contrib/llvm/lib/Target/Sparc/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/Sparc/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/SystemZ/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/SystemZ/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/SystemZ/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/SystemZ/Makefile projects/sv/contrib/llvm/lib/Target/SystemZ/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/SystemZ/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/X86/AsmParser/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/X86/AsmParser/Makefile projects/sv/contrib/llvm/lib/Target/X86/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/X86/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/X86/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/X86/Disassembler/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/X86/Disassembler/Makefile projects/sv/contrib/llvm/lib/Target/X86/Makefile projects/sv/contrib/llvm/lib/Target/X86/README-FPStack.txt projects/sv/contrib/llvm/lib/Target/X86/README-MMX.txt projects/sv/contrib/llvm/lib/Target/X86/README-SSE.txt projects/sv/contrib/llvm/lib/Target/X86/README-UNIMPLEMENTED.txt projects/sv/contrib/llvm/lib/Target/X86/README-X86-64.txt projects/sv/contrib/llvm/lib/Target/X86/README.txt projects/sv/contrib/llvm/lib/Target/X86/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/X86/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Target/X86/X86CompilationCallback_Win64.asm projects/sv/contrib/llvm/lib/Target/XCore/AsmPrinter/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/XCore/AsmPrinter/Makefile projects/sv/contrib/llvm/lib/Target/XCore/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/XCore/Makefile projects/sv/contrib/llvm/lib/Target/XCore/README.txt projects/sv/contrib/llvm/lib/Target/XCore/TargetInfo/CMakeLists.txt projects/sv/contrib/llvm/lib/Target/XCore/TargetInfo/Makefile projects/sv/contrib/llvm/lib/Transforms/Hello/ projects/sv/contrib/llvm/lib/Transforms/IPO/CMakeLists.txt projects/sv/contrib/llvm/lib/Transforms/IPO/Makefile projects/sv/contrib/llvm/lib/Transforms/InstCombine/CMakeLists.txt projects/sv/contrib/llvm/lib/Transforms/InstCombine/Makefile projects/sv/contrib/llvm/lib/Transforms/Instrumentation/CMakeLists.txt projects/sv/contrib/llvm/lib/Transforms/Instrumentation/Makefile projects/sv/contrib/llvm/lib/Transforms/Makefile projects/sv/contrib/llvm/lib/Transforms/Scalar/CMakeLists.txt projects/sv/contrib/llvm/lib/Transforms/Scalar/Makefile projects/sv/contrib/llvm/lib/Transforms/Utils/CMakeLists.txt projects/sv/contrib/llvm/lib/Transforms/Utils/Makefile projects/sv/contrib/llvm/lib/VMCore/CMakeLists.txt projects/sv/contrib/llvm/lib/VMCore/Makefile projects/sv/contrib/llvm/llvm.spec.in projects/sv/contrib/llvm/runtime/ projects/sv/contrib/llvm/tools/CMakeLists.txt projects/sv/contrib/llvm/tools/Makefile projects/sv/contrib/llvm/tools/bugpoint/ projects/sv/contrib/llvm/tools/bugpoint-passes/ projects/sv/contrib/llvm/tools/clang/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/INSTALL.txt projects/sv/contrib/llvm/tools/clang/LICENSE.TXT projects/sv/contrib/llvm/tools/clang/Makefile projects/sv/contrib/llvm/tools/clang/ModuleInfo.txt projects/sv/contrib/llvm/tools/clang/NOTES.txt projects/sv/contrib/llvm/tools/clang/README.txt projects/sv/contrib/llvm/tools/clang/TODO.txt projects/sv/contrib/llvm/tools/clang/bindings/ projects/sv/contrib/llvm/tools/clang/include/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/include/Makefile projects/sv/contrib/llvm/tools/clang/include/clang-c/Makefile projects/sv/contrib/llvm/tools/clang/include/clang/AST/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/include/clang/AST/Makefile projects/sv/contrib/llvm/tools/clang/include/clang/Basic/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/include/clang/Basic/Makefile projects/sv/contrib/llvm/tools/clang/include/clang/Basic/Version.inc.in projects/sv/contrib/llvm/tools/clang/include/clang/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/include/clang/Driver/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/include/clang/Driver/Makefile projects/sv/contrib/llvm/tools/clang/include/clang/Makefile projects/sv/contrib/llvm/tools/clang/include/clang/Serialization/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/include/clang/Serialization/Makefile projects/sv/contrib/llvm/tools/clang/lib/AST/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/AST/Makefile projects/sv/contrib/llvm/tools/clang/lib/Analysis/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Analysis/Makefile projects/sv/contrib/llvm/tools/clang/lib/Basic/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Basic/Makefile projects/sv/contrib/llvm/tools/clang/lib/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Checker/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Checker/Makefile projects/sv/contrib/llvm/tools/clang/lib/CodeGen/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/CodeGen/Makefile projects/sv/contrib/llvm/tools/clang/lib/CodeGen/README.txt projects/sv/contrib/llvm/tools/clang/lib/Driver/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Driver/Makefile projects/sv/contrib/llvm/tools/clang/lib/Frontend/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Frontend/Makefile projects/sv/contrib/llvm/tools/clang/lib/FrontendTool/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/FrontendTool/Makefile projects/sv/contrib/llvm/tools/clang/lib/Headers/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Headers/Makefile projects/sv/contrib/llvm/tools/clang/lib/Index/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Index/Makefile projects/sv/contrib/llvm/tools/clang/lib/Lex/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Lex/Makefile projects/sv/contrib/llvm/tools/clang/lib/Makefile projects/sv/contrib/llvm/tools/clang/lib/Parse/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Parse/Makefile projects/sv/contrib/llvm/tools/clang/lib/Rewrite/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Rewrite/Makefile projects/sv/contrib/llvm/tools/clang/lib/Sema/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Sema/Makefile projects/sv/contrib/llvm/tools/clang/lib/Serialization/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/lib/Serialization/Makefile projects/sv/contrib/llvm/tools/clang/runtime/ projects/sv/contrib/llvm/tools/clang/tools/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/tools/Makefile projects/sv/contrib/llvm/tools/clang/tools/c-index-test/ projects/sv/contrib/llvm/tools/clang/tools/driver/CMakeLists.txt projects/sv/contrib/llvm/tools/clang/tools/driver/Info.plist.in projects/sv/contrib/llvm/tools/clang/tools/driver/Makefile projects/sv/contrib/llvm/tools/clang/tools/libclang/ projects/sv/contrib/llvm/tools/clang/tools/scan-build/ projects/sv/contrib/llvm/tools/clang/tools/scan-view/ projects/sv/contrib/llvm/tools/clang/utils/ projects/sv/contrib/llvm/tools/edis/ projects/sv/contrib/llvm/tools/gold/ projects/sv/contrib/llvm/tools/llc/ projects/sv/contrib/llvm/tools/lli/ projects/sv/contrib/llvm/tools/llvm-ar/ projects/sv/contrib/llvm/tools/llvm-as/ projects/sv/contrib/llvm/tools/llvm-bcanalyzer/ projects/sv/contrib/llvm/tools/llvm-config/ projects/sv/contrib/llvm/tools/llvm-diff/ projects/sv/contrib/llvm/tools/llvm-dis/ projects/sv/contrib/llvm/tools/llvm-extract/ projects/sv/contrib/llvm/tools/llvm-ld/ projects/sv/contrib/llvm/tools/llvm-link/ projects/sv/contrib/llvm/tools/llvm-mc/ projects/sv/contrib/llvm/tools/llvm-nm/ projects/sv/contrib/llvm/tools/llvm-prof/ projects/sv/contrib/llvm/tools/llvm-ranlib/ projects/sv/contrib/llvm/tools/llvm-shlib/ projects/sv/contrib/llvm/tools/llvm-stub/ projects/sv/contrib/llvm/tools/llvmc/ projects/sv/contrib/llvm/tools/lto/ projects/sv/contrib/llvm/tools/opt/ projects/sv/contrib/llvm/utils/DSAclean.py projects/sv/contrib/llvm/utils/DSAextract.py projects/sv/contrib/llvm/utils/FileCheck/ projects/sv/contrib/llvm/utils/FileUpdate/ projects/sv/contrib/llvm/utils/GenLibDeps.pl projects/sv/contrib/llvm/utils/GetSourceVersion projects/sv/contrib/llvm/utils/Makefile projects/sv/contrib/llvm/utils/Misc/ projects/sv/contrib/llvm/utils/NLT.schema projects/sv/contrib/llvm/utils/NewNightlyTest.pl projects/sv/contrib/llvm/utils/NightlyTest.gnuplot projects/sv/contrib/llvm/utils/NightlyTestTemplate.html projects/sv/contrib/llvm/utils/OldenDataRecover.pl projects/sv/contrib/llvm/utils/PerfectShuffle/ projects/sv/contrib/llvm/utils/TableGen/CMakeLists.txt projects/sv/contrib/llvm/utils/TableGen/Makefile projects/sv/contrib/llvm/utils/UpdateCMakeLists.pl projects/sv/contrib/llvm/utils/bugpoint/ projects/sv/contrib/llvm/utils/buildit/ projects/sv/contrib/llvm/utils/cgiplotNLT.pl projects/sv/contrib/llvm/utils/check-each-file projects/sv/contrib/llvm/utils/codegen-diff projects/sv/contrib/llvm/utils/count/ projects/sv/contrib/llvm/utils/countloc.sh projects/sv/contrib/llvm/utils/crosstool/ projects/sv/contrib/llvm/utils/emacs/ projects/sv/contrib/llvm/utils/findmisopt projects/sv/contrib/llvm/utils/findoptdiff projects/sv/contrib/llvm/utils/findsym.pl projects/sv/contrib/llvm/utils/fpcmp/ projects/sv/contrib/llvm/utils/getsrcs.sh projects/sv/contrib/llvm/utils/git/ projects/sv/contrib/llvm/utils/importNLT.pl projects/sv/contrib/llvm/utils/jedit/ projects/sv/contrib/llvm/utils/lint/ projects/sv/contrib/llvm/utils/lit/ projects/sv/contrib/llvm/utils/llvm-lit/ projects/sv/contrib/llvm/utils/llvm-native-gcc projects/sv/contrib/llvm/utils/llvm-native-gxx projects/sv/contrib/llvm/utils/llvm.grm projects/sv/contrib/llvm/utils/llvmdo projects/sv/contrib/llvm/utils/llvmgrep projects/sv/contrib/llvm/utils/makellvm projects/sv/contrib/llvm/utils/not/ projects/sv/contrib/llvm/utils/parseNLT.pl projects/sv/contrib/llvm/utils/plotNLT.pl projects/sv/contrib/llvm/utils/profile.pl projects/sv/contrib/llvm/utils/unittest/ projects/sv/contrib/llvm/utils/valgrind/ projects/sv/contrib/llvm/utils/vim/ projects/sv/contrib/llvm/utils/webNLT.pl projects/sv/contrib/xz/src/liblzma/api/lzma/subblock.h projects/sv/contrib/xz/src/liblzma/common/chunk_size.c projects/sv/contrib/xz/src/liblzma/subblock/ projects/sv/share/man/man9/vm_page_sleep_busy.9 projects/sv/share/man/man9/vput.9 projects/sv/sys/amd64/amd64/dump_machdep.c projects/sv/sys/i386/i386/dump_machdep.c projects/sv/sys/xen/reboot.c projects/sv/sys/xen/xenbus/init.txt projects/sv/sys/xen/xenbus/xenbus_client.c projects/sv/sys/xen/xenbus/xenbus_comms.c projects/sv/sys/xen/xenbus/xenbus_comms.h projects/sv/sys/xen/xenbus/xenbus_dev.c projects/sv/sys/xen/xenbus/xenbus_probe.c projects/sv/sys/xen/xenbus/xenbus_probe_backend.c projects/sv/sys/xen/xenbus/xenbus_xs.c Modified: projects/sv/ObsoleteFiles.inc projects/sv/UPDATING projects/sv/bin/sh/Makefile projects/sv/bin/sh/alias.c projects/sv/bin/sh/cd.c projects/sv/bin/sh/eval.c projects/sv/bin/sh/exec.c projects/sv/bin/sh/expand.c projects/sv/bin/sh/histedit.c projects/sv/bin/sh/input.c projects/sv/bin/sh/jobs.c projects/sv/bin/sh/mail.c projects/sv/bin/sh/main.c projects/sv/bin/sh/memalloc.c projects/sv/bin/sh/memalloc.h projects/sv/bin/sh/mksyntax.c projects/sv/bin/sh/nodes.c.pat projects/sv/bin/sh/options.c projects/sv/bin/sh/output.c projects/sv/bin/sh/parser.c projects/sv/bin/sh/redir.c projects/sv/bin/sh/sh.1 projects/sv/bin/sh/shell.h projects/sv/bin/sh/show.c projects/sv/bin/sh/var.c projects/sv/contrib/bsnmp/lib/bsnmplib.3 projects/sv/contrib/bsnmp/snmpd/bsnmpd.1 projects/sv/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/FormatString.h projects/sv/contrib/llvm/tools/clang/lib/Analysis/FormatString.cpp projects/sv/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp projects/sv/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp projects/sv/contrib/netcat/nc.1 projects/sv/contrib/netcat/netcat.c projects/sv/contrib/netcat/socks.c projects/sv/contrib/xz/ChangeLog (contents, props changed) projects/sv/contrib/xz/README (contents, props changed) projects/sv/contrib/xz/THANKS (contents, props changed) projects/sv/contrib/xz/po/LINGUAS (contents, props changed) projects/sv/contrib/xz/po/POTFILES.in (contents, props changed) projects/sv/contrib/xz/po/cs.po (contents, props changed) projects/sv/contrib/xz/src/common/sysdefs.h (contents, props changed) projects/sv/contrib/xz/src/common/tuklib_cpucores.c (contents, props changed) projects/sv/contrib/xz/src/common/tuklib_gettext.h (contents, props changed) projects/sv/contrib/xz/src/common/tuklib_physmem.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/api/lzma.h (contents, props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/index.h (contents, props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/lzma.h (contents, props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/vli.h (contents, props changed) projects/sv/contrib/xz/src/liblzma/common/block_buffer_encoder.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/common/block_util.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/common/common.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/common/common.h (contents, props changed) projects/sv/contrib/xz/src/liblzma/common/filter_common.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/common/filter_decoder.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/common/filter_encoder.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/common/stream_buffer_encoder.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/delta/delta_encoder.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/lz/lz_decoder.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/lz/lz_decoder.h (contents, props changed) projects/sv/contrib/xz/src/liblzma/lz/lz_encoder.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/lz/lz_encoder.h (contents, props changed) projects/sv/contrib/xz/src/liblzma/lz/lz_encoder_mf.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma2_encoder.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c (contents, props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c (contents, props changed) projects/sv/contrib/xz/src/lzmainfo/lzmainfo.1 (contents, props changed) projects/sv/contrib/xz/src/lzmainfo/lzmainfo.c (contents, props changed) projects/sv/contrib/xz/src/xz/args.c (contents, props changed) projects/sv/contrib/xz/src/xz/args.h (contents, props changed) projects/sv/contrib/xz/src/xz/coder.c (contents, props changed) projects/sv/contrib/xz/src/xz/coder.h (contents, props changed) projects/sv/contrib/xz/src/xz/file_io.c (contents, props changed) projects/sv/contrib/xz/src/xz/hardware.c (contents, props changed) projects/sv/contrib/xz/src/xz/hardware.h (contents, props changed) projects/sv/contrib/xz/src/xz/list.c (contents, props changed) projects/sv/contrib/xz/src/xz/main.c (contents, props changed) projects/sv/contrib/xz/src/xz/message.c (contents, props changed) projects/sv/contrib/xz/src/xz/message.h (contents, props changed) projects/sv/contrib/xz/src/xz/options.c (contents, props changed) projects/sv/contrib/xz/src/xz/options.h (contents, props changed) projects/sv/contrib/xz/src/xz/private.h (contents, props changed) projects/sv/contrib/xz/src/xz/signals.c (contents, props changed) projects/sv/contrib/xz/src/xz/signals.h (contents, props changed) projects/sv/contrib/xz/src/xz/util.c (contents, props changed) projects/sv/contrib/xz/src/xz/util.h (contents, props changed) projects/sv/contrib/xz/src/xz/xz.1 (contents, props changed) projects/sv/contrib/xz/src/xzdec/xzdec.1 (contents, props changed) projects/sv/contrib/xz/src/xzdec/xzdec.c (contents, props changed) projects/sv/etc/mtree/BSD.usr.dist projects/sv/gnu/usr.bin/groff/tmac/mdoc.local projects/sv/include/pthread.h projects/sv/lib/csu/ia64/crtn.S projects/sv/lib/libc/gen/pututxline.c projects/sv/lib/libc/mips/SYS.h projects/sv/lib/libc/net/nslexer.l projects/sv/lib/libc/stdlib/strtonum.3 projects/sv/lib/libc/sys/getpriority.2 projects/sv/lib/libc/sys/pathconf.2 projects/sv/lib/libc/sys/stack_protector.c projects/sv/lib/libc/sys/stat.2 projects/sv/lib/libcam/cam.3 projects/sv/lib/libcam/camlib.c projects/sv/lib/libfetch/common.c projects/sv/lib/libgeom/geom_ctl.c projects/sv/lib/liblzma/Makefile projects/sv/lib/liblzma/config.h projects/sv/lib/libradius/Makefile projects/sv/lib/libthr/thread/thr_attr.c projects/sv/lib/libthr/thread/thr_private.h projects/sv/lib/libthr/thread/thr_rwlockattr.c projects/sv/lib/libulog/ulog_login.3 projects/sv/lib/libusb/Makefile projects/sv/lib/libusb/libusb.3 projects/sv/lib/libusb/libusb.h projects/sv/lib/libusb/libusb10.c projects/sv/lib/libusb/libusb10_io.c projects/sv/lib/libusb/libusb20.3 projects/sv/lib/libusb/libusb20.c projects/sv/lib/libusb/libusb20_compat01.c projects/sv/lib/libusb/libusb20_int.h projects/sv/lib/libusb/libusb20_ugen20.c projects/sv/lib/libusb/usb.h projects/sv/lib/libusbhid/Makefile projects/sv/lib/libusbhid/descr.c projects/sv/lib/libusbhid/usbvar.h projects/sv/lib/libz/minigzip.c projects/sv/libexec/bootpd/bootptab.5 projects/sv/libexec/rtld-elf/Makefile projects/sv/libexec/rtld-elf/ia64/reloc.c projects/sv/sbin/camcontrol/camcontrol.8 projects/sv/sbin/camcontrol/camcontrol.c projects/sv/sbin/devd/devd.cc projects/sv/sbin/fsirand/fsirand.8 projects/sv/sbin/geom/class/concat/geom_concat.c projects/sv/sbin/geom/class/eli/geli.8 projects/sv/sbin/geom/class/eli/geom_eli.c projects/sv/sbin/geom/class/journal/geom_journal.c projects/sv/sbin/geom/class/mirror/geom_mirror.c projects/sv/sbin/geom/class/part/geom_part.c projects/sv/sbin/geom/class/part/gpart.8 projects/sv/sbin/geom/class/raid3/geom_raid3.c projects/sv/sbin/geom/class/shsec/geom_shsec.c projects/sv/sbin/geom/class/stripe/geom_stripe.c projects/sv/sbin/geom/class/virstor/geom_virstor.c projects/sv/sbin/hastd/hastd.c projects/sv/sbin/hastd/hooks.c projects/sv/sbin/hastd/nv.c projects/sv/sbin/hastd/nv.h projects/sv/sbin/hastd/parse.y projects/sv/sbin/hastd/pjdlog.c projects/sv/sbin/hastd/primary.c projects/sv/sbin/hastd/secondary.c projects/sv/sbin/hastd/synch.h projects/sv/sbin/ipfw/ipfw.8 projects/sv/sbin/mksnap_ffs/mksnap_ffs.c projects/sv/sbin/reboot/reboot.8 projects/sv/sbin/restore/restore.8 projects/sv/sbin/routed/routed.8 projects/sv/sbin/setkey/setkey.8 projects/sv/sbin/sunlabel/sunlabel.8 projects/sv/share/examples/Makefile projects/sv/share/examples/etc/README.examples projects/sv/share/man/man4/acpi.4 projects/sv/share/man/man4/ada.4 projects/sv/share/man/man4/bwn.4 projects/sv/share/man/man4/iscsi_initiator.4 projects/sv/share/man/man4/lagg.4 projects/sv/share/man/man4/man4.arm/mge.4 projects/sv/share/man/man4/man4.i386/ep.4 projects/sv/share/man/man4/man4.i386/mse.4 projects/sv/share/man/man4/man4.powerpc/tsec.4 projects/sv/share/man/man4/nxge.4 projects/sv/share/man/man4/pci.4 projects/sv/share/man/man5/device.hints.5 projects/sv/share/man/man5/elf.5 projects/sv/share/man/man5/freebsd-update.conf.5 projects/sv/share/man/man5/mailer.conf.5 projects/sv/share/man/man7/build.7 projects/sv/share/man/man7/tuning.7 projects/sv/share/man/man9/Makefile projects/sv/share/man/man9/VOP_GETPAGES.9 projects/sv/share/man/man9/make_dev.9 projects/sv/share/man/man9/sysctl_add_oid.9 projects/sv/share/man/man9/taskqueue.9 projects/sv/share/man/man9/vm_page_io.9 projects/sv/share/man/man9/vm_page_wakeup.9 projects/sv/share/man/man9/vrele.9 projects/sv/share/man/man9/zone.9 projects/sv/share/misc/committers-ports.dot projects/sv/sys/amd64/amd64/fpu.c projects/sv/sys/amd64/amd64/machdep.c projects/sv/sys/amd64/amd64/pmap.c projects/sv/sys/amd64/include/profile.h projects/sv/sys/amd64/linux32/linux32_sysvec.c projects/sv/sys/arm/at91/if_ate.c projects/sv/sys/arm/at91/if_macb.c projects/sv/sys/arm/econa/if_ece.c projects/sv/sys/arm/mv/mv_sata.c projects/sv/sys/arm/xscale/ixp425/if_npe.c projects/sv/sys/boot/common/gpt.c projects/sv/sys/boot/i386/boot2/boot2.c projects/sv/sys/boot/pc98/boot2/boot2.c projects/sv/sys/cam/ata/ata_da.c projects/sv/sys/cam/cam_xpt.c projects/sv/sys/cam/scsi/scsi_da.c projects/sv/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c projects/sv/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/sv/sys/compat/linux/linux_util.h projects/sv/sys/compat/svr4/svr4_sysvec.c projects/sv/sys/conf/NOTES projects/sv/sys/conf/files projects/sv/sys/conf/files.amd64 projects/sv/sys/conf/files.i386 projects/sv/sys/conf/files.pc98 projects/sv/sys/conf/files.powerpc projects/sv/sys/contrib/dev/acpica/acpica_prep.sh projects/sv/sys/contrib/dev/acpica/changes.txt projects/sv/sys/contrib/dev/acpica/common/adisasm.c projects/sv/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/sv/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/sv/sys/contrib/dev/acpica/compiler/aslcompile.c projects/sv/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/sv/sys/contrib/dev/acpica/compiler/asldefine.h projects/sv/sys/contrib/dev/acpica/compiler/aslmain.c projects/sv/sys/contrib/dev/acpica/compiler/aslresource.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/sv/sys/contrib/dev/acpica/compiler/asltypes.h projects/sv/sys/contrib/dev/acpica/compiler/aslutils.c projects/sv/sys/contrib/dev/acpica/compiler/dtcompile.c projects/sv/sys/contrib/dev/acpica/compiler/dttemplate.c projects/sv/sys/contrib/dev/acpica/events/evxfregn.c projects/sv/sys/contrib/dev/acpica/include/acapps.h projects/sv/sys/contrib/dev/acpica/include/aclocal.h projects/sv/sys/contrib/dev/acpica/include/acpixf.h projects/sv/sys/contrib/dev/acpica/include/platform/acenv.h projects/sv/sys/contrib/dev/acpica/osunixxf.c projects/sv/sys/contrib/dev/acpica/utilities/utglobal.c projects/sv/sys/contrib/dev/acpica/utilities/utids.c projects/sv/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/sv/sys/contrib/ngatm/netnatm/api/cc_conn.c projects/sv/sys/contrib/ngatm/netnatm/msg/privmsg.c projects/sv/sys/contrib/ngatm/netnatm/msg/uni_ie.c projects/sv/sys/contrib/ngatm/netnatm/sig/sig_call.c projects/sv/sys/contrib/ngatm/netnatm/sig/sig_reset.c projects/sv/sys/contrib/pf/netinet/in4_cksum.c projects/sv/sys/crypto/aesni/aeskeys_i386.S projects/sv/sys/dev/acpica/Osd/OsdHardware.c projects/sv/sys/dev/acpica/acpi.c projects/sv/sys/dev/acpica/acpi_ec.c projects/sv/sys/dev/acpica/acpi_if.m projects/sv/sys/dev/acpica/acpi_pci.c projects/sv/sys/dev/ae/if_ae.c projects/sv/sys/dev/ae/if_aevar.h projects/sv/sys/dev/age/if_age.c projects/sv/sys/dev/ahci/ahci.c projects/sv/sys/dev/alc/if_alc.c projects/sv/sys/dev/ale/if_ale.c projects/sv/sys/dev/ata/ata-all.c projects/sv/sys/dev/ata/ata-all.h projects/sv/sys/dev/ata/ata-pci.c projects/sv/sys/dev/ata/ata-sata.c projects/sv/sys/dev/ata/chipsets/ata-ahci.c projects/sv/sys/dev/ata/chipsets/ata-intel.c projects/sv/sys/dev/ata/chipsets/ata-marvell.c projects/sv/sys/dev/ata/chipsets/ata-nvidia.c projects/sv/sys/dev/ata/chipsets/ata-promise.c projects/sv/sys/dev/ata/chipsets/ata-siliconimage.c projects/sv/sys/dev/ata/chipsets/ata-via.c projects/sv/sys/dev/bce/if_bce.c projects/sv/sys/dev/bfe/if_bfe.c projects/sv/sys/dev/bge/if_bge.c projects/sv/sys/dev/bge/if_bgereg.h projects/sv/sys/dev/bm/if_bm.c projects/sv/sys/dev/bwn/if_bwn.c projects/sv/sys/dev/cas/if_cas.c projects/sv/sys/dev/cas/if_casvar.h projects/sv/sys/dev/dc/dcphy.c projects/sv/sys/dev/dc/if_dc.c projects/sv/sys/dev/dc/if_dcreg.h projects/sv/sys/dev/dc/pnphy.c projects/sv/sys/dev/e1000/if_em.c projects/sv/sys/dev/e1000/if_em.h projects/sv/sys/dev/ed/if_ed_pccard.c projects/sv/sys/dev/et/if_et.c projects/sv/sys/dev/firewire/fwohci.c projects/sv/sys/dev/fxp/if_fxp.c projects/sv/sys/dev/gem/if_gem.c projects/sv/sys/dev/gem/if_gemvar.h projects/sv/sys/dev/hme/if_hme.c projects/sv/sys/dev/hptrr/hptrr_osm_bsd.c projects/sv/sys/dev/if_ndis/if_ndis.c projects/sv/sys/dev/iwi/if_iwi.c projects/sv/sys/dev/iwi/if_iwivar.h projects/sv/sys/dev/jme/if_jme.c projects/sv/sys/dev/kbd/kbd.c projects/sv/sys/dev/kbdmux/kbdmux.c projects/sv/sys/dev/lge/if_lge.c projects/sv/sys/dev/md/md.c projects/sv/sys/dev/mfi/mfireg.h projects/sv/sys/dev/mge/if_mge.c projects/sv/sys/dev/mge/if_mgevar.h projects/sv/sys/dev/mii/acphy.c projects/sv/sys/dev/mii/amphy.c projects/sv/sys/dev/mii/atphy.c projects/sv/sys/dev/mii/axphy.c projects/sv/sys/dev/mii/bmtphy.c projects/sv/sys/dev/mii/brgphy.c projects/sv/sys/dev/mii/ciphy.c projects/sv/sys/dev/mii/e1000phy.c projects/sv/sys/dev/mii/exphy.c projects/sv/sys/dev/mii/gentbi.c projects/sv/sys/dev/mii/icsphy.c projects/sv/sys/dev/mii/inphy.c projects/sv/sys/dev/mii/ip1000phy.c projects/sv/sys/dev/mii/jmphy.c projects/sv/sys/dev/mii/lxtphy.c projects/sv/sys/dev/mii/mii.c projects/sv/sys/dev/mii/mii.h projects/sv/sys/dev/mii/mii_physubr.c projects/sv/sys/dev/mii/miivar.h projects/sv/sys/dev/mii/mlphy.c projects/sv/sys/dev/mii/nsgphy.c projects/sv/sys/dev/mii/nsphy.c projects/sv/sys/dev/mii/nsphyter.c projects/sv/sys/dev/mii/pnaphy.c projects/sv/sys/dev/mii/qsphy.c projects/sv/sys/dev/mii/rgephy.c projects/sv/sys/dev/mii/rlphy.c projects/sv/sys/dev/mii/rlswitch.c projects/sv/sys/dev/mii/ruephy.c projects/sv/sys/dev/mii/smcphy.c projects/sv/sys/dev/mii/tdkphy.c projects/sv/sys/dev/mii/tlphy.c projects/sv/sys/dev/mii/truephy.c projects/sv/sys/dev/mii/ukphy.c projects/sv/sys/dev/mii/xmphy.c projects/sv/sys/dev/mps/mps.c projects/sv/sys/dev/mps/mps_ioctl.h projects/sv/sys/dev/mps/mps_user.c projects/sv/sys/dev/mps/mpsvar.h projects/sv/sys/dev/msk/if_msk.c projects/sv/sys/dev/mvs/mvs.c projects/sv/sys/dev/mvs/mvs_pci.c projects/sv/sys/dev/mvs/mvs_soc.c projects/sv/sys/dev/nfe/if_nfe.c projects/sv/sys/dev/nge/if_nge.c projects/sv/sys/dev/nve/if_nve.c projects/sv/sys/dev/pci/pci.c projects/sv/sys/dev/pci/pci_pci.c projects/sv/sys/dev/pci/pci_private.h projects/sv/sys/dev/pci/pcireg.h projects/sv/sys/dev/pci/pcivar.h projects/sv/sys/dev/pcn/if_pcn.c projects/sv/sys/dev/re/if_re.c projects/sv/sys/dev/sf/if_sf.c projects/sv/sys/dev/sge/if_sge.c projects/sv/sys/dev/siis/siis.c projects/sv/sys/dev/sis/if_sis.c projects/sv/sys/dev/sk/if_sk.c projects/sv/sys/dev/smc/if_smc.c projects/sv/sys/dev/sound/pci/envy24ht.c projects/sv/sys/dev/sound/pci/spicds.c projects/sv/sys/dev/sound/pcm/channel.c projects/sv/sys/dev/ste/if_ste.c projects/sv/sys/dev/stge/if_stge.c projects/sv/sys/dev/syscons/syscons.c projects/sv/sys/dev/tl/if_tl.c projects/sv/sys/dev/tl/if_tlreg.h projects/sv/sys/dev/tsec/if_tsec.c projects/sv/sys/dev/tx/if_tx.c projects/sv/sys/dev/usb/controller/at91dci.c projects/sv/sys/dev/usb/controller/atmegadci.c projects/sv/sys/dev/usb/controller/avr32dci.c projects/sv/sys/dev/usb/controller/ehci.c projects/sv/sys/dev/usb/controller/ehci.h projects/sv/sys/dev/usb/controller/ehci_pci.c projects/sv/sys/dev/usb/controller/ehcireg.h projects/sv/sys/dev/usb/controller/musb_otg.c projects/sv/sys/dev/usb/controller/ohci.c projects/sv/sys/dev/usb/controller/uss820dci.c projects/sv/sys/dev/usb/net/if_axe.c projects/sv/sys/dev/usb/net/if_axereg.h projects/sv/sys/dev/usb/net/if_cdce.c projects/sv/sys/dev/usb/net/if_cdcereg.h projects/sv/sys/dev/usb/net/uhso.c projects/sv/sys/dev/usb/net/usb_ethernet.c projects/sv/sys/dev/usb/quirk/usb_quirk.c projects/sv/sys/dev/usb/serial/u3g.c projects/sv/sys/dev/usb/serial/uftdi.c projects/sv/sys/dev/usb/serial/usb_serial.c projects/sv/sys/dev/usb/storage/umass.c projects/sv/sys/dev/usb/usb_cdc.h projects/sv/sys/dev/usb/usb_device.c projects/sv/sys/dev/usb/usb_freebsd.h projects/sv/sys/dev/usb/usb_ioctl.h projects/sv/sys/dev/usb/usb_msctest.c projects/sv/sys/dev/usb/usbdevs projects/sv/sys/dev/usb/wlan/if_rum.c projects/sv/sys/dev/usb/wlan/if_upgt.c projects/sv/sys/dev/vge/if_vge.c projects/sv/sys/dev/vr/if_vr.c projects/sv/sys/dev/vr/if_vrreg.h projects/sv/sys/dev/wb/if_wb.c projects/sv/sys/dev/xen/balloon/balloon.c projects/sv/sys/dev/xen/blkback/blkback.c projects/sv/sys/dev/xen/blkfront/blkfront.c projects/sv/sys/dev/xen/blkfront/block.h projects/sv/sys/dev/xen/netfront/netfront.c projects/sv/sys/dev/xen/xenpci/evtchn.c projects/sv/sys/dev/xen/xenpci/xenpci.c projects/sv/sys/dev/xl/if_xl.c projects/sv/sys/fs/cd9660/cd9660_mount.h projects/sv/sys/fs/cd9660/cd9660_vfsops.c projects/sv/sys/fs/devfs/devfs.h projects/sv/sys/fs/devfs/devfs_int.h projects/sv/sys/fs/hpfs/hpfs_vfsops.c projects/sv/sys/fs/hpfs/hpfsmount.h projects/sv/sys/fs/msdosfs/msdosfs_denode.c projects/sv/sys/fs/msdosfs/msdosfs_lookup.c projects/sv/sys/fs/msdosfs/msdosfs_vfsops.c projects/sv/sys/fs/msdosfs/msdosfsmount.h projects/sv/sys/fs/nfs/nfs_var.h projects/sv/sys/fs/nfs/nfsdport.h projects/sv/sys/fs/nfsclient/nfs_clnode.c projects/sv/sys/fs/nfsclient/nfs_clvfsops.c projects/sv/sys/fs/nfsclient/nfs_clvnops.c projects/sv/sys/fs/nfsclient/nfsmount.h projects/sv/sys/fs/nfsserver/nfs_nfsdport.c projects/sv/sys/fs/nfsserver/nfs_nfsdstate.c projects/sv/sys/fs/ntfs/ntfs_vfsops.c projects/sv/sys/fs/ntfs/ntfsmount.h projects/sv/sys/fs/tmpfs/tmpfs_vnops.c projects/sv/sys/geom/eli/g_eli.c projects/sv/sys/geom/eli/g_eli.h projects/sv/sys/geom/eli/g_eli_ctl.c projects/sv/sys/geom/eli/g_eli_integrity.c projects/sv/sys/geom/eli/g_eli_key.c projects/sv/sys/geom/eli/g_eli_privacy.c projects/sv/sys/geom/geom_dev.c projects/sv/sys/geom/part/g_part.c projects/sv/sys/geom/part/g_part.h projects/sv/sys/geom/part/g_part_ebr.c projects/sv/sys/geom/part/g_part_gpt.c projects/sv/sys/geom/part/g_part_if.m projects/sv/sys/geom/part/g_part_mbr.c projects/sv/sys/geom/virstor/g_virstor.c projects/sv/sys/gnu/fs/reiserfs/reiserfs_mount.h projects/sv/sys/gnu/fs/reiserfs/reiserfs_vfsops.c projects/sv/sys/i386/i386/elan-mmcr.c projects/sv/sys/i386/i386/identcpu.c projects/sv/sys/i386/i386/initcpu.c projects/sv/sys/i386/i386/longrun.c projects/sv/sys/i386/i386/machdep.c projects/sv/sys/i386/i386/perfmon.c projects/sv/sys/i386/ibcs2/ibcs2_sysvec.c projects/sv/sys/i386/include/profile.h projects/sv/sys/i386/isa/npx.c projects/sv/sys/i386/linux/linux_sysvec.c projects/sv/sys/i386/xen/xen_machdep.c projects/sv/sys/kern/init_main.c projects/sv/sys/kern/kern_cpuset.c projects/sv/sys/kern/kern_exec.c projects/sv/sys/kern/kern_exit.c projects/sv/sys/kern/kern_fork.c projects/sv/sys/kern/kern_kthread.c projects/sv/sys/kern/kern_ktrace.c projects/sv/sys/kern/kern_malloc.c projects/sv/sys/kern/kern_resource.c projects/sv/sys/kern/kern_shutdown.c projects/sv/sys/kern/kern_sig.c projects/sv/sys/kern/kern_syscalls.c projects/sv/sys/kern/kern_thr.c projects/sv/sys/kern/kern_thread.c projects/sv/sys/kern/kern_time.c projects/sv/sys/kern/kern_umtx.c projects/sv/sys/kern/subr_acl_nfs4.c projects/sv/sys/kern/subr_clock.c projects/sv/sys/kern/subr_smp.c projects/sv/sys/kern/subr_taskqueue.c projects/sv/sys/kern/sys_process.c projects/sv/sys/kern/uipc_mqueue.c projects/sv/sys/kern/vfs_aio.c projects/sv/sys/kern/vfs_bio.c projects/sv/sys/kern/vfs_cache.c projects/sv/sys/kern/vfs_mount.c projects/sv/sys/kern/vfs_mountroot.c projects/sv/sys/mips/atheros/if_arge.c projects/sv/sys/mips/cavium/files.octeon1 projects/sv/sys/mips/cavium/octe/cavium-ethernet.h projects/sv/sys/mips/cavium/octe/ethernet-mdio.c projects/sv/sys/mips/cavium/octe/ethernet-mv88e61xx.c projects/sv/sys/mips/cavium/octe/ethernet.c projects/sv/sys/mips/cavium/octe/octe.c projects/sv/sys/mips/conf/OCTEON1 projects/sv/sys/mips/idt/if_kr.c projects/sv/sys/mips/rmi/board.c projects/sv/sys/mips/rmi/dev/nlge/if_nlge.c projects/sv/sys/mips/rmi/xlr_machdep.c projects/sv/sys/modules/acpi/acpi/Makefile projects/sv/sys/modules/cryptodev/Makefile projects/sv/sys/modules/mii/Makefile projects/sv/sys/modules/mps/Makefile projects/sv/sys/modules/sysvipc/sysvmsg/Makefile projects/sv/sys/modules/sysvipc/sysvsem/Makefile projects/sv/sys/modules/usb/Makefile projects/sv/sys/modules/wlan/Makefile projects/sv/sys/net/if.c projects/sv/sys/net/if.h projects/sv/sys/net/if_llatbl.c projects/sv/sys/net/if_llatbl.h projects/sv/sys/net/rtsock.c projects/sv/sys/net80211/ieee80211_ratectl.c projects/sv/sys/net80211/ieee80211_ratectl.h projects/sv/sys/netgraph/ng_UI.c projects/sv/sys/netgraph/ng_async.c projects/sv/sys/netgraph/ng_frame_relay.c projects/sv/sys/netgraph/ng_gif_demux.c projects/sv/sys/netgraph/ng_iface.c projects/sv/sys/netgraph/ng_rfc1490.c projects/sv/sys/netgraph/ng_socket.c projects/sv/sys/netgraph/ng_tty.c projects/sv/sys/netinet/in.c projects/sv/sys/netinet/ip_ipsec.c projects/sv/sys/netinet/ip_options.c projects/sv/sys/netinet/libalias/libalias.3 projects/sv/sys/netinet/tcp_reass.c projects/sv/sys/netinet6/in6_cksum.c projects/sv/sys/netinet6/ip6_ipsec.c projects/sv/sys/netipsec/ipsec_input.c projects/sv/sys/netipsec/ipsec_output.c projects/sv/sys/netipsec/key.c projects/sv/sys/netipsec/keydb.h projects/sv/sys/nfs/nfs_lock.c projects/sv/sys/nfs/nfs_lock.h projects/sv/sys/nfsclient/nfs.h projects/sv/sys/nfsclient/nfs_bio.c projects/sv/sys/nfsclient/nfs_nfsiod.c projects/sv/sys/nfsclient/nfs_node.c projects/sv/sys/nfsclient/nfs_vfsops.c projects/sv/sys/nfsclient/nfs_vnops.c projects/sv/sys/nfsclient/nfsmount.h projects/sv/sys/nfsclient/nfsnode.h projects/sv/sys/nfsserver/nfs_serv.c projects/sv/sys/nlm/nlm_advlock.c projects/sv/sys/nlm/nlm_prot_impl.c projects/sv/sys/pc98/pc98/machdep.c projects/sv/sys/pci/if_rl.c projects/sv/sys/powerpc/conf/GENERIC projects/sv/sys/powerpc/conf/GENERIC64 projects/sv/sys/powerpc/conf/NOTES projects/sv/sys/powerpc/mambo/mambo_console.c projects/sv/sys/rpc/clnt_dg.c projects/sv/sys/rpc/clnt_vc.c projects/sv/sys/rpc/rpc_generic.c projects/sv/sys/security/mac/mac_vfs.c projects/sv/sys/sparc64/include/tick.h projects/sv/sys/sparc64/sparc64/machdep.c projects/sv/sys/sparc64/sparc64/mp_machdep.c projects/sv/sys/sparc64/sparc64/tick.c projects/sv/sys/sys/_task.h projects/sv/sys/sys/exec.h projects/sv/sys/sys/ktrace.h projects/sv/sys/sys/module.h projects/sv/sys/sys/mount.h projects/sv/sys/sys/param.h projects/sv/sys/sys/proc.h projects/sv/sys/sys/signalvar.h projects/sv/sys/sys/sockio.h projects/sv/sys/sys/systm.h projects/sv/sys/sys/taskqueue.h projects/sv/sys/ufs/ffs/ffs_vfsops.c projects/sv/sys/ufs/ufs/ufs_dirhash.c projects/sv/sys/ufs/ufs/ufsmount.h projects/sv/sys/vm/swap_pager.c projects/sv/sys/vm/uma.h projects/sv/sys/vm/uma_core.c projects/sv/sys/vm/vm_map.c projects/sv/sys/vm/vm_map.h projects/sv/sys/x86/isa/atrtc.c projects/sv/sys/x86/x86/local_apic.c projects/sv/sys/xen/evtchn/evtchn.c projects/sv/sys/xen/gnttab.c projects/sv/sys/xen/gnttab.h projects/sv/sys/xen/interface/grant_table.h projects/sv/sys/xen/interface/hvm/params.h projects/sv/sys/xen/interface/io/blkif.h projects/sv/sys/xen/interface/io/protocols.h projects/sv/sys/xen/interface/io/ring.h projects/sv/sys/xen/interface/io/xenbus.h projects/sv/sys/xen/xen_intr.h projects/sv/sys/xen/xenbus/xenbus_if.m projects/sv/sys/xen/xenbus/xenbusvar.h projects/sv/tools/build/mk/OptionalObsoleteFiles.inc projects/sv/tools/regression/bin/sh/Makefile projects/sv/tools/regression/bin/sh/builtins/cd1.0 projects/sv/tools/regression/bin/sh/builtins/command8.0 projects/sv/tools/regression/bin/sh/builtins/exec1.0 projects/sv/tools/regression/bin/sh/builtins/exec2.0 projects/sv/tools/regression/bin/sh/builtins/fc1.0 projects/sv/tools/regression/bin/sh/builtins/fc2.0 projects/sv/tools/regression/bin/sh/builtins/getopts1.0 projects/sv/tools/regression/bin/sh/builtins/getopts1.0.stdout projects/sv/tools/regression/bin/sh/builtins/trap1.0 projects/sv/tools/regression/bin/sh/builtins/var-assign.0 projects/sv/tools/regression/bin/sh/builtins/var-assign2.0 projects/sv/tools/regression/bin/sh/errors/assignment-error1.0 projects/sv/tools/regression/bin/sh/errors/backquote-error1.0 projects/sv/tools/regression/bin/sh/errors/backquote-error2.0 projects/sv/tools/regression/bin/sh/errors/option-error.0 projects/sv/tools/regression/bin/sh/errors/redirection-error.0 projects/sv/tools/regression/bin/sh/errors/redirection-error2.2 projects/sv/tools/regression/bin/sh/errors/redirection-error3.0 projects/sv/tools/regression/bin/sh/execution/fork1.0 projects/sv/tools/regression/bin/sh/execution/fork2.0 projects/sv/tools/regression/bin/sh/execution/func1.0 projects/sv/tools/regression/bin/sh/execution/redir2.0 projects/sv/tools/regression/bin/sh/expansion/question1.0 projects/sv/tools/regression/bin/sh/expansion/set-u1.0 projects/sv/tools/regression/bin/sh/parameters/mail1.0 projects/sv/tools/regression/bin/sh/parameters/mail2.0 projects/sv/tools/regression/bin/sh/parameters/pwd1.0 projects/sv/tools/regression/bin/sh/parameters/pwd2.0 projects/sv/tools/regression/bin/sh/regress.sh projects/sv/tools/regression/bin/sh/regress.t projects/sv/tools/tools/syscall_timing/syscall_timing.c projects/sv/usr.bin/ar/ar.1 projects/sv/usr.bin/ar/ar.c projects/sv/usr.bin/ar/ar.h projects/sv/usr.bin/ar/write.c projects/sv/usr.bin/calendar/calendar.1 projects/sv/usr.bin/calendar/calendars/calendar.freebsd projects/sv/usr.bin/calendar/calendars/calendar.judaic projects/sv/usr.bin/compress/zopen.c projects/sv/usr.bin/gzip/gzip.c projects/sv/usr.bin/gzip/unpack.c projects/sv/usr.bin/gzip/zuncompress.c projects/sv/usr.bin/lex/flex.skl projects/sv/usr.bin/login/login.c projects/sv/usr.bin/mesg/mesg.1 projects/sv/usr.bin/nc/Makefile projects/sv/usr.bin/netstat/sctp.c projects/sv/usr.bin/truss/amd64-fbsd.c projects/sv/usr.bin/truss/amd64-fbsd32.c projects/sv/usr.bin/truss/i386-fbsd.c projects/sv/usr.bin/truss/ia64-fbsd.c projects/sv/usr.bin/truss/mips-fbsd.c projects/sv/usr.bin/truss/powerpc-fbsd.c projects/sv/usr.bin/truss/powerpc64-fbsd.c projects/sv/usr.bin/truss/setup.c projects/sv/usr.bin/truss/sparc64-fbsd.c projects/sv/usr.bin/unzip/unzip.1 projects/sv/usr.bin/unzip/unzip.c projects/sv/usr.bin/uudecode/uudecode.c projects/sv/usr.bin/xz/Makefile projects/sv/usr.sbin/apmd/apmd.8 projects/sv/usr.sbin/config/config.5 projects/sv/usr.sbin/gpioctl/gpioctl.8 projects/sv/usr.sbin/lpr/lpr/lpr.c projects/sv/usr.sbin/mailwrapper/Makefile projects/sv/usr.sbin/mfiutil/mfi_config.c projects/sv/usr.sbin/mfiutil/mfi_drive.c projects/sv/usr.sbin/mfiutil/mfiutil.c projects/sv/usr.sbin/mptutil/mptutil.c projects/sv/usr.sbin/mtest/mtest.8 projects/sv/usr.sbin/ntp/config.h projects/sv/usr.sbin/pc-sysinstall/backend-query/disk-info.sh projects/sv/usr.sbin/pc-sysinstall/backend-query/list-components.sh projects/sv/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh projects/sv/usr.sbin/pc-sysinstall/backend-query/query-langs.sh projects/sv/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh projects/sv/usr.sbin/pc-sysinstall/backend-query/test-live.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-disk.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-newfs.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-unmount.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions.sh projects/sv/usr.sbin/pc-sysinstall/backend/parseconfig.sh projects/sv/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf projects/sv/usr.sbin/pc-sysinstall/examples/README projects/sv/usr.sbin/pkg_install/Makefile.inc projects/sv/usr.sbin/pkg_install/add/main.c projects/sv/usr.sbin/pkg_install/create/create.h projects/sv/usr.sbin/pkg_install/create/main.c projects/sv/usr.sbin/pkg_install/create/perform.c projects/sv/usr.sbin/pkg_install/create/pkg_create.1 projects/sv/usr.sbin/pmcannotate/pmcannotate.c projects/sv/usr.sbin/pmccontrol/pmccontrol.c projects/sv/usr.sbin/ppp/ipcp.c projects/sv/usr.sbin/sysinstall/tcpip.c projects/sv/usr.sbin/usbconfig/usbconfig.c projects/sv/usr.sbin/ypbind/ypbind.c Directory Properties: projects/sv/ (props changed) projects/sv/cddl/contrib/opensolaris/ (props changed) projects/sv/contrib/bind9/ (props changed) projects/sv/contrib/binutils/ (props changed) projects/sv/contrib/bzip2/ (props changed) projects/sv/contrib/ee/ (props changed) projects/sv/contrib/expat/ (props changed) projects/sv/contrib/file/ (props changed) projects/sv/contrib/gdb/ (props changed) projects/sv/contrib/gdtoa/ (props changed) projects/sv/contrib/gnu-sort/ (props changed) projects/sv/contrib/groff/ (props changed) projects/sv/contrib/less/ (props changed) projects/sv/contrib/libpcap/ (props changed) projects/sv/contrib/llvm/ (props changed) projects/sv/contrib/llvm/tools/clang/ (props changed) projects/sv/contrib/ncurses/ (props changed) projects/sv/contrib/netcat/ (props changed) projects/sv/contrib/ntp/ (props changed) projects/sv/contrib/one-true-awk/ (props changed) projects/sv/contrib/openbsm/ (props changed) projects/sv/contrib/openpam/ (props changed) projects/sv/contrib/pf/ (props changed) projects/sv/contrib/sendmail/ (props changed) projects/sv/contrib/tcpdump/ (props changed) projects/sv/contrib/tcsh/ (props changed) projects/sv/contrib/top/ (props changed) projects/sv/contrib/top/install-sh (props changed) projects/sv/contrib/tzcode/stdtime/ (props changed) projects/sv/contrib/tzcode/zic/ (props changed) projects/sv/contrib/tzdata/ (props changed) projects/sv/contrib/wpa/ (props changed) projects/sv/contrib/xz/ (props changed) projects/sv/contrib/xz/AUTHORS (props changed) projects/sv/contrib/xz/COPYING (props changed) projects/sv/contrib/xz/TODO (props changed) projects/sv/contrib/xz/po/Makevars (props changed) projects/sv/contrib/xz/src/common/mythread.h (props changed) projects/sv/contrib/xz/src/common/tuklib_common.h (props changed) projects/sv/contrib/xz/src/common/tuklib_config.h (props changed) projects/sv/contrib/xz/src/common/tuklib_cpucores.h (props changed) projects/sv/contrib/xz/src/common/tuklib_exit.c (props changed) projects/sv/contrib/xz/src/common/tuklib_exit.h (props changed) projects/sv/contrib/xz/src/common/tuklib_integer.h (props changed) projects/sv/contrib/xz/src/common/tuklib_open_stdxxx.c (props changed) projects/sv/contrib/xz/src/common/tuklib_open_stdxxx.h (props changed) projects/sv/contrib/xz/src/common/tuklib_physmem.h (props changed) projects/sv/contrib/xz/src/common/tuklib_progname.c (props changed) projects/sv/contrib/xz/src/common/tuklib_progname.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/base.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/bcj.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/block.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/check.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/container.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/delta.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/filter.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/hardware.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/index_hash.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/stream_flags.h (props changed) projects/sv/contrib/xz/src/liblzma/api/lzma/version.h (props changed) projects/sv/contrib/xz/src/liblzma/check/check.c (props changed) projects/sv/contrib/xz/src/liblzma/check/check.h (props changed) projects/sv/contrib/xz/src/liblzma/check/crc32_fast.c (props changed) projects/sv/contrib/xz/src/liblzma/check/crc32_small.c (props changed) projects/sv/contrib/xz/src/liblzma/check/crc32_table.c (props changed) projects/sv/contrib/xz/src/liblzma/check/crc32_table_be.h (props changed) projects/sv/contrib/xz/src/liblzma/check/crc32_table_le.h (props changed) projects/sv/contrib/xz/src/liblzma/check/crc32_tablegen.c (props changed) projects/sv/contrib/xz/src/liblzma/check/crc32_x86.S (props changed) projects/sv/contrib/xz/src/liblzma/check/crc64_fast.c (props changed) projects/sv/contrib/xz/src/liblzma/check/crc64_small.c (props changed) projects/sv/contrib/xz/src/liblzma/check/crc64_table.c (props changed) projects/sv/contrib/xz/src/liblzma/check/crc64_table_be.h (props changed) projects/sv/contrib/xz/src/liblzma/check/crc64_table_le.h (props changed) projects/sv/contrib/xz/src/liblzma/check/crc64_tablegen.c (props changed) projects/sv/contrib/xz/src/liblzma/check/crc64_x86.S (props changed) projects/sv/contrib/xz/src/liblzma/check/crc_macros.h (props changed) projects/sv/contrib/xz/src/liblzma/check/sha256.c (props changed) projects/sv/contrib/xz/src/liblzma/common/alone_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/alone_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/common/alone_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/auto_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/block_buffer_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/block_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/block_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/common/block_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/block_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/common/block_header_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/block_header_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/easy_buffer_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/easy_decoder_memusage.c (props changed) projects/sv/contrib/xz/src/liblzma/common/easy_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/easy_encoder_memusage.c (props changed) projects/sv/contrib/xz/src/liblzma/common/easy_preset.c (props changed) projects/sv/contrib/xz/src/liblzma/common/easy_preset.h (props changed) projects/sv/contrib/xz/src/liblzma/common/filter_buffer_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/filter_buffer_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/filter_common.h (props changed) projects/sv/contrib/xz/src/liblzma/common/filter_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/common/filter_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/common/filter_flags_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/filter_flags_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/hardware_physmem.c (props changed) projects/sv/contrib/xz/src/liblzma/common/index.c (props changed) projects/sv/contrib/xz/src/liblzma/common/index.h (props changed) projects/sv/contrib/xz/src/liblzma/common/index_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/index_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/index_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/common/index_hash.c (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_buffer_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_flags_common.c (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_flags_common.h (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_flags_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/stream_flags_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/vli_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/vli_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/common/vli_size.c (props changed) projects/sv/contrib/xz/src/liblzma/delta/delta_common.c (props changed) projects/sv/contrib/xz/src/liblzma/delta/delta_common.h (props changed) projects/sv/contrib/xz/src/liblzma/delta/delta_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/delta/delta_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/delta/delta_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/delta/delta_private.h (props changed) projects/sv/contrib/xz/src/liblzma/lz/lz_encoder_hash.h (props changed) projects/sv/contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h (props changed) projects/sv/contrib/xz/src/liblzma/lzma/fastpos.h (props changed) projects/sv/contrib/xz/src/liblzma/lzma/fastpos_table.c (props changed) projects/sv/contrib/xz/src/liblzma/lzma/fastpos_tablegen.c (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma2_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma2_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma2_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_common.h (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h (props changed) projects/sv/contrib/xz/src/liblzma/rangecoder/price.h (props changed) projects/sv/contrib/xz/src/liblzma/rangecoder/price_table.c (props changed) projects/sv/contrib/xz/src/liblzma/rangecoder/price_tablegen.c (props changed) projects/sv/contrib/xz/src/liblzma/rangecoder/range_common.h (props changed) projects/sv/contrib/xz/src/liblzma/rangecoder/range_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/rangecoder/range_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/simple/arm.c (props changed) projects/sv/contrib/xz/src/liblzma/simple/armthumb.c (props changed) projects/sv/contrib/xz/src/liblzma/simple/ia64.c (props changed) projects/sv/contrib/xz/src/liblzma/simple/powerpc.c (props changed) projects/sv/contrib/xz/src/liblzma/simple/simple_coder.c (props changed) projects/sv/contrib/xz/src/liblzma/simple/simple_coder.h (props changed) projects/sv/contrib/xz/src/liblzma/simple/simple_decoder.c (props changed) projects/sv/contrib/xz/src/liblzma/simple/simple_decoder.h (props changed) projects/sv/contrib/xz/src/liblzma/simple/simple_encoder.c (props changed) projects/sv/contrib/xz/src/liblzma/simple/simple_encoder.h (props changed) projects/sv/contrib/xz/src/liblzma/simple/simple_private.h (props changed) projects/sv/contrib/xz/src/liblzma/simple/sparc.c (props changed) projects/sv/contrib/xz/src/liblzma/simple/x86.c (props changed) projects/sv/contrib/xz/src/xz/file_io.h (props changed) projects/sv/contrib/xz/src/xz/list.h (props changed) projects/sv/contrib/xz/src/xz/main.h (props changed) projects/sv/contrib/xz/src/xz/suffix.c (props changed) projects/sv/contrib/xz/src/xz/suffix.h (props changed) projects/sv/crypto/openssh/ (props changed) projects/sv/crypto/openssl/ (props changed) projects/sv/lib/libc/ (props changed) projects/sv/lib/libc/stdtime/ (props changed) projects/sv/lib/libutil/ (props changed) projects/sv/lib/libz/ (props changed) projects/sv/sbin/ (props changed) projects/sv/sbin/ipfw/ (props changed) projects/sv/share/mk/bsd.arch.inc.mk (props changed) projects/sv/share/zoneinfo/ (props changed) projects/sv/sys/ (props changed) projects/sv/sys/amd64/include/xen/ (props changed) projects/sv/sys/cddl/contrib/opensolaris/ (props changed) projects/sv/sys/contrib/dev/acpica/ (props changed) projects/sv/sys/contrib/pf/ (props changed) projects/sv/sys/contrib/x86emu/ (props changed) projects/sv/sys/dev/xen/xenpci/ (props changed) projects/sv/usr.bin/calendar/ (props changed) projects/sv/usr.bin/csup/ (props changed) projects/sv/usr.bin/procstat/ (props changed) projects/sv/usr.sbin/zic/ (props changed) Modified: projects/sv/ObsoleteFiles.inc ============================================================================== --- projects/sv/ObsoleteFiles.inc Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/ObsoleteFiles.inc Tue Oct 26 14:06:59 2010 (r214375) @@ -14,6 +14,13 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20101020: catch up with vm_page_sleep_if_busy rename +OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz +# 20101011: removed subblock.h from liblzma +OLD_FILES+=usr/include/lzma/subblock.h +# 20101002: removed manpath.config +OLD_FILES+=etc/manpath.config +OLD_FILES+=usr/share/examples/etc/manpath.config # 20100910: renamed sbuf_overflowed to sbuf_error OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz # 20100815: retired last traces of chooseproc(9) @@ -4966,7 +4973,7 @@ OLD_FILES+=usr/share/man/man5/usbd.conf. .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" OLD_FILES+=usr/share/man/man8/boot_i386.8.gz .endif -.if ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && ${TARGET_ARCH} != "sparc64" OLD_FILES+=usr/share/man/man8/ofwdump.8.gz .endif OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz Modified: projects/sv/UPDATING ============================================================================== --- projects/sv/UPDATING Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/UPDATING Tue Oct 26 14:06:59 2010 (r214375) @@ -35,10 +35,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. 20100915: A workaround for a fixed ld bug has been removed in kernel code, so make sure that your system ld is built from sources after - revision 210245 (r211583 if building head kernel on stable/8, - r211584 for stable/7). A symptom of incorrect ld version is - different addresses for set_pcpu section and __start_set_pcpu - symbol in kernel and/or modules. + revision 210245 from 2010-07-19 (r211583 if building head kernel + on stable/8, r211584 for stable/7; both from 2010-08-21). + A symptom of incorrect ld version is different addresses for + set_pcpu section and __start_set_pcpu symbol in kernel and/or modules. 20100913: The $ipv6_prefer variable in rc.conf(5) has been split into Modified: projects/sv/bin/sh/Makefile ============================================================================== --- projects/sv/bin/sh/Makefile Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/Makefile Tue Oct 26 14:06:59 2010 (r214375) @@ -21,12 +21,12 @@ LDADD= -ll -ledit -ltermcap LFLAGS= -8 # 8-bit lex scanner for arithmetic CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: -# CFLAGS+= -g -DDEBUG=2 +# DEBUG_FLAGS+= -g -DDEBUG=2 -fno-inline WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ - ${.CURDIR}/../../bin/test + ${.CURDIR}/../test CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \ mksyntax mksyntax.o @@ -62,4 +62,7 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens +regress: + cd ${.CURDIR}/../../tools/regression/bin/sh && ${MAKE} SH=${.OBJDIR}/sh + .include Modified: projects/sv/bin/sh/alias.c ============================================================================== --- projects/sv/bin/sh/alias.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/alias.c Tue Oct 26 14:06:59 2010 (r214375) @@ -49,14 +49,14 @@ __FBSDID("$FreeBSD$"); #define ATABSIZE 39 -STATIC struct alias *atab[ATABSIZE]; -STATIC int aliases; +static struct alias *atab[ATABSIZE]; +static int aliases; -STATIC void setalias(const char *, const char *); -STATIC int unalias(const char *); -STATIC struct alias **hashalias(const char *); +static void setalias(const char *, const char *); +static int unalias(const char *); +static struct alias **hashalias(const char *); -STATIC +static void setalias(const char *name, const char *val) { @@ -111,7 +111,7 @@ setalias(const char *name, const char *v INTON; } -STATIC int +static int unalias(const char *name) { struct alias *ap, **app; @@ -276,7 +276,7 @@ unaliascmd(int argc __unused, char **arg return (i); } -STATIC struct alias ** +static struct alias ** hashalias(const char *p) { unsigned int hashval; Modified: projects/sv/bin/sh/cd.c ============================================================================== --- projects/sv/bin/sh/cd.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/cd.c Tue Oct 26 14:06:59 2010 (r214375) @@ -64,18 +64,18 @@ __FBSDID("$FreeBSD$"); #include "show.h" #include "cd.h" -STATIC int cdlogical(char *); -STATIC int cdphysical(char *); -STATIC int docd(char *, int, int); -STATIC char *getcomponent(void); -STATIC char *findcwd(char *); -STATIC void updatepwd(char *); -STATIC char *getpwd(void); -STATIC char *getpwd2(void); - -STATIC char *curdir = NULL; /* current working directory */ -STATIC char *prevdir; /* previous working directory */ -STATIC char *cdcomppath; +static int cdlogical(char *); +static int cdphysical(char *); +static int docd(char *, int, int); +static char *getcomponent(void); +static char *findcwd(char *); +static void updatepwd(char *); +static char *getpwd(void); +static char *getpwd2(void); + +static char *curdir = NULL; /* current working directory */ +static char *prevdir; /* previous working directory */ +static char *cdcomppath; int cdcmd(int argc, char **argv) @@ -145,7 +145,7 @@ cdcmd(int argc, char **argv) * Actually change the directory. In an interactive shell, print the * directory name if "print" is nonzero. */ -STATIC int +static int docd(char *dest, int print, int phys) { @@ -161,7 +161,7 @@ docd(char *dest, int print, int phys) return 0; } -STATIC int +static int cdlogical(char *dest) { char *p; @@ -213,7 +213,7 @@ cdlogical(char *dest) return (0); } -STATIC int +static int cdphysical(char *dest) { char *p; @@ -232,7 +232,7 @@ cdphysical(char *dest) * Get the next component of the path name pointed to by cdcomppath. * This routine overwrites the string pointed to by cdcomppath. */ -STATIC char * +static char * getcomponent(void) { char *p; @@ -253,7 +253,7 @@ getcomponent(void) } -STATIC char * +static char * findcwd(char *dir) { char *new; @@ -296,7 +296,7 @@ findcwd(char *dir) * cd command. We also call hashcd to let the routines in exec.c know * that the current directory has changed. */ -STATIC void +static void updatepwd(char *dir) { hashcd(); /* update command hash table */ @@ -352,7 +352,7 @@ pwdcmd(int argc, char **argv) /* * Get the current directory and cache the result in curdir. */ -STATIC char * +static char * getpwd(void) { char *p; @@ -372,7 +372,7 @@ getpwd(void) /* * Return the current directory. */ -STATIC char * +static char * getpwd2(void) { char *pwd; Modified: projects/sv/bin/sh/eval.c ============================================================================== --- projects/sv/bin/sh/eval.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/eval.c Tue Oct 26 14:06:59 2010 (r214375) @@ -75,10 +75,10 @@ __FBSDID("$FreeBSD$"); int evalskip; /* set if we are skipping commands */ -STATIC int skipcount; /* number of levels to skip */ +static int skipcount; /* number of levels to skip */ MKINIT int loopnest; /* current loop nesting level */ int funcnest; /* depth of function calls */ -STATIC int builtin_flags; /* evalcommand flags for builtins */ +static int builtin_flags; /* evalcommand flags for builtins */ char *commandname; @@ -87,15 +87,15 @@ int exitstatus; /* exit status of last int oexitstatus; /* saved exit status */ -STATIC void evalloop(union node *, int); -STATIC void evalfor(union node *, int); -STATIC void evalcase(union node *, int); -STATIC void evalsubshell(union node *, int); -STATIC void evalredir(union node *, int); -STATIC void expredir(union node *); -STATIC void evalpipe(union node *); -STATIC void evalcommand(union node *, int, struct backcmd *); -STATIC void prehash(union node *); +static void evalloop(union node *, int); +static void evalfor(union node *, int); +static void evalcase(union node *, int); +static void evalsubshell(union node *, int); +static void evalredir(union node *, int); +static void expredir(union node *); +static void evalpipe(union node *); +static void evalcommand(union node *, int, struct backcmd *); +static void prehash(union node *); /* @@ -289,7 +289,7 @@ out: } -STATIC void +static void evalloop(union node *n, int flags) { int status; @@ -327,7 +327,7 @@ skipping: if (evalskip == SKIPCONT && -STATIC void +static void evalfor(union node *n, int flags) { struct arglist arglist; @@ -367,7 +367,7 @@ out: -STATIC void +static void evalcase(union node *n, int flags) { union node *cp; @@ -400,7 +400,7 @@ out: * Kick off a subshell to evaluate a tree. */ -STATIC void +static void evalsubshell(union node *n, int flags) { struct job *jp; @@ -425,7 +425,7 @@ evalsubshell(union node *n, int flags) * Evaluate a redirected compound command. */ -STATIC void +static void evalredir(union node *n, int flags) { struct jmploc jmploc; @@ -466,7 +466,7 @@ evalredir(union node *n, int flags) * Compute the names of the files in a redirection list. */ -STATIC void +static void expredir(union node *n) { union node *redir; @@ -504,7 +504,7 @@ expredir(union node *n) * of all the rest.) */ -STATIC void +static void evalpipe(union node *n) { struct job *jp; @@ -617,7 +617,7 @@ out: * Execute a simple command. */ -STATIC void +static void evalcommand(union node *cmd, int flags, struct backcmd *backcmd) { struct stackmark smark; @@ -1028,7 +1028,7 @@ out: * check that the name will not be subject to expansion. */ -STATIC void +static void prehash(union node *n) { struct cmdentry entry; Modified: projects/sv/bin/sh/exec.c ============================================================================== --- projects/sv/bin/sh/exec.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/exec.c Tue Oct 26 14:06:59 2010 (r214375) @@ -91,15 +91,15 @@ struct tblentry { }; -STATIC struct tblentry *cmdtable[CMDTABLESIZE]; -STATIC int builtinloc = -1; /* index in path of %builtin, or -1 */ +static struct tblentry *cmdtable[CMDTABLESIZE]; +static int builtinloc = -1; /* index in path of %builtin, or -1 */ int exerrno = 0; /* Last exec error */ -STATIC void tryexec(char *, char **, char **); -STATIC void printentry(struct tblentry *, int); -STATIC struct tblentry *cmdlookup(const char *, int); -STATIC void delete_cmd_entry(void); +static void tryexec(char *, char **, char **); +static void printentry(struct tblentry *, int); +static struct tblentry *cmdlookup(const char *, int); +static void delete_cmd_entry(void); @@ -147,7 +147,7 @@ shellexec(char **argv, char **envp, cons } -STATIC void +static void tryexec(char *cmd, char **argv, char **envp) { int e; @@ -265,7 +265,7 @@ hashcmd(int argc __unused, char **argv _ } -STATIC void +static void printentry(struct tblentry *cmdp, int verbose) { int idx; @@ -615,10 +615,10 @@ deletefuncs(void) * entry. */ -STATIC struct tblentry **lastcmdentry; +static struct tblentry **lastcmdentry; -STATIC struct tblentry * +static struct tblentry * cmdlookup(const char *name, int add) { int hashval; @@ -655,7 +655,7 @@ cmdlookup(const char *name, int add) * Delete the command entry returned on the last lookup. */ -STATIC void +static void delete_cmd_entry(void) { struct tblentry *cmdp; Modified: projects/sv/bin/sh/expand.c ============================================================================== --- projects/sv/bin/sh/expand.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/expand.c Tue Oct 26 14:06:59 2010 (r214375) @@ -43,14 +43,15 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include -#include -#include -#include +#include +#include #include +#include #include +#include #include +#include /* * Routines to expand arguments to commands. We have to deal with @@ -88,31 +89,31 @@ struct ifsregion { }; -STATIC char *expdest; /* output of current string */ -STATIC struct nodelist *argbackq; /* list of back quote expressions */ -STATIC struct ifsregion ifsfirst; /* first struct in list of ifs regions */ -STATIC struct ifsregion *ifslastp; /* last struct in list */ -STATIC struct arglist exparg; /* holds expanded arg list */ - -STATIC void argstr(char *, int); -STATIC char *exptilde(char *, int); -STATIC void expbackq(union node *, int, int); -STATIC int subevalvar(char *, char *, int, int, int, int); -STATIC char *evalvar(char *, int); -STATIC int varisset(char *, int); -STATIC void varvalue(char *, int, int, int); -STATIC void recordregion(int, int, int); -STATIC void removerecordregions(int); -STATIC void ifsbreakup(char *, struct arglist *); -STATIC void expandmeta(struct strlist *, int); -STATIC void expmeta(char *, char *); -STATIC void addfname(char *); -STATIC struct strlist *expsort(struct strlist *); -STATIC struct strlist *msort(struct strlist *, int); -STATIC char *cvtnum(int, char *); -STATIC int collate_range_cmp(int, int); +static char *expdest; /* output of current string */ +static struct nodelist *argbackq; /* list of back quote expressions */ +static struct ifsregion ifsfirst; /* first struct in list of ifs regions */ +static struct ifsregion *ifslastp; /* last struct in list */ +static struct arglist exparg; /* holds expanded arg list */ + +static void argstr(char *, int); +static char *exptilde(char *, int); +static void expbackq(union node *, int, int); +static int subevalvar(char *, char *, int, int, int, int); +static char *evalvar(char *, int); +static int varisset(char *, int); +static void varvalue(char *, int, int, int); +static void recordregion(int, int, int); +static void removerecordregions(int); +static void ifsbreakup(char *, struct arglist *); +static void expandmeta(struct strlist *, int); +static void expmeta(char *, char *); +static void addfname(char *); +static struct strlist *expsort(struct strlist *); +static struct strlist *msort(struct strlist *, int); +static char *cvtnum(int, char *); +static int collate_range_cmp(int, int); -STATIC int +static int collate_range_cmp(int c1, int c2) { static char s1[2], s2[2]; @@ -209,7 +210,7 @@ expandarg(union node *arg, struct arglis * characters to allow for further processing. * If EXP_FULL is set, also preserve CTLQUOTEMARK characters. */ -STATIC void +static void argstr(char *p, int flag) { char c; @@ -275,7 +276,7 @@ breakloop:; * Perform tilde expansion, placing the result in the stack string and * returning the next position in the input string to process. */ -STATIC char * +static char * exptilde(char *p, int flag) { char c, *startp = p; @@ -328,7 +329,7 @@ lose: } -STATIC void +static void removerecordregions(int endoff) { if (ifslastp == NULL) @@ -427,7 +428,7 @@ expari(int flag) /* * Perform command substitution. */ -STATIC void +static void expbackq(union node *cmd, int quoted, int flag) { struct backcmd in; @@ -497,9 +498,9 @@ expbackq(union node *cmd, int quoted, in exitstatus = waitforjob(in.jp, (int *)NULL); if (quoted == 0) recordregion(startloc, dest - stackblock(), 0); - TRACE(("evalbackq: size=%d: \"%.*s\"\n", - (dest - stackblock()) - startloc, - (dest - stackblock()) - startloc, + TRACE(("expbackq: size=%td: \"%.*s\"\n", + ((dest - stackblock()) - startloc), + (int)((dest - stackblock()) - startloc), stackblock() + startloc)); expdest = dest; INTON; @@ -507,7 +508,7 @@ expbackq(union node *cmd, int quoted, in -STATIC int +static int subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags) { @@ -635,7 +636,7 @@ recordleft: * input string. */ -STATIC char * +static char * evalvar(char *p, int flag) { int subtype; @@ -823,7 +824,7 @@ record: * Test whether a specialized variable is set. */ -STATIC int +static int varisset(char *name, int nulok) { @@ -865,7 +866,7 @@ varisset(char *name, int nulok) * Add the value of a specialized variable to the stack string. */ -STATIC void +static void varvalue(char *name, int quoted, int subtype, int flag) { int num; @@ -955,7 +956,7 @@ numvar: * string for IFS characters. */ -STATIC void +static void recordregion(int start, int end, int inquotes) { struct ifsregion *ifsp; @@ -992,7 +993,7 @@ recordregion(int start, int end, int inq * This pass treats them as a regular character, making the string non-empty. * Later, they are removed along with the other CTL* characters. */ -STATIC void +static void ifsbreakup(char *string, struct arglist *arglist) { struct ifsregion *ifsp; @@ -1092,7 +1093,7 @@ ifsbreakup(char *string, struct arglist } -STATIC char expdir[PATH_MAX]; +static char expdir[PATH_MAX]; #define expdir_end (expdir + sizeof(expdir)) /* @@ -1100,7 +1101,7 @@ STATIC char expdir[PATH_MAX]; * At this point, the only control characters should be CTLESC and CTLQUOTEMARK. * The results are stored in the list exparg. */ -STATIC void +static void expandmeta(struct strlist *str, int flag __unused) { char *p; @@ -1147,7 +1148,7 @@ nometa: * Do metacharacter (i.e. *, ?, [...]) expansion. */ -STATIC void +static void expmeta(char *enddir, char *name) { char *p; @@ -1283,7 +1284,7 @@ expmeta(char *enddir, char *name) * Add a file name to the list. */ -STATIC void +static void addfname(char *name) { char *p; @@ -1304,7 +1305,7 @@ addfname(char *name) * work. */ -STATIC struct strlist * +static struct strlist * expsort(struct strlist *str) { int len; @@ -1317,7 +1318,7 @@ expsort(struct strlist *str) } -STATIC struct strlist * +static struct strlist * msort(struct strlist *list, int len) { struct strlist *p, *q = NULL; @@ -1540,7 +1541,7 @@ casematch(union node *pattern, const cha * Our own itoa(). */ -STATIC char * +static char * cvtnum(int num, char *buf) { char temp[32]; Modified: projects/sv/bin/sh/histedit.c ============================================================================== --- projects/sv/bin/sh/histedit.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/histedit.c Tue Oct 26 14:06:59 2010 (r214375) @@ -68,7 +68,7 @@ EditLine *el; /* editline cookie */ int displayhist; static FILE *el_in, *el_out, *el_err; -STATIC char *fc_replace(const char *, char *, char *); +static char *fc_replace(const char *, char *, char *); /* * Set history and editing status. Called whenever the status may @@ -402,7 +402,7 @@ histcmd(int argc, char **argv) return 0; } -STATIC char * +static char * fc_replace(const char *s, char *p, char *r) { char *dest; @@ -418,7 +418,7 @@ fc_replace(const char *s, char *p, char } else STPUTC(*s++, dest); } - STACKSTRNUL(dest); + STPUTC('\0', dest); dest = grabstackstr(dest); return (dest); Modified: projects/sv/bin/sh/input.c ============================================================================== --- projects/sv/bin/sh/input.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/input.c Tue Oct 26 14:06:59 2010 (r214375) @@ -98,13 +98,13 @@ MKINIT int parselleft; /* copy of parse char *parsenextc; /* copy of parsefile->nextc */ MKINIT struct parsefile basepf; /* top level input file */ char basebuf[BUFSIZ]; /* buffer for top level input file */ -STATIC struct parsefile *parsefile = &basepf; /* current input file */ +static struct parsefile *parsefile = &basepf; /* current input file */ int init_editline = 0; /* editline library initialized? */ int whichprompt; /* 1 == PS1, 2 == PS2 */ EditLine *el; /* cookie for editline package */ -STATIC void pushfile(void); +static void pushfile(void); static int preadfd(void); #ifdef mkinit @@ -468,7 +468,7 @@ setinputstring(char *string, int push) * adds a new entry to the stack and popfile restores the previous level. */ -STATIC void +static void pushfile(void) { struct parsefile *pf; Modified: projects/sv/bin/sh/jobs.c ============================================================================== --- projects/sv/bin/sh/jobs.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/jobs.c Tue Oct 26 14:06:59 2010 (r214375) @@ -38,18 +38,18 @@ static char sccsid[] = "@(#)jobs.c 8.5 ( #include __FBSDID("$FreeBSD$"); -#include -#include -#include -#include -#include -#include +#include #include -#include -#include #include +#include +#include +#include +#include #include -#include +#include +#include +#include +#include #include "shell.h" #if JOBS @@ -72,13 +72,13 @@ __FBSDID("$FreeBSD$"); #include "mystring.h" -STATIC struct job *jobtab; /* array of jobs */ -STATIC int njobs; /* size of array */ +static struct job *jobtab; /* array of jobs */ +static int njobs; /* size of array */ MKINIT pid_t backgndpid = -1; /* pid of last background process */ MKINIT struct job *bgjob = NULL; /* last background process */ #if JOBS -STATIC struct job *jobmru; /* most recently used job list */ -STATIC pid_t initialpgrp; /* pgrp of shell on invocation */ +static struct job *jobmru; /* most recently used job list */ +static pid_t initialpgrp; /* pgrp of shell on invocation */ #endif int in_waitcmd = 0; /* are we in waitcmd()? */ int in_dowait = 0; /* are we in dowait()? */ @@ -86,21 +86,21 @@ volatile sig_atomic_t breakwaitcmd = 0; static int ttyfd = -1; #if JOBS -STATIC void restartjob(struct job *); +static void restartjob(struct job *); #endif -STATIC void freejob(struct job *); -STATIC struct job *getjob(char *); -STATIC pid_t dowait(int, struct job *); -STATIC pid_t waitproc(int, int *); -STATIC void checkzombies(void); -STATIC void cmdtxt(union node *); -STATIC void cmdputs(const char *); -#if JOBS -STATIC void setcurjob(struct job *); -STATIC void deljob(struct job *); -STATIC struct job *getcurjob(struct job *); +static void freejob(struct job *); +static struct job *getjob(char *); +static pid_t dowait(int, struct job *); +static pid_t waitproc(int, int *); +static void checkzombies(void); +static void cmdtxt(union node *); +static void cmdputs(const char *); +#if JOBS +static void setcurjob(struct job *); +static void deljob(struct job *); +static struct job *getcurjob(struct job *); #endif -STATIC void showjob(struct job *, pid_t, int); +static void showjob(struct job *, pid_t, int); /* @@ -242,7 +242,7 @@ bgcmd(int argc, char **argv) } -STATIC void +static void restartjob(struct job *jp) { struct procstat *ps; @@ -301,7 +301,7 @@ jobscmd(int argc, char *argv[]) return (0); } -STATIC void +static void showjob(struct job *jp, pid_t pid, int mode) { char s[64]; @@ -430,7 +430,7 @@ showjobs(int change, int mode) * Mark a job structure as unused. */ -STATIC void +static void freejob(struct job *jp) { struct procstat *ps; @@ -543,7 +543,7 @@ jobidcmd(int argc __unused, char **argv) * Convert a job name to a job structure. */ -STATIC struct job * +static struct job * getjob(char *name) { int jobno; @@ -680,13 +680,13 @@ makejob(union node *node __unused, int n jp->ps = &jp->ps0; } INTON; - TRACE(("makejob(%p, %d) returns %%%d\n", (void *)node, nprocs, + TRACE(("makejob(%p, %d) returns %%%td\n", (void *)node, nprocs, jp - jobtab + 1)); return jp; } #if JOBS -STATIC void +static void setcurjob(struct job *cj) { struct job *jp, *prev; @@ -706,7 +706,7 @@ setcurjob(struct job *cj) jobmru = cj; } -STATIC void +static void deljob(struct job *j) { struct job *jp, *prev; @@ -726,7 +726,7 @@ deljob(struct job *j) * Return the most recently used job that isn't `nj', and preferably one * that is stopped. */ -STATIC struct job * +static struct job * getcurjob(struct job *nj) { struct job *jp; @@ -766,7 +766,7 @@ forkshell(struct job *jp, union node *n, pid_t pid; pid_t pgrp; - TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, + TRACE(("forkshell(%%%td, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; if (mode == FORK_BG) @@ -903,7 +903,7 @@ waitforjob(struct job *jp, int *origstat int st; INTOFF; - TRACE(("waitforjob(%%%d) called\n", jp - jobtab + 1)); + TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1)); while (jp->state == 0) if (dowait(1, jp) == -1) dotrap(); @@ -950,7 +950,7 @@ waitforjob(struct job *jp, int *origstat * Wait for a process to terminate. */ -STATIC pid_t +static pid_t dowait(int block, struct job *job) { pid_t pid; @@ -1004,7 +1004,7 @@ dowait(int block, struct job *job) if (stopped) { /* stopped or done */ int state = done? JOBDONE : JOBSTOPPED; if (jp->state != state) { - TRACE(("Job %d: changing state from %d to %d\n", jp - jobtab + 1, jp->state, state)); + TRACE(("Job %td: changing state from %d to %d\n", jp - jobtab + 1, jp->state, state)); jp->state = state; if (jp != job) { if (done && !jp->remembered && @@ -1061,7 +1061,7 @@ dowait(int block, struct job *job) * stopped processes. If block is zero, we return a value of zero * rather than blocking. */ -STATIC pid_t +static pid_t waitproc(int block, int *status) { int flags; @@ -1102,7 +1102,7 @@ stoppedjobs(void) } -STATIC void +static void checkzombies(void) { while (njobs > 0 && dowait(0, NULL) > 0) @@ -1130,8 +1130,8 @@ backgndpidval(void) * jobs command. */ -STATIC char *cmdnextc; -STATIC int cmdnleft; +static char *cmdnextc; +static int cmdnleft; #define MAXCMDTEXT 200 char * @@ -1147,7 +1147,7 @@ commandtext(union node *n) } -STATIC void +static void cmdtxt(union node *n) { union node *np; @@ -1280,7 +1280,7 @@ redir: -STATIC void +static void cmdputs(const char *s) { const char *p; Modified: projects/sv/bin/sh/mail.c ============================================================================== --- projects/sv/bin/sh/mail.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/mail.c Tue Oct 26 14:06:59 2010 (r214375) @@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$"); #define MAXMBOXES 10 -STATIC int nmboxes; /* number of mailboxes */ -STATIC time_t mailtime[MAXMBOXES]; /* times of mailboxes */ +static int nmboxes; /* number of mailboxes */ +static time_t mailtime[MAXMBOXES]; /* times of mailboxes */ Modified: projects/sv/bin/sh/main.c ============================================================================== --- projects/sv/bin/sh/main.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/main.c Tue Oct 26 14:06:59 2010 (r214375) @@ -77,8 +77,8 @@ int rootpid; int rootshell; struct jmploc main_handler; -STATIC void read_profile(const char *); -STATIC char *find_dot_file(char *); +static void read_profile(const char *); +static char *find_dot_file(char *); /* * Main routine. We initialize things, parse the arguments, execute @@ -247,7 +247,7 @@ cmdloop(int top) * Read /etc/profile or .profile. Return on error. */ -STATIC void +static void read_profile(const char *name) { int fd; @@ -291,7 +291,7 @@ readcmdfile(const char *name) */ -STATIC char * +static char * find_dot_file(char *basename) { static char localname[FILENAME_MAX+1]; Modified: projects/sv/bin/sh/memalloc.c ============================================================================== --- projects/sv/bin/sh/memalloc.c Tue Oct 26 13:07:01 2010 (r214374) +++ projects/sv/bin/sh/memalloc.c Tue Oct 26 14:06:59 2010 (r214375) @@ -123,8 +123,8 @@ struct stack_block { }; #define SPACE(sp) ((char*)(sp) + ALIGN(sizeof(struct stack_block))) -STATIC struct stack_block *stackp; -STATIC struct stackmark *markp; +static struct stack_block *stackp; +static struct stackmark *markp; char *stacknxt; int stacknleft; int sstrnleft; @@ -295,6 +295,13 @@ grabstackblock(int len) * is space for at least one character. */ +static char * +growstrstackblock(int n) +{ + growstackblock(); + sstrnleft = stackblocksize() - n; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Oct 26 15:03:28 2010 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 ACE881065672 for ; Tue, 26 Oct 2010 15:03:28 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from mail.icecube.wisc.edu (trout.icecube.wisc.edu [128.104.255.119]) by mx1.freebsd.org (Postfix) with ESMTP id 821208FC12 for ; Tue, 26 Oct 2010 15:03:28 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.icecube.wisc.edu (Postfix) with ESMTP id E6778582CD; Tue, 26 Oct 2010 09:33:37 -0500 (CDT) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from mail.icecube.wisc.edu ([127.0.0.1]) by localhost (trout.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id jMewKNti9Lm0; Tue, 26 Oct 2010 09:33:37 -0500 (CDT) Received: from comporellon.tachypleus.net (unknown [76.210.66.181]) by mail.icecube.wisc.edu (Postfix) with ESMTP id 868E3582CA; Tue, 26 Oct 2010 09:33:37 -0500 (CDT) Message-ID: <4CC6E6C0.5060500@freebsd.org> Date: Tue, 26 Oct 2010 09:33:36 -0500 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.14) Gecko/20101021 Thunderbird/3.0.9 MIME-Version: 1.0 To: Roman Divacky References: <201010252149.o9PLnx0T078199@svn.freebsd.org> <20101026101122.GA92250@freebsd.org> In-Reply-To: <20101026101122.GA92250@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r214360 - projects/binutils-2.17/contrib/binutils/bfd 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, 26 Oct 2010 15:03:28 -0000 On 10/26/10 05:11, Roman Divacky wrote: > On Mon, Oct 25, 2010 at 09:49:59PM +0000, Nathan Whitehorn wrote: > >> Author: nwhitehorn >> Date: Mon Oct 25 21:49:59 2010 >> New Revision: 214360 >> URL: http://svn.freebsd.org/changeset/base/214360 >> >> Log: >> Fix a manifestation of GCC bug 16625 that caused ld>= 2.17 to fail on >> 64-bit PowerPC when linking multiple C++ files referencing the same >> method, defined in a common header, when that method had a switch >> statement with more than 4 cases. This change fixes compilation of LLVM >> tblgen on 64-bit PPC with binutils 2.17. >> > was this manifested when using clang too? > No, clang does not seem to emit the .got relocation into a linkonce section that triggered the bug. You may also be interested to know that the clang I am able to build once this patch is applied produces working binaries on 64-bit PowerPC, though there are serious code gen problems (in clang, not LLVM) that prevent it from building even trivial bits of world like ls with optimization above -O0. -Nathan From owner-svn-src-projects@FreeBSD.ORG Tue Oct 26 17:49:18 2010 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 88081106564A; Tue, 26 Oct 2010 17:49:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5CB4B8FC14; Tue, 26 Oct 2010 17:49:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9QHnHvf058671; Tue, 26 Oct 2010 17:49:17 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9QHnHOo058667; Tue, 26 Oct 2010 17:49:17 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201010261749.o9QHnHOo058667@svn.freebsd.org> From: Dimitry Andric Date: Tue, 26 Oct 2010 17:49:17 +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: r214385 - projects/binutils-2.17/gnu/usr.bin/binutils/libbfd 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, 26 Oct 2010 17:49:18 -0000 Author: dim Date: Tue Oct 26 17:49:17 2010 New Revision: 214385 URL: http://svn.freebsd.org/changeset/base/214385 Log: Make sure elf_fbsd_post_process_headers() is actually called for ia64. This is done by prepending the file to elfxx-ia64, not appending it. Additionally, reduce diffs between Makefile.amd64 and Makefile.ia64; instead of echo'ing defines in Makefiles, just add the needed define to elf-fbsd-brand.c directly, as it is only used for amd64 and ia64. Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64 projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64 ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Tue Oct 26 17:38:45 2010 (r214384) +++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Tue Oct 26 17:49:17 2010 (r214385) @@ -20,14 +20,13 @@ VECS= ${DEFAULT_VECTOR} \ bfd_efi_app_ia32_vec \ ${I386_VECS} -CLEANFILES+= elf64-amd64-fbsd.c pepigen.c peigen.c +CLEANFILES+= elf64-amd64-fbsd.c pepigen.c # peigen.c -elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c - cat ${.ALLSRC:M*elf-fbsd-brand.c} > ${.TARGET} - echo "#define elf_backend_post_process_headers elf_fbsd_post_process_headers" \ - >> ${.TARGET} - cat ${.ALLSRC:M*elf64-x86-64.c} >> ${.TARGET} +elf64-amd64-fbsd.c: elf-fbsd-brand.c elf64-x86-64.c + cat ${.ALLSRC} > ${.TARGET} pepigen.c: peXXigen.c sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET} +peigen.c: peXXigen.c + sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET} Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 Tue Oct 26 17:38:45 2010 (r214384) +++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.ia64 Tue Oct 26 17:49:17 2010 (r214385) @@ -23,8 +23,8 @@ VECS+= ${DEFAULT_VECTOR} \ CLEANFILES+= elf64-ia64.c pepigen.c # peigen.c -elf64-ia64.c: elfxx-ia64.c elf-fbsd-brand.c - cat ${.ALLSRC} | sed -e s/NN/64/g > ${.TARGET} +elf64-ia64.c: elf-fbsd-brand.c elfxx-ia64.c + sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} pepigen.c: peXXigen.c sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET} Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c Tue Oct 26 17:38:45 2010 (r214384) +++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c Tue Oct 26 17:49:17 2010 (r214385) @@ -49,3 +49,5 @@ elf_fbsd_post_process_headers (abfd, lin /* Put an ABI label supported by FreeBSD >= 4.1. */ i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; } + +#define elf_backend_post_process_headers elf_fbsd_post_process_headers From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 13:16:48 2010 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 8E8DD106564A; Wed, 27 Oct 2010 13:16:48 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7DFCF8FC13; Wed, 27 Oct 2010 13:16:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RDGmKN007278; Wed, 27 Oct 2010 13:16:48 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RDGmJf007276; Wed, 27 Oct 2010 13:16:48 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201010271316.o9RDGmJf007276@svn.freebsd.org> From: Attilio Rao Date: Wed, 27 Oct 2010 13:16: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: r214416 - projects/sv/sys/netinet 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, 27 Oct 2010 13:16:48 -0000 Author: attilio Date: Wed Oct 27 13:16:48 2010 New Revision: 214416 URL: http://svn.freebsd.org/changeset/base/214416 Log: Remove PRI* macros usage. Modified: projects/sv/sys/netinet/netdump_client.c Modified: projects/sv/sys/netinet/netdump_client.c ============================================================================== --- projects/sv/sys/netinet/netdump_client.c Wed Oct 27 13:10:08 2010 (r214415) +++ projects/sv/sys/netinet/netdump_client.c Wed Oct 27 13:16:48 2010 (r214416) @@ -69,7 +69,6 @@ #include #include -#include #include #include @@ -1107,8 +1106,8 @@ netdump_dumper(void *priv, void *virtual (void)priv; - NETDDEBUGV("netdump_dumper(%p, %p, %"PRIxPTR", %"PRIx64", %zu)\n", - priv, virtual, physical, (uint64_t)offset, length); + NETDDEBUGV("netdump_dumper(%p, %p, 0x%jx, %ju, %zu)\n", + priv, virtual, (uintmax_t)physical, (uintmax_t)offset, length); if (length > sizeof(buf)) return ENOSPC; From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 13:38:40 2010 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 EEFD3106566C; Wed, 27 Oct 2010 13:38:40 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA9448FC08; Wed, 27 Oct 2010 13:38:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RDceO0008056; Wed, 27 Oct 2010 13:38:40 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RDce5S008035; Wed, 27 Oct 2010 13:38:40 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201010271338.o9RDce5S008035@svn.freebsd.org> From: Attilio Rao Date: Wed, 27 Oct 2010 13:38:40 +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: r214417 - in projects/sv: contrib/top contrib/tzcode/stdtime contrib/tzcode/zic lib/libthr/thread sbin/geom/class/eli share/man/man4 share/man/man5 share/misc share/mk sys/cddl/contrib/... 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, 27 Oct 2010 13:38:41 -0000 Author: attilio Date: Wed Oct 27 13:38:40 2010 New Revision: 214417 URL: http://svn.freebsd.org/changeset/base/214417 Log: MFC @ 214416 Modified: projects/sv/contrib/tzcode/stdtime/asctime.c projects/sv/contrib/tzcode/stdtime/localtime.c projects/sv/contrib/tzcode/zic/zic.8 projects/sv/contrib/tzcode/zic/zic.c projects/sv/lib/libthr/thread/thr_attr.c projects/sv/lib/libthr/thread/thr_mutex.c projects/sv/sbin/geom/class/eli/geom_eli.c projects/sv/share/man/man4/acpi.4 projects/sv/share/man/man4/ada.4 projects/sv/share/man/man5/nsmb.conf.5 projects/sv/share/misc/committers-ports.dot projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/sv/sys/dev/acpica/acpi.c projects/sv/sys/fs/nfs/nfsclstate.h projects/sv/sys/fs/nfsclient/nfs_clstate.c projects/sv/sys/x86/x86/dump_machdep.c projects/sv/usr.sbin/mfiutil/mfi_config.c projects/sv/usr.sbin/mfiutil/mfi_drive.c projects/sv/usr.sbin/mfiutil/mfi_evt.c projects/sv/usr.sbin/mfiutil/mfi_flash.c projects/sv/usr.sbin/mfiutil/mfi_patrol.c projects/sv/usr.sbin/mfiutil/mfi_show.c projects/sv/usr.sbin/mfiutil/mfi_volume.c Directory Properties: projects/sv/ (props changed) projects/sv/cddl/contrib/opensolaris/ (props changed) projects/sv/contrib/bind9/ (props changed) projects/sv/contrib/binutils/ (props changed) projects/sv/contrib/bzip2/ (props changed) projects/sv/contrib/ee/ (props changed) projects/sv/contrib/expat/ (props changed) projects/sv/contrib/file/ (props changed) projects/sv/contrib/gdb/ (props changed) projects/sv/contrib/gdtoa/ (props changed) projects/sv/contrib/gnu-sort/ (props changed) projects/sv/contrib/groff/ (props changed) projects/sv/contrib/less/ (props changed) projects/sv/contrib/libpcap/ (props changed) projects/sv/contrib/llvm/ (props changed) projects/sv/contrib/llvm/tools/clang/ (props changed) projects/sv/contrib/ncurses/ (props changed) projects/sv/contrib/netcat/ (props changed) projects/sv/contrib/ntp/ (props changed) projects/sv/contrib/one-true-awk/ (props changed) projects/sv/contrib/openbsm/ (props changed) projects/sv/contrib/openpam/ (props changed) projects/sv/contrib/pf/ (props changed) projects/sv/contrib/sendmail/ (props changed) projects/sv/contrib/tcpdump/ (props changed) projects/sv/contrib/tcsh/ (props changed) projects/sv/contrib/top/ (props changed) projects/sv/contrib/top/install-sh (props changed) projects/sv/contrib/tzcode/stdtime/ (props changed) projects/sv/contrib/tzcode/zic/ (props changed) projects/sv/contrib/tzdata/ (props changed) projects/sv/contrib/wpa/ (props changed) projects/sv/contrib/xz/ (props changed) projects/sv/crypto/openssh/ (props changed) projects/sv/crypto/openssl/ (props changed) projects/sv/lib/libc/ (props changed) projects/sv/lib/libc/stdtime/ (props changed) projects/sv/lib/libutil/ (props changed) projects/sv/lib/libz/ (props changed) projects/sv/sbin/ (props changed) projects/sv/sbin/ipfw/ (props changed) projects/sv/share/mk/bsd.arch.inc.mk (props changed) projects/sv/share/zoneinfo/ (props changed) projects/sv/sys/ (props changed) projects/sv/sys/amd64/include/xen/ (props changed) projects/sv/sys/cddl/contrib/opensolaris/ (props changed) projects/sv/sys/contrib/dev/acpica/ (props changed) projects/sv/sys/contrib/pf/ (props changed) projects/sv/sys/contrib/x86emu/ (props changed) projects/sv/sys/dev/xen/xenpci/ (props changed) projects/sv/usr.bin/calendar/ (props changed) projects/sv/usr.bin/csup/ (props changed) projects/sv/usr.bin/procstat/ (props changed) projects/sv/usr.sbin/zic/ (props changed) Modified: projects/sv/contrib/tzcode/stdtime/asctime.c ============================================================================== --- projects/sv/contrib/tzcode/stdtime/asctime.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/contrib/tzcode/stdtime/asctime.c Wed Oct 27 13:38:40 2010 (r214417) @@ -12,7 +12,7 @@ #include #ifndef lint #ifndef NOID -static char elsieid[] __unused = "@(#)asctime.c 8.2"; +static char elsieid[] __unused = "@(#)asctime.c 8.5"; #endif /* !defined NOID */ #endif /* !defined lint */ __FBSDID("$FreeBSD$"); @@ -95,6 +95,10 @@ char * buf; char year[INT_STRLEN_MAXIMUM(int) + 2]; char result[MAX_ASCTIME_BUF_SIZE]; + if (timeptr == NULL) { + errno = EINVAL; + return strcpy(buf, "??? ??? ?? ??:??:?? ????\n"); + } if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK) wn = "???"; else wn = wday_name[timeptr->tm_wday]; @@ -117,10 +121,9 @@ char * buf; timeptr->tm_mday, timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec, year); - if (strlen(result) < STD_ASCTIME_BUF_SIZE || buf == buf_asctime) { - (void) strcpy(buf, result); - return buf; - } else { + if (strlen(result) < STD_ASCTIME_BUF_SIZE || buf == buf_asctime) + return strcpy(buf, result); + else { #ifdef EOVERFLOW errno = EOVERFLOW; #else /* !defined EOVERFLOW */ Modified: projects/sv/contrib/tzcode/stdtime/localtime.c ============================================================================== --- projects/sv/contrib/tzcode/stdtime/localtime.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/contrib/tzcode/stdtime/localtime.c Wed Oct 27 13:38:40 2010 (r214417) @@ -6,7 +6,7 @@ #include #ifndef lint #ifndef NOID -static char elsieid[] __unused = "@(#)localtime.c 8.9"; +static char elsieid[] __unused = "@(#)localtime.c 8.14"; #endif /* !defined NOID */ #endif /* !defined lint */ __FBSDID("$FreeBSD$"); @@ -315,34 +315,26 @@ settzname(void) return; } #endif /* defined ALL_STATE */ + /* + ** And to get the latest zone names into tzname. . . + */ for (i = 0; i < sp->typecnt; ++i) { - const struct ttinfo * const ttisp = &sp->ttis[i]; + const struct ttinfo * const ttisp = &sp->ttis[sp->types[i]]; tzname[ttisp->tt_isdst] = &sp->chars[ttisp->tt_abbrind]; #ifdef USG_COMPAT if (ttisp->tt_isdst) daylight = 1; - if (i == 0 || !ttisp->tt_isdst) + if (!ttisp->tt_isdst) timezone = -(ttisp->tt_gmtoff); #endif /* defined USG_COMPAT */ #ifdef ALTZONE - if (i == 0 || ttisp->tt_isdst) + if (ttisp->tt_isdst) altzone = -(ttisp->tt_gmtoff); #endif /* defined ALTZONE */ } /* - ** And to get the latest zone names into tzname. . . - */ - for (i = 0; i < sp->timecnt; ++i) { - const struct ttinfo * const ttisp = - &sp->ttis[ - sp->types[i]]; - - tzname[ttisp->tt_isdst] = - &sp->chars[ttisp->tt_abbrind]; - } - /* ** Finally, scrub the abbreviations. ** First, replace bogus characters. */ @@ -395,6 +387,8 @@ register const int doextend; 4 * TZ_MAX_TIMES]; } u; + sp->goback = sp->goahead = FALSE; + /* XXX The following is from OpenBSD, and I'm not sure it is correct */ if (name != NULL && issetugid() != 0) if ((name[0] == ':' && name[1] == '/') || @@ -610,7 +604,6 @@ register const int doextend; sp->ttis[sp->typecnt++] = ts.ttis[1]; } } - sp->goback = sp->goahead = FALSE; if (sp->timecnt > 1) { for (i = 1; i < sp->timecnt; ++i) if (typesequiv(sp, sp->types[i], sp->types[0]) && @@ -1221,7 +1214,7 @@ tzsetwall_basic(int rdlocked) #ifdef ALL_STATE if (lclptr == NULL) { - lclptr = (struct state *) malloc(sizeof *lclptr); + lclptr = (struct state *) calloc(1, sizeof *lclptr); if (lclptr == NULL) { settzname(); /* all we can do */ _RWLOCK_UNLOCK(&lcl_rwlock); @@ -1273,7 +1266,7 @@ tzset_basic(int rdlocked) #ifdef ALL_STATE if (lclptr == NULL) { - lclptr = (struct state *) malloc(sizeof *lclptr); + lclptr = (struct state *) calloc(1, sizeof *lclptr); if (lclptr == NULL) { settzname(); /* all we can do */ _RWLOCK_UNLOCK(&lcl_rwlock); @@ -1471,7 +1464,7 @@ gmt_init(void) { #ifdef ALL_STATE - gmtptr = (struct state *) malloc(sizeof *gmtptr); + gmtptr = (struct state *) calloc(1, sizeof *gmtptr); if (gmtptr != NULL) #endif /* defined ALL_STATE */ gmtload(gmtptr); @@ -2054,6 +2047,11 @@ const long offset; int types[TZ_MAX_TYPES]; int okay; + if (tmp == NULL) { + errno = EINVAL; + return WRONG; + } + if (tmp->tm_isdst > 1) tmp->tm_isdst = 1; t = time2(tmp, funcp, offset, &okay); @@ -2129,7 +2127,8 @@ time_t timelocal(tmp) struct tm * const tmp; { - tmp->tm_isdst = -1; /* in case it wasn't initialized */ + if (tmp != NULL) + tmp->tm_isdst = -1; /* in case it wasn't initialized */ return mktime(tmp); } @@ -2137,7 +2136,8 @@ time_t timegm(tmp) struct tm * const tmp; { - tmp->tm_isdst = 0; + if (tmp != NULL) + tmp->tm_isdst = 0; return time1(tmp, gmtsub, 0L); } @@ -2146,7 +2146,8 @@ timeoff(tmp, offset) struct tm * const tmp; const long offset; { - tmp->tm_isdst = 0; + if (tmp != NULL) + tmp->tm_isdst = 0; return time1(tmp, gmtsub, offset); } Modified: projects/sv/contrib/tzcode/zic/zic.8 ============================================================================== --- projects/sv/contrib/tzcode/zic/zic.8 Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/contrib/tzcode/zic/zic.8 Wed Oct 27 13:38:40 2010 (r214417) @@ -119,6 +119,9 @@ Any line that is blank (after comment st Non-blank lines are expected to be of one of three types: rule lines, zone lines, and link lines. .Pp +Names (such as month names) must be in English and are case insensitive. +Abbreviations, if used, must be unambiguous in context. +.Pp A rule line has the form: .Dl "Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S" For example: @@ -460,6 +463,6 @@ standard directory used for created file .Xr ctime 3 , .Xr tzfile 5 , .Xr zdump 8 -.\" @(#)zic.8 8.5 +.\" @(#)zic.8 8.6 .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. Modified: projects/sv/contrib/tzcode/zic/zic.c ============================================================================== --- projects/sv/contrib/tzcode/zic/zic.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/contrib/tzcode/zic/zic.c Wed Oct 27 13:38:40 2010 (r214417) @@ -3,7 +3,7 @@ ** 2006-07-17 by Arthur David Olson. */ -static const char elsieid[] = "@(#)zic.c 8.20"; +static const char elsieid[] = "@(#)zic.c 8.22"; #ifndef lint static const char rcsid[] = @@ -1588,6 +1588,53 @@ const char * const string; if (thistimei == 0) writetype[0] = TRUE; } +#ifndef LEAVE_SOME_PRE_2011_SYSTEMS_IN_THE_LURCH + /* + ** For some pre-2011 systems: if the last-to-be-written + ** standard (or daylight) type has an offset different from the + ** most recently used offset, + ** append an (unused) copy of the most recently used type + ** (to help get global "altzone" and "timezone" variables + ** set correctly). + */ + { + register int mrudst, mrustd, hidst, histd, type; + + hidst = histd = mrudst = mrustd = -1; + for (i = thistimei; i < thistimelim; ++i) + if (isdsts[types[i]]) + mrudst = types[i]; + else mrustd = types[i]; + for (i = 0; i < typecnt; ++i) + if (writetype[i]) { + if (isdsts[i]) + hidst = i; + else histd = i; + } + if (hidst >= 0 && mrudst >= 0 && hidst != mrudst && + gmtoffs[hidst] != gmtoffs[mrudst]) { + isdsts[mrudst] = -1; + type = addtype(gmtoffs[mrudst], + &chars[abbrinds[mrudst]], + TRUE, + ttisstds[mrudst], + ttisgmts[mrudst]); + isdsts[mrudst] = TRUE; + writetype[type] = TRUE; + } + if (histd >= 0 && mrustd >= 0 && histd != mrustd && + gmtoffs[histd] != gmtoffs[mrustd]) { + isdsts[mrustd] = -1; + type = addtype(gmtoffs[mrustd], + &chars[abbrinds[mrustd]], + FALSE, + ttisstds[mrustd], + ttisgmts[mrustd]); + isdsts[mrustd] = FALSE; + writetype[type] = TRUE; + } + } +#endif /* !defined LEAVE_SOME_PRE_2011_SYSTEMS_IN_THE_LURCH */ thistypecnt = 0; for (i = 0; i < typecnt; ++i) typemap[i] = writetype[i] ? thistypecnt++ : -1; Modified: projects/sv/lib/libthr/thread/thr_attr.c ============================================================================== --- projects/sv/lib/libthr/thread/thr_attr.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/lib/libthr/thread/thr_attr.c Wed Oct 27 13:38:40 2010 (r214417) @@ -141,19 +141,14 @@ _pthread_attr_get_np(pthread_t pthread, struct pthread *curthread; struct pthread_attr attr, *dst; int ret; - size_t cpusetsize; + size_t kern_size; if (pthread == NULL || dstattr == NULL || (dst = *dstattr) == NULL) return (EINVAL); - cpusetsize = _get_kern_cpuset_size(); - if (dst->cpusetsize < cpusetsize) { - char *newset = realloc(dst->cpuset, cpusetsize); - if (newset == NULL) - return (errno); - memset(newset + dst->cpusetsize, 0, cpusetsize - - dst->cpusetsize); - dst->cpuset = (cpuset_t *)newset; - dst->cpusetsize = cpusetsize; + kern_size = _get_kern_cpuset_size(); + if (dst->cpuset == NULL) { + dst->cpuset = calloc(1, kern_size); + dst->cpusetsize = kern_size; } curthread = _get_curthread(); if ((ret = _thr_find_thread(curthread, pthread, /*include dead*/0)) != 0) @@ -574,13 +569,14 @@ _get_kern_cpuset_size(void) if (kern_cpuset_size == 0) { size_t len; + int maxcpus; - len = sizeof(kern_cpuset_size); - if (sysctlbyname("kern.smp.maxcpus", &kern_cpuset_size, - &len, NULL, 0)) + len = sizeof(maxcpus); + if (sysctlbyname("kern.smp.maxcpus", &maxcpus, &len, NULL, 0)) PANIC("failed to get sysctl kern.smp.maxcpus"); - - kern_cpuset_size = (kern_cpuset_size + 7) / 8; + int nbits_long = sizeof(long) * NBBY; + int num_long = (maxcpus + nbits_long - 1) / nbits_long; + kern_cpuset_size = num_long * sizeof(long); } return (kern_cpuset_size); @@ -605,27 +601,25 @@ _pthread_attr_setaffinity_np(pthread_att } return (0); } - - if (cpusetsize > attr->cpusetsize) { - size_t kern_size = _get_kern_cpuset_size(); - if (cpusetsize > kern_size) { - size_t i; - for (i = kern_size; i < cpusetsize; ++i) { - if (((char *)cpusetp)[i]) - return (EINVAL); - } + size_t kern_size = _get_kern_cpuset_size(); + /* Kernel rejects small set, we check it here too. */ + if (cpusetsize < kern_size) + return (ERANGE); + if (cpusetsize > kern_size) { + /* Kernel checks invalid bits, we check it here too. */ + size_t i; + for (i = kern_size; i < cpusetsize; ++i) { + if (((char *)cpusetp)[i]) + return (EINVAL); } - void *newset = realloc(attr->cpuset, cpusetsize); - if (newset == NULL) - return (ENOMEM); - attr->cpuset = newset; - attr->cpusetsize = cpusetsize; - } else { - memset(((char *)attr->cpuset) + cpusetsize, 0, - attr->cpusetsize - cpusetsize); - attr->cpusetsize = cpusetsize; } - memcpy(attr->cpuset, cpusetp, cpusetsize); + if (attr->cpuset == NULL) { + attr->cpuset = calloc(1, kern_size); + if (attr->cpuset == NULL) + return (errno); + attr->cpusetsize = kern_size; + } + memcpy(attr->cpuset, cpusetp, kern_size); ret = 0; } return (ret); @@ -641,16 +635,18 @@ _pthread_attr_getaffinity_np(const pthre if (pattr == NULL || (attr = (*pattr)) == NULL) ret = EINVAL; - else if (attr->cpuset != NULL) { - memcpy(cpusetp, attr->cpuset, MIN(cpusetsize, attr->cpusetsize)); - if (cpusetsize > attr->cpusetsize) - memset(((char *)cpusetp) + attr->cpusetsize, 0, - cpusetsize - attr->cpusetsize); - } else { + else { + /* Kernel rejects small set, we check it here too. */ size_t kern_size = _get_kern_cpuset_size(); - memset(cpusetp, -1, MIN(cpusetsize, kern_size)); + if (cpusetsize < kern_size) + return (ERANGE); + if (attr->cpuset != NULL) + memcpy(cpusetp, attr->cpuset, MIN(cpusetsize, + attr->cpusetsize)); + else + memset(cpusetp, -1, kern_size); if (cpusetsize > kern_size) - memset(((char *)cpusetp) + kern_size, 0, + memset(((char *)cpusetp) + kern_size, 0, cpusetsize - kern_size); } return (ret); Modified: projects/sv/lib/libthr/thread/thr_mutex.c ============================================================================== --- projects/sv/lib/libthr/thread/thr_mutex.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/lib/libthr/thread/thr_mutex.c Wed Oct 27 13:38:40 2010 (r214417) @@ -257,10 +257,8 @@ _mutex_fork(struct pthread *curthread) int _pthread_mutex_destroy(pthread_mutex_t *mutex) { - struct pthread *curthread = _get_curthread(); pthread_mutex_t m; - uint32_t id; - int ret = 0; + int ret; m = *mutex; if (m < THR_MUTEX_DESTROYED) { @@ -268,34 +266,13 @@ _pthread_mutex_destroy(pthread_mutex_t * } else if (m == THR_MUTEX_DESTROYED) { ret = EINVAL; } else { - id = TID(curthread); - - /* - * Try to lock the mutex structure, we only need to - * try once, if failed, the mutex is in used. - */ - ret = _thr_umutex_trylock(&m->m_lock, id); - if (ret) - return (ret); - /* - * Check mutex other fields to see if this mutex is - * in use. Mostly for prority mutex types, or there - * are condition variables referencing it. - */ if (m->m_owner != NULL || m->m_refcount != 0) { - if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) - set_inherited_priority(curthread, m); - _thr_umutex_unlock(&m->m_lock, id); ret = EBUSY; } else { *mutex = THR_MUTEX_DESTROYED; - - if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) - set_inherited_priority(curthread, m); - _thr_umutex_unlock(&m->m_lock, id); - MUTEX_ASSERT_NOT_OWNED(m); free(m); + ret = 0; } } Modified: projects/sv/sbin/geom/class/eli/geom_eli.c ============================================================================== --- projects/sv/sbin/geom/class/eli/geom_eli.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/sbin/geom/class/eli/geom_eli.c Wed Oct 27 13:38:40 2010 (r214417) @@ -749,8 +749,8 @@ eli_init(struct gctl_req *req) return; } if (val > sysconf(_SC_PAGE_SIZE)) { - gctl_error(req, "warning: Using sectorsize bigger than " - "the page size!"); + fprintf(stderr, + "warning: Using sectorsize bigger than the page size!\n"); } md.md_sectorsize = val; } Modified: projects/sv/share/man/man4/acpi.4 ============================================================================== --- projects/sv/share/man/man4/acpi.4 Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/share/man/man4/acpi.4 Wed Oct 27 13:38:40 2010 (r214417) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 12, 2010 +.Dd October 26, 2010 .Dt ACPI 4 .Os .Sh NAME @@ -224,6 +224,26 @@ Try increasing this number if you get th .Qq Li AE_NO_HARDWARE_RESPONSE . .It Va hw.acpi.host_mem_start Override the assumed memory starting address for PCI host bridges. +.It Va hw.acpi.install_interface , hw.acpi.remove_interface +Install or remove OS interface(s) to control return value of +.Ql _OSI +query method. When an OS interface is specified in +.Va hw.acpi.install_interface , +.Li _OSI +query for the interface returns it is +.Em supported . +Conversely, when an OS interface is specified in +.Va hw.acpi.remove_interface , +.Li _OSI +query returns it is +.Em not supported . +Multiple interfaces can be specified in a comma-separated list and +any leading white spaces will be ignored. For example, +.Qq Li FreeBSD, Linux +is a valid list of two interfaces +.Qq Li FreeBSD +and +.Qq Li Linux . .It Va hw.acpi.reset_video Enables calling the VESA reset BIOS vector on the resume path. This can fix some graphics cards that have problems such as LCD white-out Modified: projects/sv/share/man/man4/ada.4 ============================================================================== --- projects/sv/share/man/man4/ada.4 Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/share/man/man4/ada.4 Wed Oct 27 13:38:40 2010 (r214417) @@ -121,6 +121,8 @@ seconds. .It kern.cam.ada.spindown_shutdown .Pp This variable determines whether to spin-down disks when shutting down. +Set to 1 to enable spin-down, 0 to disable. +The default is currently enabled. .El .Sh FILES .Bl -tag -width ".Pa /dev/ada*" -compact Modified: projects/sv/share/man/man5/nsmb.conf.5 ============================================================================== --- projects/sv/share/man/man5/nsmb.conf.5 Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/share/man/man5/nsmb.conf.5 Wed Oct 27 13:38:40 2010 (r214417) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 30, 2003 +.Dd October 19, 2010 .Dt NSMB.CONF 5 .Os .Sh NAME @@ -87,7 +87,7 @@ Possible keywords may include: .It Va nbns Ta "+ + - -" Ta "address of NetBIOS name server (WINS)" .It Va nbscope Ta "+ + - -" Ta "NetBIOS scope" .It Va nbtimeout Ta "+ + - -" Ta "timeout for NetBIOS name servers" -.It Va password Ta "- - + +" Ta "plain text password used to access the given share" +.It Va password Ta "- - + +" Ta "plain text or simple encrypted password used to access the given share" .It Va retry_count Ta "+ + - -" Ta "number of retries before connection is marked as broken" .It Va timeout Ta "+ + - -" Ta "SMB request timeout" .It Va workgroup Ta "+ + + +" Ta "workgroup name" @@ -96,6 +96,9 @@ Possible keywords may include: .Bl -tag -width ".Pa /etc/nsmb.conf" .It Pa /etc/nsmb.conf The default remote mount-point configuration file. +.Pa "~/nsmb.conf" +.It Pa ~/nsmb.conf +The user specific remote mount-point configuration file. .El .Sh EXAMPLES What follows is a sample configuration file which may, @@ -108,6 +111,9 @@ workgroup=SALES [FSERVER] charsets=koi8-r:cp866 addr=fserv.example.com +# User specific data for FSERVER +[FSERVER:MYUSER] +password=$$16144562c293a0314e6e1 .Ed .Pp All lines which begin with the @@ -124,6 +130,18 @@ required when Cyrillic characters are no The hostname value, .Dq Li fserv.example.com , is also assigned in this section. +.Dq Li FSERVER:USER , +defines the user settings and is useful for saving the password used +during a specific connection. +The password may be plaintext or obfuscated using simple encryption. +The simple encrypted password starts with the `$$1' symbols. +Warning: the encryption function is very weak and intended only to hide +clear text passwords. +If the use of simple encryption is desired, the following command may be +used on a password: +.Bd -literal -offset indent +smbutil crypt +.Ed .Sh COMPATIBILITY At the time of this writing, the .Tn IPX Modified: projects/sv/share/misc/committers-ports.dot ============================================================================== --- projects/sv/share/misc/committers-ports.dot Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/share/misc/committers-ports.dot Wed Oct 27 13:38:40 2010 (r214417) @@ -261,6 +261,8 @@ itetcu -> araujo itetcu -> dryice itetcu -> sahil +jadawin -> bapt + joerg -> netchild knu -> daichi @@ -365,6 +367,7 @@ steve -> netchild tabthorpe -> ashish tabthorpe -> avilla tabthorpe -> avl +tabthorpe -> bapt tabthorpe -> fluffy tabthorpe -> jacula tabthorpe -> jadawin Modified: projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c ============================================================================== --- projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Wed Oct 27 13:38:40 2010 (r214417) @@ -192,7 +192,7 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, ASSERT(length <= DMU_MAX_ACCESS); - dbuf_flags = DB_RF_CANFAIL | DB_RF_NEVERWAIT; + dbuf_flags = DB_RF_CANFAIL | DB_RF_NEVERWAIT | DB_RF_HAVESTRUCT; if (flags & DMU_READ_NO_PREFETCH || length > zfetch_array_rd_sz) dbuf_flags |= DB_RF_NOPREFETCH; @@ -209,6 +209,7 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, os_dsl_dataset->ds_object, (longlong_t)dn->dn_object, dn->dn_datablksz, (longlong_t)offset, (longlong_t)length); + rw_exit(&dn->dn_struct_rwlock); return (EIO); } nblks = 1; @@ -231,9 +232,7 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, } /* initiate async i/o */ if (read) { - rw_exit(&dn->dn_struct_rwlock); (void) dbuf_read(db, zio, dbuf_flags); - rw_enter(&dn->dn_struct_rwlock, RW_READER); } dbp[i] = &db->db; } @@ -540,7 +539,7 @@ dmu_read(objset_t *os, uint64_t object, { dnode_t *dn; dmu_buf_t **dbp; - int numbufs, i, err; + int numbufs, err; err = dnode_hold(os->os, object, FTAG, &dn); if (err) @@ -551,7 +550,7 @@ dmu_read(objset_t *os, uint64_t object, * block. If we ever do the tail block optimization, we will need to * handle that here as well. */ - if (dn->dn_datablkshift == 0) { + if (dn->dn_maxblkid == 0) { int newsz = offset > dn->dn_datablksz ? 0 : MIN(size, dn->dn_datablksz - offset); bzero((char *)buf + newsz, size - newsz); @@ -560,6 +559,7 @@ dmu_read(objset_t *os, uint64_t object, while (size > 0) { uint64_t mylen = MIN(size, DMU_MAX_ACCESS / 2); + int i; /* * NB: we could do this block-at-a-time, but it's nice Modified: projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Oct 27 13:38:40 2010 (r214417) @@ -1031,6 +1031,10 @@ zfs_get_done(dmu_buf_t *db, void *vzgd) VFS_UNLOCK_GIANT(vfslocked); } +#ifdef DEBUG +static int zil_fault_io = 0; +#endif + /* * Get data to generate a TX_WRITE intent log record. */ @@ -1112,7 +1116,21 @@ zfs_get_data(void *arg, lr_write_t *lr, zgd->zgd_rl = rl; zgd->zgd_zilog = zfsvfs->z_log; zgd->zgd_bp = &lr->lr_blkptr; - VERIFY(0 == dmu_buf_hold(os, lr->lr_foid, boff, zgd, &db)); +#ifdef DEBUG + if (zil_fault_io) { + error = EIO; + zil_fault_io = 0; + } else { + error = dmu_buf_hold(os, lr->lr_foid, boff, zgd, &db); + } +#else + error = dmu_buf_hold(os, lr->lr_foid, boff, zgd, &db); +#endif + if (error != 0) { + kmem_free(zgd, sizeof (zgd_t)); + goto out; + } + ASSERT(boff == db->db_offset); lr->lr_blkoff = off - boff; error = dmu_sync(zio, db, &lr->lr_blkptr, Modified: projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c ============================================================================== --- projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Wed Oct 27 13:38:40 2010 (r214417) @@ -933,6 +933,10 @@ zil_lwb_commit(zilog_t *zilog, itx_t *it } error = zilog->zl_get_data( itx->itx_private, lr, dbuf, lwb->lwb_zio); + if (error == EIO) { + txg_wait_synced(zilog->zl_dmu_pool, txg); + return (lwb); + } if (error) { ASSERT(error == ENOENT || error == EEXIST || error == EALREADY); Modified: projects/sv/sys/dev/acpica/acpi.c ============================================================================== --- projects/sv/sys/dev/acpica/acpi.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/sys/dev/acpica/acpi.c Wed Oct 27 13:38:40 2010 (r214417) @@ -86,6 +86,11 @@ static struct cdevsw acpi_cdevsw = { .d_name = "acpi", }; +struct acpi_interface { + ACPI_STRING *data; + int num; +}; + /* Global mutex for locking access to the ACPI subsystem. */ struct mtx acpi_mutex; @@ -163,6 +168,7 @@ static void acpi_enable_pcie(void); #endif static void acpi_hint_device_unit(device_t acdev, device_t child, const char *name, int *unitp); +static void acpi_reset_interfaces(device_t dev); static device_method_t acpi_methods[] = { /* Device interface */ @@ -232,6 +238,16 @@ SYSCTL_STRING(_debug_acpi, OID_AUTO, acp acpi_ca_version, 0, "Version of Intel ACPI-CA"); /* + * Allow overriding _OSI methods. + */ +static char acpi_install_interface[256]; +TUNABLE_STR("hw.acpi.install_interface", acpi_install_interface, + sizeof(acpi_install_interface)); +static char acpi_remove_interface[256]; +TUNABLE_STR("hw.acpi.remove_interface", acpi_remove_interface, + sizeof(acpi_remove_interface)); + +/* * Allow override of whether methods execute in parallel or not. * Enable this for serial behavior, which fixes "AE_ALREADY_EXISTS" * errors for AML that really can't handle parallel method execution. @@ -467,6 +483,9 @@ acpi_attach(device_t dev) goto out; } + /* Override OS interfaces if the user requested. */ + acpi_reset_interfaces(dev); + /* Load ACPI name space. */ status = AcpiLoadTables(); if (ACPI_FAILURE(status)) { @@ -3473,6 +3492,93 @@ acpi_debug_objects_sysctl(SYSCTL_HANDLER } static int +acpi_parse_interfaces(char *str, struct acpi_interface *iface) +{ + char *p; + size_t len; + int i, j; + + p = str; + while (isspace(*p) || *p == ',') + p++; + len = strlen(p); + if (len == 0) + return (0); + p = strdup(p, M_TEMP); + for (i = 0; i < len; i++) + if (p[i] == ',') + p[i] = '\0'; + i = j = 0; + while (i < len) + if (isspace(p[i]) || p[i] == '\0') + i++; + else { + i += strlen(p + i) + 1; + j++; + } + if (j == 0) { + free(p, M_TEMP); + return (0); + } + iface->data = malloc(sizeof(*iface->data) * j, M_TEMP, M_WAITOK); + iface->num = j; + i = j = 0; + while (i < len) + if (isspace(p[i]) || p[i] == '\0') + i++; + else { + iface->data[j] = p + i; + i += strlen(p + i) + 1; + j++; + } + + return (j); +} + +static void +acpi_free_interfaces(struct acpi_interface *iface) +{ + + free(iface->data[0], M_TEMP); + free(iface->data, M_TEMP); +} + +static void +acpi_reset_interfaces(device_t dev) +{ + struct acpi_interface list; + ACPI_STATUS status; + int i; + + if (acpi_parse_interfaces(acpi_install_interface, &list) > 0) { + for (i = 0; i < list.num; i++) { + status = AcpiInstallInterface(list.data[i]); + if (ACPI_FAILURE(status)) + device_printf(dev, + "failed to install _OSI(\"%s\"): %s\n", + list.data[i], AcpiFormatException(status)); + else if (bootverbose) + device_printf(dev, "installed _OSI(\"%s\")\n", + list.data[i]); + } + acpi_free_interfaces(&list); + } + if (acpi_parse_interfaces(acpi_remove_interface, &list) > 0) { + for (i = 0; i < list.num; i++) { + status = AcpiRemoveInterface(list.data[i]); + if (ACPI_FAILURE(status)) + device_printf(dev, + "failed to remove _OSI(\"%s\"): %s\n", + list.data[i], AcpiFormatException(status)); + else if (bootverbose) + device_printf(dev, "removed _OSI(\"%s\")\n", + list.data[i]); + } + acpi_free_interfaces(&list); + } +} + +static int acpi_pm_func(u_long cmd, void *arg, ...) { int state, acpi_state; Modified: projects/sv/sys/fs/nfs/nfsclstate.h ============================================================================== --- projects/sv/sys/fs/nfs/nfsclstate.h Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/sys/fs/nfs/nfsclstate.h Wed Oct 27 13:38:40 2010 (r214417) @@ -118,6 +118,7 @@ struct nfscldeleg { #define NFSCLDL_NEEDRECLAIM 0x08 #define NFSCLDL_ZAPPED 0x10 #define NFSCLDL_MODTIMESET 0x20 +#define NFSCLDL_DELEGRET 0x40 /* * MALLOC'd to the correct length to accommodate the file handle. Modified: projects/sv/sys/fs/nfsclient/nfs_clstate.c ============================================================================== --- projects/sv/sys/fs/nfsclient/nfs_clstate.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/sys/fs/nfsclient/nfs_clstate.c Wed Oct 27 13:38:40 2010 (r214417) @@ -929,8 +929,10 @@ nfscl_getbytelock(vnode_t vp, u_int64_t ldp = dp = nfscl_finddeleg(clp, np->n_fhp->nfh_fh, np->n_fhp->nfh_len); /* Just sanity check for correct type of delegation */ - if (dp != NULL && ((dp->nfsdl_flags & NFSCLDL_RECALL) || - (type == F_WRLCK && !(dp->nfsdl_flags & NFSCLDL_WRITE)))) + if (dp != NULL && ((dp->nfsdl_flags & + (NFSCLDL_RECALL | NFSCLDL_DELEGRET)) != 0 || + (type == F_WRLCK && + (dp->nfsdl_flags & NFSCLDL_WRITE) == 0))) dp = NULL; } if (dp != NULL) { @@ -2495,8 +2497,8 @@ tryagain: if (dp->nfsdl_rwlock.nfslock_usecnt == 0 && dp->nfsdl_rwlock.nfslock_lock == 0 && dp->nfsdl_timestamp < NFSD_MONOSEC && - !(dp->nfsdl_flags & (NFSCLDL_RECALL | NFSCLDL_ZAPPED | - NFSCLDL_NEEDRECLAIM))) { + (dp->nfsdl_flags & (NFSCLDL_RECALL | NFSCLDL_ZAPPED | + NFSCLDL_NEEDRECLAIM | NFSCLDL_DELEGRET)) == 0) { clearok = 1; LIST_FOREACH(owp, &dp->nfsdl_owner, nfsow_list) { op = LIST_FIRST(&owp->nfsow_open); @@ -3086,7 +3088,8 @@ nfscl_docb(struct nfsrv_descript *nd, NF if (clp != NULL) { dp = nfscl_finddeleg(clp, nfhp->nfh_fh, nfhp->nfh_len); - if (dp != NULL) { + if (dp != NULL && (dp->nfsdl_flags & + NFSCLDL_DELEGRET) == 0) { dp->nfsdl_flags |= NFSCLDL_RECALL; wakeup((caddr_t)clp); @@ -3338,7 +3341,6 @@ nfscl_recalldeleg(struct nfsclclient *cl np = VTONFS(vp); } dp->nfsdl_flags &= ~NFSCLDL_MODTIMESET; - NFSINVALATTRCACHE(np); /* * Ok, if it's a write delegation, flush data to the server, so @@ -3347,21 +3349,14 @@ nfscl_recalldeleg(struct nfsclclient *cl ret = 0; NFSLOCKNODE(np); if ((dp->nfsdl_flags & NFSCLDL_WRITE) && (np->n_flag & NMODIFIED)) { -#ifdef APPLE - OSBitOrAtomic((u_int32_t)NDELEGRECALL, (UInt32 *)&np->n_flag); -#else np->n_flag |= NDELEGRECALL; -#endif NFSUNLOCKNODE(np); ret = ncl_flush(vp, MNT_WAIT, cred, p, 1, called_from_renewthread); NFSLOCKNODE(np); -#ifdef APPLE - OSBitAndAtomic((int32_t)~(NMODIFIED | NDELEGRECALL), (UInt32 *)&np->n_flag); -#else - np->n_flag &= ~(NMODIFIED | NDELEGRECALL); -#endif + np->n_flag &= ~NDELEGRECALL; } + NFSINVALATTRCACHE(np); NFSUNLOCKNODE(np); if (ret == EIO && called_from_renewthread != 0) { /* @@ -3534,8 +3529,10 @@ nfscl_totalrecall(struct nfsclclient *cl { struct nfscldeleg *dp; - TAILQ_FOREACH(dp, &clp->nfsc_deleg, nfsdl_list) - dp->nfsdl_flags |= NFSCLDL_RECALL; + TAILQ_FOREACH(dp, &clp->nfsc_deleg, nfsdl_list) { + if ((dp->nfsdl_flags & NFSCLDL_DELEGRET) == 0) + dp->nfsdl_flags |= NFSCLDL_RECALL; + } } /* @@ -3754,8 +3751,9 @@ nfscl_mustflush(vnode_t vp) return (1); } dp = nfscl_finddeleg(clp, np->n_fhp->nfh_fh, np->n_fhp->nfh_len); - if (dp != NULL && (dp->nfsdl_flags & (NFSCLDL_WRITE | NFSCLDL_RECALL)) - == NFSCLDL_WRITE && + if (dp != NULL && (dp->nfsdl_flags & + (NFSCLDL_WRITE | NFSCLDL_RECALL | NFSCLDL_DELEGRET)) == + NFSCLDL_WRITE && (dp->nfsdl_sizelimit >= np->n_size || !NFSHASSTRICT3530(nmp))) { NFSUNLOCKCLSTATE(); @@ -3787,9 +3785,10 @@ nfscl_nodeleg(vnode_t vp, int writedeleg return (1); } dp = nfscl_finddeleg(clp, np->n_fhp->nfh_fh, np->n_fhp->nfh_len); - if (dp != NULL && (dp->nfsdl_flags & NFSCLDL_RECALL) == 0 && - (writedeleg == 0 || (dp->nfsdl_flags & NFSCLDL_WRITE) - == NFSCLDL_WRITE)) { + if (dp != NULL && + (dp->nfsdl_flags & (NFSCLDL_RECALL | NFSCLDL_DELEGRET)) == 0 && + (writedeleg == 0 || (dp->nfsdl_flags & NFSCLDL_WRITE) == + NFSCLDL_WRITE)) { NFSUNLOCKCLSTATE(); return (0); } @@ -3860,6 +3859,7 @@ nfscl_removedeleg(vnode_t vp, NFSPROC_T } } if (needsrecall && !triedrecall) { + dp->nfsdl_flags |= NFSCLDL_DELEGRET; islept = 0; while (!igotlock) { igotlock = nfsv4_lock(&clp->nfsc_lock, 1, @@ -3958,6 +3958,7 @@ nfscl_renamedeleg(vnode_t fvp, nfsv4stat } } if (needsrecall && !triedrecall) { + dp->nfsdl_flags |= NFSCLDL_DELEGRET; islept = 0; while (!igotlock) { igotlock = nfsv4_lock(&clp->nfsc_lock, 1, Modified: projects/sv/sys/x86/x86/dump_machdep.c ============================================================================== --- projects/sv/sys/x86/x86/dump_machdep.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/sys/x86/x86/dump_machdep.c Wed Oct 27 13:38:40 2010 (r214417) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -177,8 +176,8 @@ cb_dumpdata(struct md_pa *mdp, int seqnr if (maxdumppgs == 0) /* seatbelt */ maxdumppgs = 1; - printf(" chunk %d: %"PRIu64"MB (%"PRIu64" pages)", seqnr, PG2MB(pgs), - pgs); + printf(" chunk %d: %juMB (%ju pages)", seqnr, (uintmax_t)PG2MB(pgs), + (uintmax_t)pgs); while (pgs) { chunk = pgs; @@ -187,7 +186,7 @@ cb_dumpdata(struct md_pa *mdp, int seqnr sz = chunk << PAGE_SHIFT; counter += sz; if (counter >> 24) { - printf(" %"PRIu64, PG2MB(pgs)); + printf(" %ju", (uintmax_t)PG2MB(pgs)); counter &= (1<<24) - 1; } for (i = 0; i < chunk; i++) { Modified: projects/sv/usr.sbin/mfiutil/mfi_config.c ============================================================================== --- projects/sv/usr.sbin/mfiutil/mfi_config.c Wed Oct 27 13:16:48 2010 (r214416) +++ projects/sv/usr.sbin/mfiutil/mfi_config.c Wed Oct 27 13:38:40 2010 (r214417) @@ -29,12 +29,12 @@ * $FreeBSD$ */ -#include +#include #ifdef DEBUG #include #endif -#include #include +#include #include #ifdef DEBUG #include @@ -52,8 +52,6 @@ static void dump_config(int fd, struct m static int add_spare(int ac, char **av); static int remove_spare(int ac, char **av); -#define powerof2(x) ((((x)-1)&(x))==0) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 16:22:54 2010 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 E4C63106566C; Wed, 27 Oct 2010 16:22:54 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D30258FC18; Wed, 27 Oct 2010 16:22:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RGMs93013921; Wed, 27 Oct 2010 16:22:54 GMT (envelope-from jamie@svn.freebsd.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RGMsOf013917; Wed, 27 Oct 2010 16:22:54 GMT (envelope-from jamie@svn.freebsd.org) Message-Id: <201010271622.o9RGMsOf013917@svn.freebsd.org> From: Jamie Gritton Date: Wed, 27 Oct 2010 16:22:54 +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: r214423 - projects/jailconf/usr.sbin/jail 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, 27 Oct 2010 16:22:55 -0000 Author: jamie Date: Wed Oct 27 16:22:54 2010 New Revision: 214423 URL: http://svn.freebsd.org/changeset/base/214423 Log: Keep all internal/known parameter names in one place, and use enum constants everywhere else. Modified: projects/jailconf/usr.sbin/jail/config.c projects/jailconf/usr.sbin/jail/jail.c projects/jailconf/usr.sbin/jail/jailp.h Modified: projects/jailconf/usr.sbin/jail/config.c ============================================================================== --- projects/jailconf/usr.sbin/jail/config.c Wed Oct 27 16:01:57 2010 (r214422) +++ projects/jailconf/usr.sbin/jail/config.c Wed Oct 27 16:22:54 2010 (r214423) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); struct ipspec { const char *name; - enum intparam ipnum; unsigned flags; }; @@ -53,52 +52,57 @@ extern int yynerrs; struct cfjails cfjails = TAILQ_HEAD_INITIALIZER(cfjails); -static int cmp_intparam(const void *a, const void *b); static void free_param(struct cfparams *pp, struct cfparam *p); static void free_param_strings(struct cfparam *p); -/* Note these must be in sort order */ static const struct ipspec intparams[] = { - {"allow.dying", IP_ALLOW_DYING, PF_INTERNAL | PF_BOOL }, - {"allow.nodying", IP_ALLOW_DYING, PF_INTERNAL | PF_BOOL }, - {"command", IP_COMMAND, PF_INTERNAL }, - {"depend", IP_DEPEND, PF_INTERNAL }, - {"exec.clean", IP_EXEC_CLEAN, PF_INTERNAL | PF_BOOL }, - {"exec.consolelog", IP_EXEC_CONSOLELOG, PF_INTERNAL }, - {"exec.fib", IP_EXEC_FIB, PF_INTERNAL | PF_INT }, - {"exec.jail_user", IP_EXEC_JAIL_USER, PF_INTERNAL }, - {"exec.noclean", IP_EXEC_CLEAN, PF_INTERNAL | PF_BOOL }, - {"exec.nosystem_jail_user",IP_EXEC_SYSTEM_JAIL_USER,PF_INTERNAL | PF_BOOL }, - {"exec.poststart", IP_EXEC_POSTSTART, PF_INTERNAL }, - {"exec.poststop", IP_EXEC_POSTSTOP, PF_INTERNAL }, - {"exec.prestart", IP_EXEC_PRESTART, PF_INTERNAL }, - {"exec.prestop", IP_EXEC_PRESTOP, PF_INTERNAL }, - {"exec.start", IP_EXEC_START, PF_INTERNAL }, - {"exec.stop", IP_EXEC_STOP, PF_INTERNAL }, - {"exec.system_jail_user", IP_EXEC_SYSTEM_JAIL_USER, PF_INTERNAL | PF_BOOL }, - {"exec.system_user", IP_EXEC_SYSTEM_USER, PF_INTERNAL }, - {"exec.timeout", IP_EXEC_TIMEOUT, PF_INTERNAL | PF_INT }, - {"host.hostname", KP_HOSTNAME, 0 }, - {"interface", IP_INTERFACE, PF_INTERNAL }, - {"ip4.addr", KP_IP4_ADDR, 0 }, + [IP_ALLOW_DYING] = {"allow.dying", PF_INTERNAL | PF_BOOL}, + [IP_COMMAND] = {"command", PF_INTERNAL}, + [IP_DEPEND] = {"depend", PF_INTERNAL}, + [IP_EXEC_CLEAN] = {"exec.clean", PF_INTERNAL | PF_BOOL}, + [IP_EXEC_CONSOLELOG] = {"exec.consolelog", PF_INTERNAL}, + [IP_EXEC_FIB] = {"exec.fib", PF_INTERNAL | PF_INT}, + [IP_EXEC_JAIL_USER] = {"exec.jail_user", PF_INTERNAL}, + [IP_EXEC_POSTSTART] = {"exec.poststart", PF_INTERNAL}, + [IP_EXEC_POSTSTOP] = {"exec.poststop", PF_INTERNAL}, + [IP_EXEC_PRESTART] = {"exec.prestart", PF_INTERNAL}, + [IP_EXEC_PRESTOP] = {"exec.prestop", PF_INTERNAL}, + [IP_EXEC_START] = {"exec.start", PF_INTERNAL}, + [IP_EXEC_STOP] = {"exec.stop", PF_INTERNAL}, + [IP_EXEC_SYSTEM_JAIL_USER]= {"exec.system_jail_user", + PF_INTERNAL | PF_BOOL}, + [IP_EXEC_SYSTEM_USER] = {"exec.system_user", PF_INTERNAL}, + [IP_EXEC_TIMEOUT] = {"exec.timeout", PF_INTERNAL | PF_INT}, + [IP_INTERFACE] = {"interface", PF_INTERNAL}, + [IP_IP_HOSTNAME] = {"ip_hostname", PF_INTERNAL | PF_BOOL}, + [IP_MOUNT] = {"mount", PF_INTERNAL}, + [IP_MOUNT_DEVFS] = {"mount.devfs", PF_INTERNAL | PF_BOOL}, + [IP_MOUNT_DEVFS_RULESET]= {"mount.devfs.ruleset", PF_INTERNAL}, + [IP_MOUNT_FSTAB] = {"mount.fstab", PF_INTERNAL}, + [IP_STOP_TIMEOUT] = {"stop.timeout", PF_INTERNAL | PF_INT}, + [IP_VNET_INTERFACE] = {"vnet.interface", PF_INTERNAL}, + [IP__IP4_IFADDR] = {"ip4.addr", PF_INTERNAL | PF_CONV}, #ifdef INET6 - {"ip6.addr", KP_IP6_ADDR, 0 }, + [IP__IP6_IFADDR] = {"ip6.addr", PF_INTERNAL | PF_CONV}, #endif - {"ip_hostname", IP_IP_HOSTNAME, PF_INTERNAL | PF_BOOL }, - {"jid", KP_JID, PF_INT }, - {"mount", IP_MOUNT, PF_INTERNAL }, - {"mount.devfs", IP_MOUNT_DEVFS, PF_INTERNAL | PF_BOOL }, - {"mount.devfs.ruleset", IP_MOUNT_DEVFS_RULESET, PF_INTERNAL }, - {"mount.fstab", IP_MOUNT_FSTAB, PF_INTERNAL }, - {"mount.nodevfs", IP_MOUNT_DEVFS, PF_INTERNAL | PF_BOOL }, - {"name", KP_NAME, 0 }, - {"noip_hostname", IP_IP_HOSTNAME, PF_INTERNAL | PF_BOOL }, - {"nopersist", KP_PERSIST, PF_BOOL }, - {"path", KP_PATH, 0 }, - {"persist", KP_PERSIST, PF_BOOL }, - {"stop.timeout", IP_STOP_TIMEOUT, PF_INTERNAL | PF_INT }, - {"vnet", KP_VNET, 0 }, - {"vnet.interface", IP_VNET_INTERFACE, PF_INTERNAL }, + [KP_ALLOW_CHFLAGS] = {"allow.chflags", 0}, + [KP_ALLOW_MOUNT] = {"allow.mount", 0}, + [KP_ALLOW_RAW_SOCKETS] = {"allow.raw_sockets", 0}, + [KP_ALLOW_SET_HOSTNAME]= {"allow.set_hostname", 0}, + [KP_ALLOW_SOCKET_AF] = {"allow.socket_af", 0}, + [KP_ALLOW_SYSVIPC] = {"allow.sysvipc", 0}, + [KP_ENFORCE_STATFS] = {"enforce_statfs", 0}, + [KP_HOST_HOSTNAME] = {"host.hostname", 0}, + [KP_IP4_ADDR] = {"ip4.addr", 0}, +#ifdef INET6 + [KP_IP6_ADDR] = {"ip6.addr", 0}, +#endif + [KP_JID] = {"jid", 0}, + [KP_NAME] = {"name", 0}, + [KP_PATH] = {"path", 0}, + [KP_PERSIST] = {"persist", 0}, + [KP_SECURELEVEL] = {"securelevel", 0}, + [KP_VNET] = {"vnet", 0}, }; /* @@ -146,7 +150,7 @@ load_config(void) * though they may also be explicitly set later on. */ add_param(j, NULL, - strtol(j->name, &ep, 10) && !*ep ? "jid" : "name", + strtol(j->name, &ep, 10) && !*ep ? KP_JID : KP_NAME, j->name); /* * Collect parameters for the jail, global parameters/variables, @@ -156,16 +160,16 @@ load_config(void) TAILQ_FOREACH(wj, &wild, tq) { if (j->seq < wj->seq && !did_self) { TAILQ_FOREACH(p, &opp, tq) - add_param(j, p, NULL, NULL); + add_param(j, p, 0, NULL); did_self = 1; } if (wild_jail_match(j->name, wj->name)) TAILQ_FOREACH(p, &wj->params, tq) - add_param(j, p, NULL, NULL); + add_param(j, p, 0, NULL); } if (!did_self) TAILQ_FOREACH(p, &opp, tq) - add_param(j, p, NULL, NULL); + add_param(j, p, 0, NULL); /* Resolve any variable substitutions. */ pgen = 0; @@ -274,13 +278,16 @@ add_jail(void) * Add a parameter to a jail. */ void -add_param(struct cfjail *j, const struct cfparam *p, const char *name, +add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum, const char *value) { struct cfstrings nss; struct cfparam *dp, *np; struct cfstring *s, *ns; struct cfvar *v, *nv; + struct ipspec *ips; + const char *name; + char *cs, *tname; unsigned flags; if (j == NULL) { @@ -312,6 +319,18 @@ add_param(struct cfjail *j, const struct } } else { flags = PF_APPEND; + if (ipnum != 0) { + name = intparams[ipnum].name; + flags |= intparams[ipnum].flags; + } else if ((cs = strchr(value, '='))) { + tname = alloca(cs - value + 1); + strlcpy(tname, value, cs - value + 1); + name = tname; + value = cs + 1; + } else { + name = value; + value = NULL; + } if (value != NULL) { ns = emalloc(sizeof(struct cfstring)); ns->s = estrdup(value); @@ -322,21 +341,23 @@ add_param(struct cfjail *j, const struct } /* See if this parameter has already been added. */ - TAILQ_FOREACH(dp, &j->params, tq) { - if (equalopts(dp->name, name)) { - /* Found it - append or replace. */ - if (strcmp(dp->name, name)) { - free(dp->name); - dp->name = estrdup(name); - } - if (!(flags & PF_APPEND) || STAILQ_EMPTY(&nss)) - free_param_strings(dp); - STAILQ_CONCAT(&dp->val, &nss); - dp->flags |= flags; - break; - } - } - if (dp == NULL) { + if (ipnum != 0) + dp = j->intparams[ipnum]; + else + TAILQ_FOREACH(dp, &j->params, tq) + if (!(dp->flags & PF_CONV) && equalopts(dp->name, name)) + break; + if (dp != NULL) { + /* Found it - append or replace. */ + if (strcmp(dp->name, name)) { + free(dp->name); + dp->name = estrdup(name); + } + if (!(flags & PF_APPEND) || STAILQ_EMPTY(&nss)) + free_param_strings(dp); + STAILQ_CONCAT(&dp->val, &nss); + dp->flags |= flags; + } else { /* Not found - add it. */ np = emalloc(sizeof(struct cfparam)); np->name = estrdup(name); @@ -345,29 +366,16 @@ add_param(struct cfjail *j, const struct np->flags = flags; np->gen = 0; TAILQ_INSERT_TAIL(&j->params, np, tq); - } -} - -/* - * Find internal or known parameters. - */ -void -find_intparams(void) -{ - struct cfjail *j; - struct cfparam *p; - struct ipspec *ip; - - TAILQ_FOREACH(j, &cfjails, tq) { - TAILQ_FOREACH(p, &j->params, tq) { - ip = bsearch(p->name, intparams, - sizeof(intparams) / sizeof(intparams[0]), - sizeof(struct ipspec), cmp_intparam); - if (ip != NULL) { - j->intparams[ip->ipnum] = p; - p->flags |= ip->flags; - } - } + if (ipnum != 0) + j->intparams[ipnum] = np; + else + for (ipnum = 1; ipnum < IP_NPARAM; ipnum++) + if (!(intparams[ipnum].flags & PF_CONV) && + equalopts(name, intparams[ipnum].name)) { + j->intparams[ipnum] = np; + np->flags |= intparams[ipnum].flags; + break; + } } } @@ -457,7 +465,6 @@ ip_params(struct cfjail *j) { struct in_addr addr4; struct addrinfo hints, *ai0, *ai; - struct cfparam *np; struct cfstring *s, *ns; char *cs, *ep; const char *hostname; @@ -477,7 +484,7 @@ ip_params(struct cfjail *j) * for any IP addresses it finds. */ if (bool_param(j->intparams[IP_IP_HOSTNAME]) && - (hostname = string_param(j->intparams[KP_HOSTNAME]))) { + (hostname = string_param(j->intparams[KP_HOST_HOSTNAME]))) { j->intparams[IP_IP_HOSTNAME] = NULL; /* * Silently ignore unsupported address families from @@ -526,7 +533,7 @@ ip_params(struct cfjail *j) &addr4, avalue4, INET_ADDRSTRLEN) == NULL) err(1, "inet_ntop"); - add_param(j, NULL, "ip4.addr", + add_param(j, NULL, KP_IP4_ADDR, avalue4); break; #ifdef INET6 @@ -539,7 +546,7 @@ ip_params(struct cfjail *j) &addr6, avalue6, INET6_ADDRSTRLEN) == NULL) err(1, "inet_ntop"); - add_param(j, NULL, "ip6.addr", + add_param(j, NULL, KP_IP6_ADDR, avalue6); break; #endif @@ -562,28 +569,14 @@ ip_params(struct cfjail *j) { if (j->intparams[KP_IP4_ADDR + isip6] == NULL) continue; - np = j->intparams[IP__IP4_IFADDR + isip6]; STAILQ_FOREACH(s, &j->intparams[KP_IP4_ADDR + isip6]->val, tq) { cs = strchr(s->s, '|'); - if (cs || defif) { - if (np == NULL) { - np = j->intparams[IP__IP4_IFADDR + - isip6] = - emalloc(sizeof(struct cfparam)); - np->name = estrdup(j->intparams - [KP_IP4_ADDR + isip6]->name); - STAILQ_INIT(&np->val); - np->flags = PF_INTERNAL; - } - ns = emalloc(sizeof(struct cfstring)); - ns->s = estrdup(s->s); - ns->len = s->len; - STAILQ_INIT(&ns->vars); - STAILQ_INSERT_TAIL(&np->val, ns, tq); - if (cs != NULL) { - strcpy(s->s, cs + 1); - s->len -= cs - s->s + 1; - } + if (cs || defif) + add_param(j, NULL, IP__IP4_IFADDR + isip6, + s->s); + if (cs) { + strcpy(s->s, cs + 1); + s->len -= cs + 1 - s->s; } if ((cs = strchr(s->s, '/'))) { prefix = strtol(cs + 1, &ep, 10); @@ -746,16 +739,6 @@ wild_jail_name(const char *wname) } /* - * Compare strings and intparams for bsearch. - */ - -static int -cmp_intparam(const void *a, const void *b) -{ - return strcmp((const char *)a, ((const struct ipspec *)b)->name); -} - -/* * Free a parameter record and all its strings and variables. */ static void Modified: projects/jailconf/usr.sbin/jail/jail.c ============================================================================== --- projects/jailconf/usr.sbin/jail/jail.c Wed Oct 27 16:01:57 2010 (r214422) +++ projects/jailconf/usr.sbin/jail/jail.c Wed Oct 27 16:22:54 2010 (r214423) @@ -48,6 +48,12 @@ __FBSDID("$FreeBSD$"); #define JP_RDTUN(jp) (((jp)->jp_ctltype & CTLFLAG_RDTUN) == CTLFLAG_RDTUN) +struct permspec { + const char *name; + enum intparam ipnum; + int rev; +}; + const char *cfname; int verbose; @@ -63,19 +69,13 @@ static void print_param(FILE *fp, const static void quoted_print(FILE *fp, char *str); static void usage(void); -static const char *perm_sysctl[][3] = { - { "security.jail.set_hostname_allowed", - "allow.noset_hostname", "allow.set_hostname" }, - { "security.jail.sysvipc_allowed", - "allow.nosysvipc", "allow.sysvipc" }, - { "security.jail.allow_raw_sockets", - "allow.noraw_sockets", "allow.raw_sockets" }, - { "security.jail.chflags_allowed", - "allow.nochflags", "allow.chflags" }, - { "security.jail.mount_allowed", - "allow.nomount", "allow.mount" }, - { "security.jail.socket_unixiproute_only", - "allow.socket_af", "allow.nosocket_af" }, +static struct permspec perm_sysctl[] = { + { "security.jail.set_hostname_allowed", KP_ALLOW_SET_HOSTNAME, 0 }, + { "security.jail.sysvipc_allowed", KP_ALLOW_SYSVIPC, 0 }, + { "security.jail.allow_raw_sockets", KP_ALLOW_RAW_SOCKETS, 0 }, + { "security.jail.chflags_allowed", KP_ALLOW_CHFLAGS, 0 }, + { "security.jail.mount_allowed", KP_ALLOW_MOUNT, 0 }, + { "security.jail.socket_unixiproute_only", KP_ALLOW_SOCKET_AF, 1 }, }; int @@ -113,7 +113,7 @@ main(int argc, char **argv) cfname = optarg; break; case 'h': - add_param(NULL, NULL, "ip_hostname", NULL); + add_param(NULL, NULL, IP_IP_HOSTNAME, NULL); docf = 0; break; case 'i': @@ -124,14 +124,14 @@ main(int argc, char **argv) JidFile = optarg; break; case 'l': - add_param(NULL, NULL, "exec.clean", NULL); + add_param(NULL, NULL, IP_EXEC_CLEAN, NULL); docf = 0; break; case 'm': op |= JF_SET; break; case 'n': - add_param(NULL, NULL, "name", optarg); + add_param(NULL, NULL, KP_NAME, optarg); docf = 0; break; case 'p': @@ -150,17 +150,18 @@ main(int argc, char **argv) Rflag = 1; break; case 's': - add_param(NULL, NULL, "securelevel", optarg); + add_param(NULL, NULL, KP_SECURELEVEL, optarg); docf = 0; break; case 'u': - add_param(NULL, NULL, "exec.jail_user", optarg); - add_param(NULL, NULL, "exec.system_jail_user", NULL); + add_param(NULL, NULL, IP_EXEC_JAIL_USER, optarg); + add_param(NULL, NULL, IP_EXEC_SYSTEM_JAIL_USER, NULL); docf = 0; break; case 'U': - add_param(NULL, NULL, "exec.jail_user", optarg); - add_param(NULL, NULL, "exec.nosystem_jail_user", NULL); + add_param(NULL, NULL, IP_EXEC_JAIL_USER, optarg); + add_param(NULL, NULL, IP_EXEC_SYSTEM_JAIL_USER, + "false"); docf = 0; break; case 'v': @@ -182,8 +183,8 @@ main(int argc, char **argv) op = JF_START; docf = 0; oldcl = 1; - add_param(NULL, NULL, "path", argv[0]); - add_param(NULL, NULL, "host.hostname", argv[1]); + add_param(NULL, NULL, KP_PATH, argv[0]); + add_param(NULL, NULL, KP_HOST_HOSTNAME, argv[1]); if (argv[2][0] != '\0') { for (cs = argv[2];; cs = ncs + 1) { ncs = strchr(cs, ','); @@ -192,15 +193,15 @@ main(int argc, char **argv) add_param(NULL, NULL, #ifdef INET6 inet_pton(AF_INET6, cs, &addr6) == 1 - ? "ip6.addr" : + ? KP_IP6_ADDR : #endif - "ip4.addr", cs); + KP_IP4_ADDR, cs); if (!ncs) break; } } for (i = 3; i < argc; i++) - add_param(NULL, NULL, "command", argv[i]); + add_param(NULL, NULL, IP_COMMAND, argv[i]); /* Emulate the defaults from security.jail.* sysctls. */ sysvallen = sizeof(sysval); if (sysctlbyname("security.jail.jailed", &sysval, &sysvallen, @@ -208,18 +209,20 @@ main(int argc, char **argv) for (pi = 0; pi < sizeof(perm_sysctl) / sizeof(perm_sysctl[0]); pi++) { sysvallen = sizeof(sysval); - if (sysctlbyname(perm_sysctl[pi][0], + if (sysctlbyname(perm_sysctl[pi].name, &sysval, &sysvallen, NULL, 0) == 0) add_param(NULL, NULL, - perm_sysctl[pi][sysval ? 2 : 1], - NULL); + perm_sysctl[pi].ipnum, + (sysval ? 1 : 0) ^ + perm_sysctl[pi].rev + ? NULL : "false"); } sysvallen = sizeof(sysval); if (sysctlbyname("security.jail.enforce_statfs", &sysval, &sysvallen, NULL, 0) == 0) { snprintf(enforce_statfs, sizeof(enforce_statfs), "%d", sysval); - add_param(NULL, NULL, "enforce_statfs", + add_param(NULL, NULL, KP_ENFORCE_STATFS, enforce_statfs); } } @@ -243,16 +246,14 @@ main(int argc, char **argv) if (!strncmp(argv[i], "command", 7) && (argv[i][7] == '\0' || argv[i][7] == '=')) { if (argv[i][7] == '=') - add_param(NULL, NULL, "command", + add_param(NULL, NULL, IP_COMMAND, argv[i] + 8); for (i++; i < argc; i++) - add_param(NULL, NULL, "command", + add_param(NULL, NULL, IP_COMMAND, argv[i]); break; } - if ((cs = strchr(argv[i], '='))) - *cs++ = '\0'; - add_param(NULL, NULL, argv[i], cs); + add_param(NULL, NULL, 0, argv[i]); } } else { /* From the config file, perhaps with a specified jail */ @@ -262,7 +263,6 @@ main(int argc, char **argv) } /* Find out which jails will be run. */ - find_intparams(); dep_setup(docf); error = 0; if (op == JF_STOP) { @@ -315,7 +315,7 @@ main(int argc, char **argv) { j->flags |= JF_CHECKINT; if (dflag) - add_param(j, NULL, "allow.dying", NULL); + add_param(j, NULL, IP_ALLOW_DYING, NULL); if (check_intparams(j) < 0) continue; } @@ -959,7 +959,7 @@ print_jail(FILE *fp, struct cfjail *j, i fprintf(fp, "%d\t", j->jid); print_param(fp, j->intparams[KP_PATH], ',', 0); putc('\t', fp); - print_param(fp, j->intparams[KP_HOSTNAME], ',', 0); + print_param(fp, j->intparams[KP_HOST_HOSTNAME], ',', 0); putc('\t', fp); print_param(fp, j->intparams[KP_IP4_ADDR], ',', 0); #ifdef INET6 Modified: projects/jailconf/usr.sbin/jail/jailp.h ============================================================================== --- projects/jailconf/usr.sbin/jail/jailp.h Wed Oct 27 16:01:57 2010 (r214422) +++ projects/jailconf/usr.sbin/jail/jailp.h Wed Oct 27 16:22:54 2010 (r214423) @@ -49,6 +49,7 @@ #define PF_INTERNAL 0x08 /* Internal parameter, not passed to kernel */ #define PF_BOOL 0x10 /* Boolean parameter */ #define PF_INT 0x20 /* Integer parameter */ +#define PF_CONV 0x40 /* Parameter duplicated in converted form */ #define JF_START 0x0001 /* -c */ #define JF_SET 0x0002 /* -m */ @@ -93,16 +94,23 @@ enum intparam { IP_INTERFACE, /* Add IP addresses to this interface */ IP_IP_HOSTNAME, /* Get jail IP address(es) from hostname */ IP_MOUNT, /* Mount points in fstab(5) form */ - IP_MOUNT_FSTAB, /* A standard fstab(5) file */ IP_MOUNT_DEVFS, /* Mount /dev under prison root */ IP_MOUNT_DEVFS_RULESET, /* Ruleset for the devfs mount */ + IP_MOUNT_FSTAB, /* A standard fstab(5) file */ IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */ + IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */ IP__IP4_IFADDR, /* Copy of ip4.addr with interface/netmask */ #ifdef INET6 IP__IP6_IFADDR, /* Copy of ip6.addr with interface/prefixlen */ #endif - IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */ - KP_HOSTNAME, + KP_ALLOW_CHFLAGS, + KP_ALLOW_MOUNT, + KP_ALLOW_RAW_SOCKETS, + KP_ALLOW_SET_HOSTNAME, + KP_ALLOW_SOCKET_AF, + KP_ALLOW_SYSVIPC, + KP_ENFORCE_STATFS, + KP_HOST_HOSTNAME, KP_IP4_ADDR, #ifdef INET6 KP_IP6_ADDR, @@ -111,6 +119,7 @@ enum intparam { KP_NAME, KP_PATH, KP_PERSIST, + KP_SECURELEVEL, KP_VNET, IP_NPARAM }; @@ -187,8 +196,7 @@ extern int term_procs(struct cfjail *j); extern void load_config(void); extern struct cfjail *add_jail(void); extern void add_param(struct cfjail *j, const struct cfparam *p, - const char *name, const char *value); -extern void find_intparams(void); + enum intparam ipnum, const char *value); extern int check_intparams(struct cfjail *j); extern int bool_param(const struct cfparam *p); extern int int_param(const struct cfparam *p, int *ip); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 16:35:23 2010 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 7BECF1065672; Wed, 27 Oct 2010 16:35:23 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6B83F8FC17; Wed, 27 Oct 2010 16:35:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RGZNgD014371; Wed, 27 Oct 2010 16:35:23 GMT (envelope-from jamie@svn.freebsd.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RGZNAg014369; Wed, 27 Oct 2010 16:35:23 GMT (envelope-from jamie@svn.freebsd.org) Message-Id: <201010271635.o9RGZNAg014369@svn.freebsd.org> From: Jamie Gritton Date: Wed, 27 Oct 2010 16:35:23 +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: r214424 - projects/jailconf/usr.sbin/jail 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, 27 Oct 2010 16:35:23 -0000 Author: jamie Date: Wed Oct 27 16:35:23 2010 New Revision: 214424 URL: http://svn.freebsd.org/changeset/base/214424 Log: Don't assume either jid or name is set - they may not be from the command line. Modified: projects/jailconf/usr.sbin/jail/jail.c Modified: projects/jailconf/usr.sbin/jail/jail.c ============================================================================== --- projects/jailconf/usr.sbin/jail/jail.c Wed Oct 27 16:22:54 2010 (r214423) +++ projects/jailconf/usr.sbin/jail/jail.c Wed Oct 27 16:35:23 2010 (r214424) @@ -891,8 +891,7 @@ running_jid(struct cfjail *j, int dflag) char *ep; int jid; - pval = string_param(j->intparams[KP_JID]); - if (pval != NULL) { + if ((pval = string_param(j->intparams[KP_JID]))) { if (!(jid = strtol(pval, &ep, 10)) || *ep) { j->jid = -1; return; @@ -901,13 +900,15 @@ running_jid(struct cfjail *j, int dflag) jiov[0].iov_len = sizeof("jid"); jiov[1].iov_base = &jid; jiov[1].iov_len = sizeof(jid); - } else { - pval = string_param(j->intparams[KP_NAME]); + } else if ((pval = string_param(j->intparams[KP_NAME]))) { *(const void **)&jiov[0].iov_base = "name"; jiov[0].iov_len = sizeof("name"); jiov[1].iov_len = strlen(pval) + 1; jiov[1].iov_base = alloca(jiov[1].iov_len); strcpy(jiov[1].iov_base, pval); + } else { + j->jid = -1; + return; } j->jid = jail_get(jiov, 2, dflag ? JAIL_DYING : 0); } From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 20:25:55 2010 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 A791D106566B; Wed, 27 Oct 2010 20:25:55 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 970C68FC26; Wed, 27 Oct 2010 20:25:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RKPtvI027805; Wed, 27 Oct 2010 20:25:55 GMT (envelope-from jamie@svn.freebsd.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RKPtsM027803; Wed, 27 Oct 2010 20:25:55 GMT (envelope-from jamie@svn.freebsd.org) Message-Id: <201010272025.o9RKPtsM027803@svn.freebsd.org> From: Jamie Gritton Date: Wed, 27 Oct 2010 20:25:55 +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: r214433 - projects/jailconf/usr.sbin/jail 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, 27 Oct 2010 20:25:55 -0000 Author: jamie Date: Wed Oct 27 20:25:55 2010 New Revision: 214433 URL: http://svn.freebsd.org/changeset/base/214433 Log: Use a little more "ifdef INET6". Modified: projects/jailconf/usr.sbin/jail/config.c Modified: projects/jailconf/usr.sbin/jail/config.c ============================================================================== --- projects/jailconf/usr.sbin/jail/config.c Wed Oct 27 19:01:09 2010 (r214432) +++ projects/jailconf/usr.sbin/jail/config.c Wed Oct 27 20:25:55 2010 (r214433) @@ -580,13 +580,23 @@ ip_params(struct cfjail *j) } if ((cs = strchr(s->s, '/'))) { prefix = strtol(cs + 1, &ep, 10); - if (!isip6 && *ep == '.' + if ( +#ifdef INET6 + !isip6 && +#endif + *ep == '.' ? inet_pton(AF_INET, cs + 1, &addr4) != 1 - : *ep || prefix < 0 || prefix > - (isip6 ? 128 : 32)) { - jail_warnx(j, isip6 - ? "ip6.addr: bad prefixlen \"%s\"" - : "ip4.addr: bad netmask \"%s\"", + : *ep || prefix < 0 || prefix > ( +#ifdef INET6 + isip6 ? 128 : +#endif + 32)) { + jail_warnx(j, +#ifdef INET6 + isip6 + ? "ip6.addr: bad prefixlen \"%s\"" : +#endif + "ip4.addr: bad netmask \"%s\"", cs); error = -1; } From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 23:18:26 2010 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 04F201065674; Wed, 27 Oct 2010 23:18:26 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E79968FC0C; Wed, 27 Oct 2010 23:18:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RNIPt9043363; Wed, 27 Oct 2010 23:18:25 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RNIPAT043359; Wed, 27 Oct 2010 23:18:25 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010272318.o9RNIPAT043359@svn.freebsd.org> From: Jeff Roberson Date: Wed, 27 Oct 2010 23:18:25 +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: r214435 - in projects/ofed/head/sys: kern ofed/include/linux sys 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, 27 Oct 2010 23:18:26 -0000 Author: jeff Date: Wed Oct 27 23:18:25 2010 New Revision: 214435 URL: http://svn.freebsd.org/changeset/base/214435 Log: - Add intr_drain(), a mechanism to wait for any interrupt handlers currently running on an ithread to complete. This is used to synchronize the release of state that may be accessed by interrupt context. - Use intr_drain() in synchronize_irq(). Discussed with: jhb Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/kern/kern_intr.c projects/ofed/head/sys/ofed/include/linux/hardirq.h projects/ofed/head/sys/sys/interrupt.h Modified: projects/ofed/head/sys/kern/kern_intr.c ============================================================================== --- projects/ofed/head/sys/kern/kern_intr.c Wed Oct 27 21:01:53 2010 (r214434) +++ projects/ofed/head/sys/kern/kern_intr.c Wed Oct 27 23:18:25 2010 (r214435) @@ -74,6 +74,7 @@ struct intr_thread { /* Interrupt thread flags kept in it_flags */ #define IT_DEAD 0x000001 /* Thread is waiting to exit. */ +#define IT_WAIT 0x000001 /* Thread is waiting for completion. */ struct intr_entropy { struct thread *td; @@ -739,6 +740,38 @@ intr_handler_source(void *cookie) return (ie->ie_source); } +/* + * Sleep until an ithread finishes executing an interrupt handler. + * + * XXX Doesn't currently handle interrupt filters or fast interrupt + * handlers. + */ +void +intr_drain(int irq) +{ + struct mtx *mtx; + struct intr_event *ie; + struct intr_thread *ithd; + struct thread *td; + + ie = intr_lookup(irq); + if (ie == NULL) + return; + if (ie->ie_thread == NULL) + return; + ithd = ie->ie_thread; + td = ithd->it_thread; + thread_lock(td); + mtx = td->td_lock; + if (!TD_AWAITING_INTR(td)) { + ithd->it_flags |= IT_WAIT; + msleep_spin(ithd, mtx, "isync", 0); + } + mtx_unlock_spin(mtx); + return; +} + + #ifndef INTR_FILTER int intr_event_remove_handler(void *cookie) @@ -1275,6 +1308,7 @@ ithread_loop(void *arg) struct intr_event *ie; struct thread *td; struct proc *p; + int wake; td = curthread; p = td->td_proc; @@ -1283,6 +1317,7 @@ ithread_loop(void *arg) ("%s: ithread and proc linkage out of sync", __func__)); ie = ithd->it_event; ie->ie_count = 0; + wake = 0; /* * As long as we have interrupts outstanding, go through the @@ -1323,12 +1358,20 @@ ithread_loop(void *arg) * set again, so we have to check it again. */ thread_lock(td); - if (!ithd->it_need && !(ithd->it_flags & IT_DEAD)) { + if (!ithd->it_need && !(ithd->it_flags & (IT_DEAD | IT_WAIT))) { TD_SET_IWAIT(td); ie->ie_count = 0; mi_switch(SW_VOL | SWT_IWAIT, NULL); } + if (ithd->it_flags & IT_WAIT) { + wake = 1; + ithd->it_flags &= ~IT_WAIT; + } thread_unlock(td); + if (wake) { + wakeup(ithd); + wake = 0; + } } } @@ -1439,6 +1482,7 @@ ithread_loop(void *arg) struct thread *td; struct proc *p; int priv; + int wake; td = curthread; p = td->td_proc; @@ -1449,6 +1493,7 @@ ithread_loop(void *arg) ("%s: ithread and proc linkage out of sync", __func__)); ie = ithd->it_event; ie->ie_count = 0; + wake = 0; /* * As long as we have interrupts outstanding, go through the @@ -1492,12 +1537,20 @@ ithread_loop(void *arg) * set again, so we have to check it again. */ thread_lock(td); - if (!ithd->it_need && !(ithd->it_flags & IT_DEAD)) { + if (!ithd->it_need && !(ithd->it_flags & (IT_DEAD | IT_WAIT))) { TD_SET_IWAIT(td); ie->ie_count = 0; mi_switch(SW_VOL | SWT_IWAIT, NULL); } + if (ithd->it_flags & IT_WAIT) { + wake = 1; + ithd->it_flags &= ~IT_WAIT; + } thread_unlock(td); + if (wake) { + wakeup(ithd); + wake = 0; + } } } Modified: projects/ofed/head/sys/ofed/include/linux/hardirq.h ============================================================================== --- projects/ofed/head/sys/ofed/include/linux/hardirq.h Wed Oct 27 21:01:53 2010 (r214434) +++ projects/ofed/head/sys/ofed/include/linux/hardirq.h Wed Oct 27 23:18:25 2010 (r214435) @@ -28,6 +28,12 @@ #ifndef _LINUX_HARDIRQ_H_ #define _LINUX_HARDIRQ_H_ -#define synchronize_irq(irq) printf("synchronize_irq: Unimplemented\n") +#include + +#include +#include +#include + +#define synchronize_irq(irq) intr_drain((irq)) #endif /* _LINUX_HARDIRQ_H_ */ Modified: projects/ofed/head/sys/sys/interrupt.h ============================================================================== --- projects/ofed/head/sys/sys/interrupt.h Wed Oct 27 21:01:53 2010 (r214434) +++ projects/ofed/head/sys/sys/interrupt.h Wed Oct 27 23:18:25 2010 (r214435) @@ -177,6 +177,7 @@ int intr_event_remove_handler(void *cook int intr_getaffinity(int irq, void *mask); void *intr_handler_source(void *cookie); int intr_setaffinity(int irq, void *mask); +void intr_drain(int irq); int swi_add(struct intr_event **eventp, const char *name, driver_intr_t handler, void *arg, int pri, enum intr_type flags, void **cookiep); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 23:21:31 2010 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 06B281065674; Wed, 27 Oct 2010 23:21:31 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E8D7B8FC08; Wed, 27 Oct 2010 23:21:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RNLU3W043726; Wed, 27 Oct 2010 23:21:30 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RNLU1m043721; Wed, 27 Oct 2010 23:21:30 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010272321.o9RNLU1m043721@svn.freebsd.org> From: Jeff Roberson Date: Wed, 27 Oct 2010 23:21:30 +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: r214436 - in projects/ofed/head/sys: ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mthca vm 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, 27 Oct 2010 23:21:31 -0000 Author: jeff Date: Wed Oct 27 23:21:30 2010 New Revision: 214436 URL: http://svn.freebsd.org/changeset/base/214436 Log: - Add a new flag to vm_map_wire(), VM_MAP_WIRE_WRITE which checks for write access when adding a wired region. This is required when ib's umem requests write access. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/ofed/head/sys/vm/vm_map.c projects/ofed/head/sys/vm/vm_map.h Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c Wed Oct 27 23:18:25 2010 (r214435) +++ projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c Wed Oct 27 23:21:30 2010 (r214436) @@ -327,7 +327,8 @@ out: return ERR_PTR(-EAGAIN); } error = vm_map_wire(&proc->p_vmspace->vm_map, start, end, - VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES); + VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES | + umem->writable ? VM_MAP_WIRE_WRITE : 0); if (error != KERN_SUCCESS) { kfree(umem); return ERR_PTR(-ENOMEM); Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c Wed Oct 27 23:18:25 2010 (r214435) +++ projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c Wed Oct 27 23:21:30 2010 (r214436) @@ -564,8 +564,7 @@ out: } start = uaddr & PAGE_MASK; ret = vm_map_wire(&proc->p_vmspace->vm_map, start, start + PAGE_SIZE, - VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES /* | VM_MAP_WIRE_READ | - VM_MAP_WIRE_WRITE */); + VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES | VM_MAP_WIRE_WRITE); if (ret != KERN_SUCCESS) { start = 0; ret = -ENOMEM; Modified: projects/ofed/head/sys/vm/vm_map.c ============================================================================== --- projects/ofed/head/sys/vm/vm_map.c Wed Oct 27 23:18:25 2010 (r214435) +++ projects/ofed/head/sys/vm/vm_map.c Wed Oct 27 23:21:30 2010 (r214436) @@ -2299,7 +2299,11 @@ vm_map_wire(vm_map_t map, vm_offset_t st unsigned int last_timestamp; int rv; boolean_t fictitious, need_wakeup, result, user_wire; + vm_prot_t prot; + prot = VM_PROT_READ | VM_PROT_EXECUTE; + if (flags & VM_MAP_WIRE_WRITE) + prot |= VM_PROT_WRITE; user_wire = (flags & VM_MAP_WIRE_USER) ? TRUE : FALSE; vm_map_lock(map); VM_MAP_RANGE_CHECK(map, start, end); @@ -2367,20 +2371,16 @@ vm_map_wire(vm_map_t map, vm_offset_t st * above.) */ entry->eflags |= MAP_ENTRY_IN_TRANSITION; - /* - * - */ - if (entry->wired_count == 0) { - if ((entry->protection & (VM_PROT_READ|VM_PROT_EXECUTE)) - == 0) { - entry->eflags |= MAP_ENTRY_WIRE_SKIPPED; - if ((flags & VM_MAP_WIRE_HOLESOK) == 0) { - end = entry->end; - rv = KERN_INVALID_ADDRESS; - goto done; - } - goto next_entry; + if ((entry->protection & prot) != prot) { + entry->eflags |= MAP_ENTRY_WIRE_SKIPPED; + if ((flags & VM_MAP_WIRE_HOLESOK) == 0) { + end = entry->end; + rv = KERN_INVALID_ADDRESS; + goto done; } + goto next_entry; + } + if (entry->wired_count == 0) { entry->wired_count++; saved_start = entry->start; saved_end = entry->end; Modified: projects/ofed/head/sys/vm/vm_map.h ============================================================================== --- projects/ofed/head/sys/vm/vm_map.h Wed Oct 27 23:18:25 2010 (r214435) +++ projects/ofed/head/sys/vm/vm_map.h Wed Oct 27 23:21:30 2010 (r214436) @@ -339,6 +339,8 @@ long vmspace_wired_count(struct vmspace #define VM_MAP_WIRE_NOHOLES 0 /* region must not have holes */ #define VM_MAP_WIRE_HOLESOK 2 /* region may have holes */ +#define VM_MAP_WIRE_WRITE 4 /* Validate writable. */ + #ifdef _KERNEL boolean_t vm_map_check_protection (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t); vm_map_t vm_map_create(pmap_t, vm_offset_t, vm_offset_t); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 23:22:44 2010 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 684771065716; Wed, 27 Oct 2010 23:22:44 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CF93B8FC16; Wed, 27 Oct 2010 23:22:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RNMhRE043910; Wed, 27 Oct 2010 23:22:43 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RNMhdE043906; Wed, 27 Oct 2010 23:22:43 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010272322.o9RNMhdE043906@svn.freebsd.org> From: Jeff Roberson Date: Wed, 27 Oct 2010 23:22:43 +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: r214437 - projects/ofed/head/sys/netinet6 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, 27 Oct 2010 23:22:44 -0000 Author: jeff Date: Wed Oct 27 23:22:43 2010 New Revision: 214437 URL: http://svn.freebsd.org/changeset/base/214437 Log: - Treat IFT_INFINIBAND just like IFT_ETHER in most cases, even when default: would DTRT add explicit switch labels for ib. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/netinet6/in6.c projects/ofed/head/sys/netinet6/nd6.c projects/ofed/head/sys/netinet6/nd6_nbr.c Modified: projects/ofed/head/sys/netinet6/in6.c ============================================================================== --- projects/ofed/head/sys/netinet6/in6.c Wed Oct 27 23:21:30 2010 (r214436) +++ projects/ofed/head/sys/netinet6/in6.c Wed Oct 27 23:22:43 2010 (r214437) @@ -2281,6 +2281,7 @@ in6_if2idlen(struct ifnet *ifp) #ifdef IFT_MIP case IFT_MIP: /* ditto */ #endif + case IFT_INFINIBAND: return (64); case IFT_FDDI: /* RFC2467 */ return (64); Modified: projects/ofed/head/sys/netinet6/nd6.c ============================================================================== --- projects/ofed/head/sys/netinet6/nd6.c Wed Oct 27 23:21:30 2010 (r214436) +++ projects/ofed/head/sys/netinet6/nd6.c Wed Oct 27 23:22:43 2010 (r214437) @@ -2041,6 +2041,7 @@ nd6_need_cache(struct ifnet *ifp) #ifdef IFT_CARP case IFT_CARP: #endif + case IFT_INFINIBAND: case IFT_GIF: /* XXX need more cases? */ case IFT_PPP: case IFT_TUNNEL: Modified: projects/ofed/head/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/ofed/head/sys/netinet6/nd6_nbr.c Wed Oct 27 23:21:30 2010 (r214436) +++ projects/ofed/head/sys/netinet6/nd6_nbr.c Wed Oct 27 23:22:43 2010 (r214437) @@ -1102,6 +1102,7 @@ nd6_ifptomac(struct ifnet *ifp) #ifdef IFT_CARP case IFT_CARP: #endif + case IFT_INFINIBAND: case IFT_BRIDGE: case IFT_ISO88025: return IF_LLADDR(ifp); @@ -1419,6 +1420,7 @@ nd6_dad_duplicated(struct ifaddr *ifa) #ifdef IFT_IEEE80211 case IFT_IEEE80211: #endif + case IFT_INFINIBAND: in6 = ia->ia_addr.sin6_addr; if (in6_get_hw_ifid(ifp, &in6) == 0 && IN6_ARE_ADDR_EQUAL(&ia->ia_addr.sin6_addr, &in6)) { From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 23:23:17 2010 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 8FAD11065670; Wed, 27 Oct 2010 23:23:17 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 63C5C8FC17; Wed, 27 Oct 2010 23:23:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RNNHf4044010; Wed, 27 Oct 2010 23:23:17 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RNNHOR044008; Wed, 27 Oct 2010 23:23:17 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010272323.o9RNNHOR044008@svn.freebsd.org> From: Jeff Roberson Date: Wed, 27 Oct 2010 23:23:17 +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: r214438 - projects/ofed/head/sys/ofed/drivers/infiniband/core 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, 27 Oct 2010 23:23:17 -0000 Author: jeff Date: Wed Oct 27 23:23:17 2010 New Revision: 214438 URL: http://svn.freebsd.org/changeset/base/214438 Log: - Refine ipv6 address handling. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/addr.c Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/addr.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/core/addr.c Wed Oct 27 23:22:43 2010 (r214437) +++ projects/ofed/head/sys/ofed/drivers/infiniband/core/addr.c Wed Oct 27 23:23:17 2010 (r214438) @@ -160,6 +160,25 @@ int rdma_translate_ip(struct sockaddr *a } } read_unlock(&dev_base_lock); +#else + { + struct sockaddr_in6 *sin6; + struct ifaddr *ifa; + in_port_t port; + + sin6 = (struct sockaddr_in6 *)addr; + port = sin6->sin6_port; + sin6->sin6_port = 0; + ifa = ifa_ifwithaddr(addr); + sin6->sin6_port = port; + if (ifa == NULL) { + ret = -ENODEV; + break; + } + ret = rdma_copy_addr(dev_addr, ifa->ifa_ifp, NULL); + ifa_free(ifa); + break; + } #endif break; #endif @@ -329,7 +348,7 @@ static int addr_resolve(struct sockaddr struct ifnet *ifp; struct llentry *lle; struct rtentry *rte; - short port; + in_port_t port; u_char edst[MAX_ADDR_LEN]; int multi; int bcast; @@ -344,6 +363,7 @@ static int addr_resolve(struct sockaddr sin = NULL; sin6 = NULL; ifp = NULL; + rte = NULL; switch (dst_in->sa_family) { case AF_INET: sin = (struct sockaddr_in *)dst_in; @@ -369,7 +389,10 @@ static int addr_resolve(struct sockaddr if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) multi = 1; sin6 = (struct sockaddr_in6 *)src_in; - if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) + if (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { + port = sin6->sin6_port; + sin6->sin6_port = 0; + } else src_in = NULL; break; #endif @@ -384,6 +407,8 @@ static int addr_resolve(struct sockaddr ifa = ifa_ifwithaddr(src_in); if (sin) sin->sin_port = port; + if (sin6) + sin6->sin6_port = port; if (ifa == NULL) return -ENETUNREACH; ifp = ifa->ifa_ifp; From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 23:24:38 2010 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 0B0F210656B3; Wed, 27 Oct 2010 23:24:38 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC5478FC17; Wed, 27 Oct 2010 23:24:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RNObZT044154; Wed, 27 Oct 2010 23:24:37 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RNObUj044150; Wed, 27 Oct 2010 23:24:37 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010272324.o9RNObUj044150@svn.freebsd.org> From: Jeff Roberson Date: Wed, 27 Oct 2010 23:24: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: r214439 - projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib 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, 27 Oct 2010 23:24:38 -0000 Author: jeff Date: Wed Oct 27 23:24:37 2010 New Revision: 214439 URL: http://svn.freebsd.org/changeset/base/214439 Log: - Correct the ipoib gid debug prints. - Fix the length supplied to ipoib_multicast_addr_valid. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h Wed Oct 27 23:23:17 2010 (r214438) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h Wed Oct 27 23:24:37 2010 (r214439) @@ -468,6 +468,7 @@ void ipoib_mcast_carrier_on_task(struct void ipoib_mcast_send(struct ifnet *dev, void *mgid, struct mbuf *mb); void ipoib_mcast_restart_task(struct work_struct *work); +void ipoib_mcast_restart(struct ipoib_dev_priv *); int ipoib_mcast_start_thread(struct ifnet *dev); int ipoib_mcast_stop_thread(struct ifnet *dev, int flush); Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Wed Oct 27 23:23:17 2010 (r214438) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Wed Oct 27 23:24:37 2010 (r214439) @@ -428,9 +428,9 @@ ipoib_mark_paths_invalid(struct ifnet *d spin_lock_irq(&priv->lock); list_for_each_entry_safe(path, tp, &priv->path_list, list) { - ipoib_dbg(priv, "mark path LID 0x%04x GID %pI6 invalid\n", + ipoib_dbg(priv, "mark path LID 0x%04x GID %16D invalid\n", be16_to_cpu(path->pathrec.dlid), - path->pathrec.dgid.raw); + path->pathrec.dgid.raw, ":"); path->valid = 0; } @@ -477,11 +477,11 @@ path_rec_completion(int status, struct i unsigned long flags; if (!status) - ipoib_dbg(priv, "PathRec LID 0x%04x for GID %pI6\n", - be16_to_cpu(pathrec->dlid), pathrec->dgid.raw); + ipoib_dbg(priv, "PathRec LID 0x%04x for GID %16D\n", + be16_to_cpu(pathrec->dlid), pathrec->dgid.raw, ":"); else - ipoib_dbg(priv, "PathRec status %d for GID %pI6\n", - status, path->pathrec.dgid.raw); + ipoib_dbg(priv, "PathRec status %d for GID %16D\n", + status, path->pathrec.dgid.raw, ":"); bzero(&mbqueue, sizeof(mbqueue)); @@ -596,8 +596,8 @@ path_rec_start(struct ifnet *dev, struct p_rec.mtu_selector = 0; } - ipoib_dbg(priv, "Start path record lookup for %pI6 MTU > %d\n", - p_rec.dgid.raw, + ipoib_dbg(priv, "Start path record lookup for %16D MTU > %d\n", + p_rec.dgid.raw, ":", comp_mask ? ib_mtu_enum_to_int(p_rec.mtu) : 0); init_completion(&path->done); Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c Wed Oct 27 23:23:17 2010 (r214438) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c Wed Oct 27 23:24:37 2010 (r214439) @@ -61,8 +61,8 @@ static void ipoib_mcast_free(struct ipoi struct ifnet *dev = mcast->dev; int tx_dropped = 0; - ipoib_dbg_mcast(dev->if_softc, "deleting multicast group %pI6\n", - mcast->mcmember.mgid.raw); + ipoib_dbg_mcast(dev->if_softc, "deleting multicast group %16D\n", + mcast->mcmember.mgid.raw, ":"); if (mcast->ah) ipoib_put_ah(mcast->ah); @@ -173,8 +173,8 @@ static int ipoib_mcast_join_finish(struc if (!test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) { if (test_and_set_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags)) { - ipoib_warn(priv, "multicast group %pI6 already attached\n", - mcast->mcmember.mgid.raw); + ipoib_warn(priv, "multicast group %16D already attached\n", + mcast->mcmember.mgid.raw, ":"); return 0; } @@ -182,8 +182,8 @@ static int ipoib_mcast_join_finish(struc ret = ipoib_mcast_attach(dev, be16_to_cpu(mcast->mcmember.mlid), &mcast->mcmember.mgid, set_qkey); if (ret < 0) { - ipoib_warn(priv, "couldn't attach QP to multicast group %pI6\n", - mcast->mcmember.mgid.raw); + ipoib_warn(priv, "couldn't attach QP to multicast group %16D\n", + mcast->mcmember.mgid.raw, ":"); clear_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags); return ret; @@ -214,8 +214,8 @@ static int ipoib_mcast_join_finish(struc mcast->ah = ah; spin_unlock_irq(&priv->lock); - ipoib_dbg_mcast(priv, "MGID %pI6 AV %p, LID 0x%04x, SL %d\n", - mcast->mcmember.mgid.raw, + ipoib_dbg_mcast(priv, "MGID %16D AV %p, LID 0x%04x, SL %d\n", + mcast->mcmember.mgid.raw, ":", mcast->ah->ah, be16_to_cpu(mcast->mcmember.mlid), mcast->mcmember.sl); @@ -252,8 +252,8 @@ ipoib_mcast_sendonly_join_complete(int s if (status) { if (mcast->logcount++ < 20) - ipoib_dbg_mcast(dev->if_softc, "multicast join failed for %pI6, status %d\n", - mcast->mcmember.mgid.raw, status); + ipoib_dbg_mcast(dev->if_softc, "multicast join failed for %16D, status %d\n", + mcast->mcmember.mgid.raw, ":", status); /* Flush out any queued packets */ dev->if_oerrors += mcast->pkt_queue.ifq_len; @@ -308,8 +308,8 @@ static int ipoib_mcast_sendonly_join(str ipoib_warn(priv, "ib_sa_join_multicast failed (ret = %d)\n", ret); } else { - ipoib_dbg_mcast(priv, "no multicast record for %pI6, starting join\n", - mcast->mcmember.mgid.raw); + ipoib_dbg_mcast(priv, "no multicast record for %16D, starting join\n", + mcast->mcmember.mgid.raw, ":"); } return ret; @@ -340,8 +340,8 @@ static int ipoib_mcast_join_complete(int struct ifnet *dev = mcast->dev; struct ipoib_dev_priv *priv = dev->if_softc; - ipoib_dbg_mcast(priv, "join completion for %pI6 (status %d)\n", - mcast->mcmember.mgid.raw, status); + ipoib_dbg_mcast(priv, "join completion for %16D (status %d)\n", + mcast->mcmember.mgid.raw, ":", status); /* We trap for port events ourselves. */ if (status == -ENETRESET) @@ -370,11 +370,11 @@ static int ipoib_mcast_join_complete(int if (mcast->logcount++ < 20) { if (status == -ETIMEDOUT || status == -EAGAIN) { - ipoib_dbg_mcast(priv, "multicast join failed for %pI6, status %d\n", - mcast->mcmember.mgid.raw, status); + ipoib_dbg_mcast(priv, "multicast join failed for %16D, status %d\n", + mcast->mcmember.mgid.raw, ":", status); } else { - ipoib_warn(priv, "multicast join failed for %pI6, status %d\n", - mcast->mcmember.mgid.raw, status); + ipoib_warn(priv, "multicast join failed for %16D, status %d\n", + mcast->mcmember.mgid.raw, ":", status); } } @@ -406,7 +406,8 @@ static void ipoib_mcast_join(struct ifne ib_sa_comp_mask comp_mask; int ret = 0; - ipoib_dbg_mcast(priv, "joining MGID %pI6\n", mcast->mcmember.mgid.raw); + ipoib_dbg_mcast(priv, "joining MGID %16D\n", + mcast->mcmember.mgid.raw, ":"); rec.mgid = mcast->mcmember.mgid; rec.port_gid = priv->local_gid; @@ -605,8 +606,8 @@ static int ipoib_mcast_leave(struct ifne ib_sa_free_multicast(mcast->mc); if (test_and_clear_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags)) { - ipoib_dbg_mcast(priv, "leaving MGID %pI6\n", - mcast->mcmember.mgid.raw); + ipoib_dbg_mcast(priv, "leaving MGID %16D\n", + mcast->mcmember.mgid.raw, ":"); /* Remove ourselves from the multicast group */ ret = ib_detach_mcast(priv->qp, &mcast->mcmember.mgid, @@ -635,8 +636,8 @@ ipoib_mcast_send(struct ifnet *dev, void mcast = __ipoib_mcast_find(dev, mgid); if (!mcast) { /* Let's create a new send only group now */ - ipoib_dbg_mcast(priv, "setting up send only multicast group for %pI6\n", - mgid); + ipoib_dbg_mcast(priv, "setting up send only multicast group for %16D\n", + mgid, ":"); mcast = ipoib_mcast_alloc(dev, 0); if (!mcast) { @@ -728,11 +729,17 @@ void ipoib_mcast_restart_task(struct wor { struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv, restart_task); + ipoib_mcast_restart(priv); +} + +void ipoib_mcast_restart(struct ipoib_dev_priv *priv) +{ struct ifnet *dev = priv->dev; struct ifmultiaddr *ifma;; struct ipoib_mcast *mcast, *tmcast; LIST_HEAD(remove_list); struct ib_sa_mcmember_rec rec; + int addrlen; ipoib_dbg_mcast(priv, "restarting multicast task flags 0x%lX\n", priv->flags); @@ -762,8 +769,8 @@ void ipoib_mcast_restart_task(struct wor if (ifma->ifma_addr->sa_family != AF_LINK) continue; addr = LLADDR((struct sockaddr_dl *)ifma->ifma_addr); - if (!ipoib_mcast_addr_is_valid(addr, - ifma->ifma_addr->sa_len, + addrlen = ((struct sockaddr_dl *)ifma->ifma_addr)->sdl_alen; + if (!ipoib_mcast_addr_is_valid(addr, addrlen, dev->if_broadcastaddr)) continue; @@ -776,14 +783,14 @@ void ipoib_mcast_restart_task(struct wor /* ignore group which is directly joined by userspace */ if (test_bit(IPOIB_FLAG_UMCAST, &priv->flags) && !ib_sa_get_mcmember_rec(priv->ca, priv->port, &mgid, &rec)) { - ipoib_dbg_mcast(priv, "ignoring multicast entry for mgid %pI6\n", - mgid.raw); + ipoib_dbg_mcast(priv, "ignoring multicast entry for mgid %16D\n", + mgid.raw, ":"); continue; } /* Not found or send-only group, let's add a new entry */ - ipoib_dbg_mcast(priv, "adding multicast entry for mgid %pI6\n", - mgid.raw); + ipoib_dbg_mcast(priv, "adding multicast entry for mgid %16D\n", + mgid.raw, ":"); nmcast = ipoib_mcast_alloc(dev, 0); if (!nmcast) { @@ -816,8 +823,8 @@ void ipoib_mcast_restart_task(struct wor list_for_each_entry_safe(mcast, tmcast, &priv->multicast_list, list) { if (!test_bit(IPOIB_MCAST_FLAG_FOUND, &mcast->flags) && !test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) { - ipoib_dbg_mcast(priv, "deleting multicast group %pI6\n", - mcast->mcmember.mgid.raw); + ipoib_dbg_mcast(priv, "deleting multicast group %16D\n", + mcast->mcmember.mgid.raw, ":"); rb_erase(&mcast->rb_node, &priv->multicast_tree); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 23:55:15 2010 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 CE15D106566B; Wed, 27 Oct 2010 23:55:15 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BD3B18FC0A; Wed, 27 Oct 2010 23:55:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RNtFv2046399; Wed, 27 Oct 2010 23:55:15 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RNtFOq046397; Wed, 27 Oct 2010 23:55:15 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010272355.o9RNtFOq046397@svn.freebsd.org> From: Jeff Roberson Date: Wed, 27 Oct 2010 23:55:15 +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: r214440 - projects/ofed/head/sys/kern 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, 27 Oct 2010 23:55:15 -0000 Author: jeff Date: Wed Oct 27 23:55:15 2010 New Revision: 214440 URL: http://svn.freebsd.org/changeset/base/214440 Log: - Correct a terrible typo in IT_WAIT. Spotted by: jmallett Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/kern/kern_intr.c Modified: projects/ofed/head/sys/kern/kern_intr.c ============================================================================== --- projects/ofed/head/sys/kern/kern_intr.c Wed Oct 27 23:24:37 2010 (r214439) +++ projects/ofed/head/sys/kern/kern_intr.c Wed Oct 27 23:55:15 2010 (r214440) @@ -74,7 +74,7 @@ struct intr_thread { /* Interrupt thread flags kept in it_flags */ #define IT_DEAD 0x000001 /* Thread is waiting to exit. */ -#define IT_WAIT 0x000001 /* Thread is waiting for completion. */ +#define IT_WAIT 0x000002 /* Thread is waiting for completion. */ struct intr_entropy { struct thread *td; From owner-svn-src-projects@FreeBSD.ORG Fri Oct 29 00:41:48 2010 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 C1F2F1065670; Fri, 29 Oct 2010 00:41:48 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B1E2D8FC28; Fri, 29 Oct 2010 00:41:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9T0fmGo047596; Fri, 29 Oct 2010 00:41:48 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9T0fmqc047594; Fri, 29 Oct 2010 00:41:48 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201010290041.o9T0fmqc047594@svn.freebsd.org> From: Attilio Rao Date: Fri, 29 Oct 2010 00:41: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: r214496 - projects/sv/sys/netinet 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, 29 Oct 2010 00:41:48 -0000 Author: attilio Date: Fri Oct 29 00:41:48 2010 New Revision: 214496 URL: http://svn.freebsd.org/changeset/base/214496 Log: Just accept ether packets here. Reported by: rwatson Modified: projects/sv/sys/netinet/netdump_client.c Modified: projects/sv/sys/netinet/netdump_client.c ============================================================================== --- projects/sv/sys/netinet/netdump_client.c Fri Oct 29 00:37:35 2010 (r214495) +++ projects/sv/sys/netinet/netdump_client.c Fri Oct 29 00:41:48 2010 (r214496) @@ -888,10 +888,7 @@ nd_handle_arp(struct mbuf **mb) } ah = mtod(m, struct arphdr *); - if (ntohs(ah->ar_hrd) != ARPHRD_ETHER && - ntohs(ah->ar_hrd) != ARPHRD_IEEE802 && - ntohs(ah->ar_hrd) != ARPHRD_ARCNET && - ntohs(ah->ar_hrd) != ARPHRD_IEEE1394) { + if (ntohs(ah->ar_hrd) != ARPHRD_ETHER) { NETDDEBUG("nd_handle_arp: unknown hardware address fmt " "0x%2D)\n", (unsigned char *)&ah->ar_hrd, ""); return; From owner-svn-src-projects@FreeBSD.ORG Fri Oct 29 01:08:33 2010 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 D33461065672; Fri, 29 Oct 2010 01:08:33 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C30C68FC21; Fri, 29 Oct 2010 01:08:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9T18XKl050051; Fri, 29 Oct 2010 01:08:33 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9T18XFe050049; Fri, 29 Oct 2010 01:08:33 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010290108.o9T18XFe050049@svn.freebsd.org> From: Jeff Roberson Date: Fri, 29 Oct 2010 01:08:33 +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: r214497 - projects/ofed/head/sys/amd64/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: Fri, 29 Oct 2010 01:08:33 -0000 Author: jeff Date: Fri Oct 29 01:08:33 2010 New Revision: 214497 URL: http://svn.freebsd.org/changeset/base/214497 Log: - Add ipoib to the default config file on the ofed branch. Modified: projects/ofed/head/sys/amd64/conf/GENERIC Modified: projects/ofed/head/sys/amd64/conf/GENERIC ============================================================================== --- projects/ofed/head/sys/amd64/conf/GENERIC Fri Oct 29 00:41:48 2010 (r214496) +++ projects/ofed/head/sys/amd64/conf/GENERIC Fri Oct 29 01:08:33 2010 (r214497) @@ -89,6 +89,7 @@ device pci # Infiniband Bus and drivers device infiniband +device ipoib device mlx4 device mthca From owner-svn-src-projects@FreeBSD.ORG Fri Oct 29 01:33:44 2010 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 ABB36106566C; Fri, 29 Oct 2010 01:33:44 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 996948FC19; Fri, 29 Oct 2010 01:33:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9T1Ximu051251; Fri, 29 Oct 2010 01:33:44 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9T1Xi9q051244; Fri, 29 Oct 2010 01:33:44 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010290133.o9T1Xi9q051244@svn.freebsd.org> From: Jeff Roberson Date: Fri, 29 Oct 2010 01:33:44 +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: r214498 - projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp 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, 29 Oct 2010 01:33:44 -0000 Author: jeff Date: Fri Oct 29 01:33:44 2010 New Revision: 214498 URL: http://svn.freebsd.org/changeset/base/214498 Log: - Initial mechanical changes to sdp sources to begin the porting effort. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_proc.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_zcopy.c Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Fri Oct 29 01:08:33 2010 (r214497) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Fri Oct 29 01:33:44 2010 (r214498) @@ -39,7 +39,7 @@ #define SDP_MAX_RECV_SGES 9 /* 1 for sdp header + 8 for payload */ #define SDP_MAX_SEND_SGES 9 /* same as above */ -/* skb inlined data len - rest will be rx'ed into frags */ +/* mb inlined data len - rest will be rx'ed into frags */ #define SDP_SKB_HEAD_SIZE (0x500 + sizeof(struct sdp_bsdh)) /* limit tx payload len, if the sink supports bigger buffers than the source @@ -64,7 +64,7 @@ #define SDP_AUTO_CONF 0xffff #define AUTO_MOD_DELAY (HZ / 4) -struct sdp_skb_cb { +struct sdp_mb_cb { __u32 seq; /* Starting sequence number */ __u32 end_seq; /* SEQ + FIN + SYN + datalen */ __u8 flags; /* TCP header flags. */ @@ -73,10 +73,10 @@ struct sdp_skb_cb { struct tx_srcavail_state *tx_sa; }; -#define SDP_SKB_CB(__skb) ((struct sdp_skb_cb *)&((__skb)->cb[0])) -#define BZCOPY_STATE(skb) (SDP_SKB_CB(skb)->bz) -#define RX_SRCAVAIL_STATE(skb) (SDP_SKB_CB(skb)->rx_sa) -#define TX_SRCAVAIL_STATE(skb) (SDP_SKB_CB(skb)->tx_sa) +#define SDP_SKB_CB(__mb) ((struct sdp_mb_cb *)&((__mb)->cb[0])) +#define BZCOPY_STATE(mb) (SDP_SKB_CB(mb)->bz) +#define RX_SRCAVAIL_STATE(mb) (SDP_SKB_CB(mb)->rx_sa) +#define TX_SRCAVAIL_STATE(mb) (SDP_SKB_CB(mb)->tx_sa) #ifndef MIN #define MIN(a, b) (a < b ? a : b) @@ -196,7 +196,7 @@ struct sdp_srcah { } __attribute__((__packed__)); struct sdp_buf { - struct sk_buff *skb; + struct mbuf *mb; u64 mapping[SDP_MAX_SEND_SGES]; } __attribute__((__packed__)); @@ -324,8 +324,8 @@ struct sdp_sock { struct list_head sock_list; struct list_head accept_queue; struct list_head backlog_queue; - struct sk_buff_head rx_ctl_q; - struct sock *parent; + struct mbuf_head rx_ctl_q; + struct socket *parent; struct sdp_device *sdp_dev; int qp_active; @@ -406,8 +406,8 @@ struct sdp_sock { int recv_request_head; /* mark the rx_head when the resize request was recieved */ int recv_request; /* flag if request to resize was recieved */ - int recv_frags; /* max skb frags in recv packets */ - int send_frags; /* max skb frags in send packets */ + int recv_frags; /* max mb frags in recv packets */ + int send_frags; /* max mb frags in send packets */ unsigned long tx_packets; unsigned long rx_packets; @@ -449,12 +449,12 @@ static inline void rx_ring_destroy_lock( write_unlock_bh(&rx_ring->destroyed_lock); } -static inline struct sdp_sock *sdp_sk(const struct sock *sk) +static inline struct sdp_sock *sdp_sk(const struct socket *sk) { return (struct sdp_sock *)sk; } -static inline int _sdp_exch_state(const char *func, int line, struct sock *sk, +static inline int _sdp_exch_state(const char *func, int line, struct socket *sk, int from_states, int state) { unsigned long flags; @@ -483,7 +483,7 @@ static inline int _sdp_exch_state(const #define sdp_exch_state(sk, from_states, state) \ _sdp_exch_state(__func__, __LINE__, sk, from_states, state) -static inline void sdp_set_error(struct sock *sk, int err) +static inline void sdp_set_error(struct socket *sk, int err) { int ib_teardown_states = TCPF_FIN_WAIT1 | TCPF_CLOSE_WAIT | TCPF_LAST_ACK; @@ -499,7 +499,7 @@ static inline void sdp_set_error(struct sk->sk_error_report(sk); } -static inline void sdp_arm_rx_cq(struct sock *sk) +static inline void sdp_arm_rx_cq(struct socket *sk) { sdp_prf(sk, NULL, "Arming RX cq"); sdp_dbg_data(sk, "Arming RX cq\n"); @@ -507,7 +507,7 @@ static inline void sdp_arm_rx_cq(struct ib_req_notify_cq(sdp_sk(sk)->rx_ring.cq, IB_CQ_NEXT_COMP); } -static inline void sdp_arm_tx_cq(struct sock *sk) +static inline void sdp_arm_tx_cq(struct socket *sk) { sdp_prf(sk, NULL, "Arming TX cq"); sdp_dbg_data(sk, "Arming TX cq. credits: %d, posted: %d\n", @@ -557,25 +557,25 @@ static inline char *mid2str(int mid) return mid2str[mid]; } -static inline struct sk_buff *sdp_stream_alloc_skb(struct sock *sk, int size, +static inline struct mbuf *sdp_stream_alloc_mb(struct socket *sk, int size, gfp_t gfp) { - struct sk_buff *skb; + struct mbuf *mb; /* The TCP header must be at least 32-bit aligned. */ size = ALIGN(size, 4); - skb = alloc_skb_fclone(size + sk->sk_prot->max_header, gfp); - if (skb) { - if (sk_wmem_schedule(sk, skb->truesize)) { + mb = alloc_mb_fclone(size + sk->sk_prot->max_header, gfp); + if (mb) { + if (sk_wmem_schedule(sk, mb->truesize)) { /* * Make sure that we have exactly size bytes * available to the caller, no more, no less. */ - skb_reserve(skb, skb_tailroom(skb) - size); - return skb; + mb_reserve(mb, mb_tailroom(mb) - size); + return mb; } - __kfree_skb(skb); + m_freem(mb); } else { sk->sk_prot->enter_memory_pressure(sk); sk_stream_moderate_sndbuf(sk); @@ -583,11 +583,11 @@ static inline struct sk_buff *sdp_stream return NULL; } -static inline struct sk_buff *sdp_alloc_skb(struct sock *sk, u8 mid, int size, +static inline struct mbuf *sdp_alloc_mb(struct socket *sk, u8 mid, int size, gfp_t gfp) { struct sdp_bsdh *h; - struct sk_buff *skb; + struct mbuf *mb; if (!gfp) { if (unlikely(sk->sk_allocation)) @@ -596,82 +596,82 @@ static inline struct sk_buff *sdp_alloc_ gfp = GFP_KERNEL; } - skb = sdp_stream_alloc_skb(sk, sizeof(struct sdp_bsdh) + size, gfp); - BUG_ON(!skb); + mb = sdp_stream_alloc_mb(sk, sizeof(struct sdp_bsdh) + size, gfp); + BUG_ON(!mb); - skb_header_release(skb); + mb_header_release(mb); - h = (struct sdp_bsdh *)skb_push(skb, sizeof *h); + h = (struct sdp_bsdh *)mb_push(mb, sizeof *h); h->mid = mid; - skb_reset_transport_header(skb); + mb_reset_transport_header(mb); - return skb; + return mb; } -static inline struct sk_buff *sdp_alloc_skb_data(struct sock *sk, gfp_t gfp) +static inline struct mbuf *sdp_alloc_mb_data(struct socket *sk, gfp_t gfp) { - return sdp_alloc_skb(sk, SDP_MID_DATA, 0, gfp); + return sdp_alloc_mb(sk, SDP_MID_DATA, 0, gfp); } -static inline struct sk_buff *sdp_alloc_skb_disconnect(struct sock *sk, +static inline struct mbuf *sdp_alloc_mb_disconnect(struct socket *sk, gfp_t gfp) { - return sdp_alloc_skb(sk, SDP_MID_DISCONN, 0, gfp); + return sdp_alloc_mb(sk, SDP_MID_DISCONN, 0, gfp); } -static inline struct sk_buff *sdp_alloc_skb_chrcvbuf_ack(struct sock *sk, +static inline struct mbuf *sdp_alloc_mb_chrcvbuf_ack(struct socket *sk, int size, gfp_t gfp) { - struct sk_buff *skb; + struct mbuf *mb; struct sdp_chrecvbuf *resp_size; - skb = sdp_alloc_skb(sk, SDP_MID_CHRCVBUF_ACK, sizeof(*resp_size), gfp); + mb = sdp_alloc_mb(sk, SDP_MID_CHRCVBUF_ACK, sizeof(*resp_size), gfp); - resp_size = (struct sdp_chrecvbuf *)skb_put(skb, sizeof *resp_size); + resp_size = (struct sdp_chrecvbuf *)mb_put(mb, sizeof *resp_size); resp_size->size = htonl(size); - return skb; + return mb; } -static inline struct sk_buff *sdp_alloc_skb_srcavail(struct sock *sk, +static inline struct mbuf *sdp_alloc_mb_srcavail(struct socket *sk, u32 len, u32 rkey, u64 vaddr, gfp_t gfp) { - struct sk_buff *skb; + struct mbuf *mb; struct sdp_srcah *srcah; - skb = sdp_alloc_skb(sk, SDP_MID_SRCAVAIL, sizeof(*srcah), gfp); + mb = sdp_alloc_mb(sk, SDP_MID_SRCAVAIL, sizeof(*srcah), gfp); - srcah = (struct sdp_srcah *)skb_put(skb, sizeof(*srcah)); + srcah = (struct sdp_srcah *)mb_put(mb, sizeof(*srcah)); srcah->len = htonl(len); srcah->rkey = htonl(rkey); srcah->vaddr = cpu_to_be64(vaddr); - return skb; + return mb; } -static inline struct sk_buff *sdp_alloc_skb_srcavail_cancel(struct sock *sk, +static inline struct mbuf *sdp_alloc_mb_srcavail_cancel(struct socket *sk, gfp_t gfp) { - return sdp_alloc_skb(sk, SDP_MID_SRCAVAIL_CANCEL, 0, gfp); + return sdp_alloc_mb(sk, SDP_MID_SRCAVAIL_CANCEL, 0, gfp); } -static inline struct sk_buff *sdp_alloc_skb_rdmardcompl(struct sock *sk, +static inline struct mbuf *sdp_alloc_mb_rdmardcompl(struct socket *sk, u32 len, gfp_t gfp) { - struct sk_buff *skb; + struct mbuf *mb; struct sdp_rrch *rrch; - skb = sdp_alloc_skb(sk, SDP_MID_RDMARDCOMPL, sizeof(*rrch), gfp); + mb = sdp_alloc_mb(sk, SDP_MID_RDMARDCOMPL, sizeof(*rrch), gfp); - rrch = (struct sdp_rrch *)skb_put(skb, sizeof(*rrch)); + rrch = (struct sdp_rrch *)mb_put(mb, sizeof(*rrch)); rrch->len = htonl(len); - return skb; + return mb; } -static inline struct sk_buff *sdp_alloc_skb_sendsm(struct sock *sk, gfp_t gfp) +static inline struct mbuf *sdp_alloc_mb_sendsm(struct socket *sk, gfp_t gfp) { - return sdp_alloc_skb(sk, SDP_MID_SENDSM, 0, gfp); + return sdp_alloc_mb(sk, SDP_MID_SENDSM, 0, gfp); } static inline int sdp_tx_ring_slots_left(struct sdp_sock *ssk) { @@ -753,32 +753,32 @@ static inline void sdp_cleanup_sdp_buf(s size_t head_size, enum dma_data_direction dir) { int i; - struct sk_buff *skb; + struct mbuf *mb; struct ib_device *dev = ssk->ib_device; - skb = sbuf->skb; + mb = sbuf->mb; ib_dma_unmap_single(dev, sbuf->mapping[0], head_size, dir); - for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + for (i = 0; i < mb_shinfo(mb)->nr_frags; i++) { ib_dma_unmap_page(dev, sbuf->mapping[i + 1], - skb_shinfo(skb)->frags[i].size, + mb_shinfo(mb)->frags[i].size, dir); } } /* sdp_main.c */ void sdp_set_default_moderation(struct sdp_sock *ssk); -int sdp_init_sock(struct sock *sk); -void sdp_start_keepalive_timer(struct sock *sk); +int sdp_init_sock(struct socket *sk); +void sdp_start_keepalive_timer(struct socket *sk); void sdp_remove_sock(struct sdp_sock *ssk); void sdp_add_sock(struct sdp_sock *ssk); -void sdp_urg(struct sdp_sock *ssk, struct sk_buff *skb); +void sdp_urg(struct sdp_sock *ssk, struct mbuf *mb); void sdp_cancel_dreq_wait_timeout(struct sdp_sock *ssk); -void sdp_reset_sk(struct sock *sk, int rc); -void sdp_reset(struct sock *sk); +void sdp_reset_sk(struct socket *sk, int rc); +void sdp_reset(struct socket *sk); int sdp_tx_wait_memory(struct sdp_sock *ssk, long *timeo_p, int *credits_needed); -void skb_entail(struct sock *sk, struct sdp_sock *ssk, struct sk_buff *skb); +void mb_entail(struct socket *sk, struct sdp_sock *ssk, struct mbuf *mb); /* sdp_proc.c */ int __init sdp_proc_init(void); @@ -791,7 +791,7 @@ int sdp_cma_handler(struct rdma_cm_id *, int sdp_tx_ring_create(struct sdp_sock *ssk, struct ib_device *device); void sdp_tx_ring_destroy(struct sdp_sock *ssk); int sdp_xmit_poll(struct sdp_sock *ssk, int force); -void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb); +void sdp_post_send(struct sdp_sock *ssk, struct mbuf *mb); void sdp_post_sends(struct sdp_sock *ssk, gfp_t gfp); void sdp_nagle_timeout(unsigned long data); void sdp_post_keepalive(struct sdp_sock *ssk); @@ -805,22 +805,22 @@ int sdp_init_buffers(struct sdp_sock *ss void sdp_do_posts(struct sdp_sock *ssk); void sdp_rx_comp_full(struct sdp_sock *ssk); void sdp_remove_large_sock(struct sdp_sock *ssk); -void sdp_handle_disconn(struct sock *sk); +void sdp_handle_disconn(struct socket *sk); /* sdp_zcopy.c */ -int sdp_sendmsg_zcopy(struct kiocb *iocb, struct sock *sk, struct iovec *iov); +int sdp_sendmsg_zcopy(struct kiocb *iocb, struct socket *sk, struct iovec *iov); int sdp_handle_srcavail(struct sdp_sock *ssk, struct sdp_srcah *srcah); void sdp_handle_sendsm(struct sdp_sock *ssk, u32 mseq_ack); void sdp_handle_rdma_read_compl(struct sdp_sock *ssk, u32 mseq_ack, u32 bytes_completed); int sdp_handle_rdma_read_cqe(struct sdp_sock *ssk); -int sdp_rdma_to_iovec(struct sock *sk, struct iovec *iov, struct sk_buff *skb, +int sdp_rdma_to_iovec(struct socket *sk, struct iovec *iov, struct mbuf *mb, unsigned long *used); int sdp_post_rdma_rd_compl(struct sdp_sock *ssk, struct rx_srcavail_state *rx_sa); -int sdp_post_sendsm(struct sock *sk); +int sdp_post_sendsm(struct socket *sk); void srcavail_cancel_timeout(struct work_struct *work); -void sdp_abort_srcavail(struct sock *sk); -void sdp_abort_rdma_read(struct sock *sk); +void sdp_abort_srcavail(struct socket *sk); +void sdp_abort_rdma_read(struct socket *sk); #endif Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c Fri Oct 29 01:08:33 2010 (r214497) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c Fri Oct 29 01:33:44 2010 (r214498) @@ -34,8 +34,8 @@ #include "sdp.h" #ifdef CONFIG_INFINIBAND_SDP_DEBUG_DATA -void _dump_packet(const char *func, int line, struct sock *sk, char *str, - struct sk_buff *skb, const struct sdp_bsdh *h) +void _dump_packet(const char *func, int line, struct socket *sk, char *str, + struct mbuf *mb, const struct sdp_bsdh *h) { struct sdp_hh *hh; struct sdp_hah *hah; @@ -44,9 +44,9 @@ void _dump_packet(const char *func, int struct sdp_srcah *srcah; int len = 0; char buf[256]; - len += snprintf(buf, 255-len, "%s skb: %p mid: %2x:%-20s flags: 0x%x " + len += snprintf(buf, 255-len, "%s mb: %p mid: %2x:%-20s flags: 0x%x " "bufs: 0x%x len: 0x%x mseq: 0x%x mseq_ack: 0x%x | ", - str, skb, h->mid, mid2str(h->mid), h->flags, + str, mb, h->mid, mid2str(h->mid), h->flags, ntohs(h->bufs), ntohl(h->len), ntohl(h->mseq), ntohl(h->mseq_ack)); @@ -99,11 +99,11 @@ void _dump_packet(const char *func, int } #endif -static inline void update_send_head(struct sock *sk, struct sk_buff *skb) +static inline void update_send_head(struct socket *sk, struct mbuf *mb) { struct page *page; - sk->sk_send_head = skb->next; - if (sk->sk_send_head == (struct sk_buff *)&sk->sk_write_queue) { + sk->sk_send_head = mb->next; + if (sk->sk_send_head == (struct mbuf *)&sk->sk_write_queue) { sk->sk_send_head = NULL; page = sk->sk_sndmsg_page; if (page) { @@ -113,17 +113,17 @@ static inline void update_send_head(stru } } -static inline int sdp_nagle_off(struct sdp_sock *ssk, struct sk_buff *skb) +static inline int sdp_nagle_off(struct sdp_sock *ssk, struct mbuf *mb) { - struct sdp_bsdh *h = (struct sdp_bsdh *)skb_transport_header(skb); + struct sdp_bsdh *h = (struct sdp_bsdh *)mb_transport_header(mb); int send_now = - BZCOPY_STATE(skb) || + BZCOPY_STATE(mb) || unlikely(h->mid != SDP_MID_DATA) || (ssk->nonagle & TCP_NAGLE_OFF) || !ssk->nagle_last_unacked || - skb->next != (struct sk_buff *)&ssk->isk.sk.sk_write_queue || - skb->len + sizeof(struct sdp_bsdh) >= ssk->xmit_size_goal || - (SDP_SKB_CB(skb)->flags & TCPCB_FLAG_PSH); + mb->next != (struct mbuf *)&ssk->isk.sk.sk_write_queue || + mb->len + sizeof(struct sdp_bsdh) >= ssk->xmit_size_goal || + (SDP_SKB_CB(mb)->flags & TCPCB_FLAG_PSH); if (send_now) { unsigned long mseq = ring_head(ssk->tx_ring); @@ -144,7 +144,7 @@ static inline int sdp_nagle_off(struct s void sdp_nagle_timeout(unsigned long data) { struct sdp_sock *ssk = (struct sdp_sock *)data; - struct sock *sk = &ssk->isk.sk; + struct socket *sk = &ssk->isk.sk; sdp_dbg_data(sk, "last_unacked = %ld\n", ssk->nagle_last_unacked); @@ -178,9 +178,9 @@ out2: void sdp_post_sends(struct sdp_sock *ssk, gfp_t gfp) { /* TODO: nonagle? */ - struct sk_buff *skb; + struct mbuf *mb; int post_count = 0; - struct sock *sk = &ssk->isk.sk; + struct socket *sk = &ssk->isk.sk; if (unlikely(!ssk->id)) { if (ssk->isk.sk.sk_send_head) { @@ -201,10 +201,10 @@ void sdp_post_sends(struct sdp_sock *ssk sdp_tx_ring_slots_left(ssk)) { ssk->recv_request = 0; - skb = sdp_alloc_skb_chrcvbuf_ack(sk, + mb = sdp_alloc_mb_chrcvbuf_ack(sk, ssk->recv_frags * PAGE_SIZE, gfp); - sdp_post_send(ssk, skb); + sdp_post_send(ssk, mb); post_count++; } @@ -217,12 +217,12 @@ void sdp_post_sends(struct sdp_sock *ssk while (tx_credits(ssk) > SDP_MIN_TX_CREDITS && sdp_tx_ring_slots_left(ssk) && - (skb = ssk->isk.sk.sk_send_head) && - sdp_nagle_off(ssk, skb)) { - update_send_head(&ssk->isk.sk, skb); - __skb_dequeue(&ssk->isk.sk.sk_write_queue); + (mb = ssk->isk.sk.sk_send_head) && + sdp_nagle_off(ssk, mb)) { + update_send_head(&ssk->isk.sk, mb); + __mb_dequeue(&ssk->isk.sk.sk_write_queue); - sdp_post_send(ssk, skb); + sdp_post_send(ssk, mb); post_count++; } @@ -231,8 +231,8 @@ void sdp_post_sends(struct sdp_sock *ssk likely((1 << ssk->isk.sk.sk_state) & (TCPF_ESTABLISHED | TCPF_FIN_WAIT1))) { - skb = sdp_alloc_skb_data(&ssk->isk.sk, gfp); - sdp_post_send(ssk, skb); + mb = sdp_alloc_mb_data(&ssk->isk.sk, gfp); + sdp_post_send(ssk, mb); SDPSTATS_COUNTER_INC(post_send_credits); post_count++; @@ -248,8 +248,8 @@ void sdp_post_sends(struct sdp_sock *ssk tx_credits(ssk) > 1) { ssk->sdp_disconnect = 0; - skb = sdp_alloc_skb_disconnect(sk, gfp); - sdp_post_send(ssk, skb); + mb = sdp_alloc_mb_disconnect(sk, gfp); + sdp_post_send(ssk, mb); post_count++; } Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c Fri Oct 29 01:08:33 2010 (r214497) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c Fri Oct 29 01:33:44 2010 (r214498) @@ -76,7 +76,7 @@ out: return max_sges; } -static int sdp_init_qp(struct sock *sk, struct rdma_cm_id *id) +static int sdp_init_qp(struct socket *sk, struct rdma_cm_id *id) { struct ib_qp_init_attr qp_init_attr = { .event_handler = sdp_qp_event_handler, @@ -148,11 +148,11 @@ static int sdp_get_max_send_frags(u32 bu SDP_MAX_SEND_SGES - 1); } -static int sdp_connect_handler(struct sock *sk, struct rdma_cm_id *id, +static int sdp_connect_handler(struct socket *sk, struct rdma_cm_id *id, struct rdma_cm_event *event) { - struct sockaddr_in *dst_addr; - struct sock *child; + struct socketaddr_in *dst_addr; + struct socket *child; const struct sdp_hh *h; int rc; @@ -170,7 +170,7 @@ static int sdp_connect_handler(struct so sdp_init_sock(child); - dst_addr = (struct sockaddr_in *)&id->route.addr.dst_addr; + dst_addr = (struct socketaddr_in *)&id->route.addr.dst_addr; inet_sk(child)->dport = dst_addr->sin_port; inet_sk(child)->daddr = dst_addr->sin_addr.s_addr; @@ -212,11 +212,11 @@ static int sdp_connect_handler(struct so return 0; } -static int sdp_response_handler(struct sock *sk, struct rdma_cm_id *id, +static int sdp_response_handler(struct socket *sk, struct rdma_cm_id *id, struct rdma_cm_event *event) { const struct sdp_hah *h; - struct sockaddr_in *dst_addr; + struct socketaddr_in *dst_addr; sdp_dbg(sk, "%s\n", __func__); sdp_exch_state(sk, TCPF_SYN_SENT, TCP_ESTABLISHED); @@ -244,16 +244,16 @@ static int sdp_response_handler(struct s sk->sk_state_change(sk); sk_wake_async(sk, 0, POLL_OUT); - dst_addr = (struct sockaddr_in *)&id->route.addr.dst_addr; + dst_addr = (struct socketaddr_in *)&id->route.addr.dst_addr; inet_sk(sk)->dport = dst_addr->sin_port; inet_sk(sk)->daddr = dst_addr->sin_addr.s_addr; return 0; } -static int sdp_connected_handler(struct sock *sk, struct rdma_cm_event *event) +static int sdp_connected_handler(struct socket *sk, struct rdma_cm_event *event) { - struct sock *parent; + struct socket *parent; sdp_dbg(sk, "%s\n", __func__); parent = sdp_sk(sk)->parent; @@ -289,7 +289,7 @@ done: return 0; } -static int sdp_disconnected_handler(struct sock *sk) +static int sdp_disconnected_handler(struct socket *sk) { struct sdp_sock *ssk = sdp_sk(sk); @@ -311,9 +311,9 @@ static int sdp_disconnected_handler(stru int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event) { struct rdma_conn_param conn_param; - struct sock *parent = NULL; - struct sock *child = NULL; - struct sock *sk; + struct socket *parent = NULL; + struct socket *child = NULL; + struct socket *sk; struct sdp_hah hah; struct sdp_hh hh; @@ -378,7 +378,7 @@ int sdp_cma_handler(struct rdma_cm_id *i PAGE_SIZE + sizeof(struct sdp_bsdh)); hh.max_adverts = 0x1; inet_sk(sk)->saddr = inet_sk(sk)->rcv_saddr = - ((struct sockaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr; + ((struct socketaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr; memset(&conn_param, 0, sizeof conn_param); conn_param.private_data_len = sizeof hh; conn_param.private_data = &hh; @@ -451,7 +451,7 @@ int sdp_cma_handler(struct rdma_cm_id *i case RDMA_CM_EVENT_ESTABLISHED: sdp_dbg(sk, "RDMA_CM_EVENT_ESTABLISHED\n"); inet_sk(sk)->saddr = inet_sk(sk)->rcv_saddr = - ((struct sockaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr; + ((struct socketaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr; rc = sdp_connected_handler(sk, event); break; case RDMA_CM_EVENT_DISCONNECTED: /* This means DREQ/DREP received */ Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h Fri Oct 29 01:08:33 2010 (r214497) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h Fri Oct 29 01:33:44 2010 (r214498) @@ -33,14 +33,14 @@ MODULE_PARM_DESC(var, msg " [" #def_val "]"); \ #ifdef SDP_PROFILING -struct sk_buff; +struct mbuf; struct sdpprf_log { int idx; int pid; int cpu; int sk_num; int sk_dport; - struct sk_buff *skb; + struct mbuf *mb; char msg[256]; unsigned long long time; @@ -74,7 +74,7 @@ static inline unsigned long long current l->sk_num = (sk) ? inet_sk(sk)->num : -1; \ l->sk_dport = (sk) ? ntohs(inet_sk(sk)->dport) : -1; \ l->cpu = smp_processor_id(); \ - l->skb = s; \ + l->mb = s; \ snprintf(l->msg, sizeof(l->msg) - 1, format, ## arg); \ l->time = current_nsec(); \ l->func = __func__; \ @@ -132,14 +132,14 @@ extern int sdp_data_debug_level; if (sdp_data_debug_level & 0x2) \ sdp_printk(KERN_WARNING, sk, format , ## arg); \ } while (0) -#define SDP_DUMP_PACKET(sk, str, skb, h) \ +#define SDP_DUMP_PACKET(sk, str, mb, h) \ do { \ if (sdp_data_debug_level & 0x1) \ - dump_packet(sk, str, skb, h); \ + dump_packet(sk, str, mb, h); \ } while (0) #else #define sdp_dbg_data(priv, format, arg...) -#define SDP_DUMP_PACKET(sk, str, skb, h) +#define SDP_DUMP_PACKET(sk, str, mb, h) #endif #define SOCK_REF_RESET "RESET" @@ -181,10 +181,10 @@ static inline char *sdp_state_str(int st struct sdp_bsdh; #ifdef CONFIG_INFINIBAND_SDP_DEBUG_DATA -void _dump_packet(const char *func, int line, struct sock *sk, char *str, - struct sk_buff *skb, const struct sdp_bsdh *h); -#define dump_packet(sk, str, skb, h) \ - _dump_packet(__func__, __LINE__, sk, str, skb, h) +void _dump_packet(const char *func, int line, struct socket *sk, char *str, + struct mbuf *mb, const struct sdp_bsdh *h); +#define dump_packet(sk, str, mb, h) \ + _dump_packet(__func__, __LINE__, sk, str, mb, h) #endif #endif Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Fri Oct 29 01:08:33 2010 (r214497) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Fri Oct 29 01:33:44 2010 (r214498) @@ -41,7 +41,7 @@ #if defined(__ia64__) /* csum_partial_copy_from_user is not exported on ia64. - We don't really need it for SDP - skb_copy_to_page happens to call it + We don't really need it for SDP - mb_copy_to_page happens to call it but for SDP HW checksum is always set, so ... */ #include @@ -140,13 +140,13 @@ inline void sdp_remove_sock(struct sdp_s spin_unlock_irq(&sock_list_lock); } -static int sdp_get_port(struct sock *sk, unsigned short snum) +static int sdp_get_port(struct socket *sk, unsigned short snum) { struct sdp_sock *ssk = sdp_sk(sk); - struct sockaddr_in *src_addr; + struct socketaddr_in *src_addr; int rc; - struct sockaddr_in addr = { + struct socketaddr_in addr = { .sin_family = AF_INET, .sin_port = htons(snum), .sin_addr.s_addr = inet_sk(sk)->rcv_saddr, @@ -166,7 +166,7 @@ static int sdp_get_port(struct sock *sk, if (!memcmp(&addr, &ssk->id->route.addr.src_addr, sizeof addr)) return 0; - rc = ssk->last_bind_err = rdma_bind_addr(ssk->id, (struct sockaddr *)&addr); + rc = ssk->last_bind_err = rdma_bind_addr(ssk->id, (struct socketaddr *)&addr); if (rc) { sdp_dbg(sk, "Destroying qp\n"); rdma_destroy_id(ssk->id); @@ -174,7 +174,7 @@ static int sdp_get_port(struct sock *sk, return rc; } - src_addr = (struct sockaddr_in *)&(ssk->id->route.addr.src_addr); + src_addr = (struct socketaddr_in *)&(ssk->id->route.addr.src_addr); inet_sk(sk)->num = ntohs(src_addr->sin_port); return 0; } @@ -199,7 +199,7 @@ static void sdp_destroy_qp(struct sdp_so sdp_remove_large_sock(ssk); } -static void sdp_reset_keepalive_timer(struct sock *sk, unsigned long len) +static void sdp_reset_keepalive_timer(struct socket *sk, unsigned long len) { struct sdp_sock *ssk = sdp_sk(sk); @@ -211,7 +211,7 @@ static void sdp_reset_keepalive_timer(st sk_reset_timer(sk, &sk->sk_timer, jiffies + len); } -static void sdp_delete_keepalive_timer(struct sock *sk) +static void sdp_delete_keepalive_timer(struct socket *sk) { struct sdp_sock *ssk = sdp_sk(sk); @@ -225,7 +225,7 @@ static void sdp_delete_keepalive_timer(s static void sdp_keepalive_timer(unsigned long data) { - struct sock *sk = (struct sock *)data; + struct socket *sk = (struct socket *)data; struct sdp_sock *ssk = sdp_sk(sk); sdp_dbg(sk, "%s\n", __func__); @@ -252,13 +252,13 @@ out: sock_put(sk, SOCK_REF_ALIVE); } -static void sdp_init_keepalive_timer(struct sock *sk) +static void sdp_init_keepalive_timer(struct socket *sk) { sk->sk_timer.function = sdp_keepalive_timer; sk->sk_timer.data = (unsigned long)sk; } -static void sdp_set_keepalive(struct sock *sk, int val) +static void sdp_set_keepalive(struct socket *sk, int val) { sdp_dbg(sk, "%s %d\n", __func__, val); @@ -271,14 +271,14 @@ static void sdp_set_keepalive(struct soc sdp_delete_keepalive_timer(sk); } -void sdp_start_keepalive_timer(struct sock *sk) +void sdp_start_keepalive_timer(struct socket *sk) { sdp_reset_keepalive_timer(sk, sdp_keepalive_time_when(sdp_sk(sk))); } void sdp_set_default_moderation(struct sdp_sock *ssk) { - struct sock *sk = &ssk->isk.sk; + struct socket *sk = &ssk->isk.sk; struct sdp_moderation *mod = &ssk->auto_mod; int rx_buf_size; @@ -420,7 +420,7 @@ out: mod->last_moder_jiffies = jiffies; } -void sdp_reset_sk(struct sock *sk, int rc) +void sdp_reset_sk(struct socket *sk, int rc) { struct sdp_sock *ssk = sdp_sk(sk); @@ -451,7 +451,7 @@ void sdp_reset_sk(struct sock *sk, int r /* Like tcp_reset */ /* When we get a reset (completion with error) we do this. */ -void sdp_reset(struct sock *sk) +void sdp_reset(struct socket *sk) { int err; @@ -471,7 +471,7 @@ void sdp_reset(struct sock *sk) } /* TODO: linger? */ -static void sdp_close_sk(struct sock *sk) +static void sdp_close_sk(struct socket *sk) { struct sdp_sock *ssk = sdp_sk(sk); struct rdma_cm_id *id = NULL; @@ -480,7 +480,7 @@ static void sdp_close_sk(struct sock *sk lock_sock(sk); sk->sk_send_head = NULL; - skb_queue_purge(&sk->sk_write_queue); + mb_queue_purge(&sk->sk_write_queue); /* * If sendmsg cached page exists, toss it. */ @@ -498,7 +498,7 @@ static void sdp_close_sk(struct sock *sk lock_sock(sk); } - skb_queue_purge(&sk->sk_receive_queue); + mb_queue_purge(&sk->sk_receive_queue); sdp_destroy_qp(ssk); @@ -508,7 +508,7 @@ static void sdp_close_sk(struct sock *sk flush_scheduled_work(); } -static void sdp_destruct(struct sock *sk) +static void sdp_destruct(struct socket *sk) { struct sdp_sock *ssk = sdp_sk(sk); struct sdp_sock *s, *t; @@ -549,7 +549,7 @@ static inline void sdp_start_dreq_wait_t ssk->dreq_wait_timeout = 1; } -static void sdp_send_disconnect(struct sock *sk) +static void sdp_send_disconnect(struct socket *sk) { sock_hold(sk, SOCK_REF_DREQ_TO); sdp_start_dreq_wait_timeout(sdp_sk(sk), SDP_FIN_WAIT_TIMEOUT); @@ -562,7 +562,7 @@ static void sdp_send_disconnect(struct s * State processing on a close. * TCP_ESTABLISHED -> TCP_FIN_WAIT1 -> TCP_CLOSE */ -static int sdp_close_state(struct sock *sk) +static int sdp_close_state(struct socket *sk) { switch (sk->sk_state) { case TCP_ESTABLISHED: @@ -583,7 +583,7 @@ static int sdp_close_state(struct sock * * count removed, we destroy rdma_id so cma_handler() won't be invoked. * This function should be called under lock_sock(sk). */ -static inline void disable_cma_handler(struct sock *sk) +static inline void disable_cma_handler(struct socket *sk) { if (sdp_sk(sk)->id) { struct rdma_cm_id *id = sdp_sk(sk)->id; @@ -595,9 +595,9 @@ static inline void disable_cma_handler(s } /* Like tcp_close */ -static void sdp_close(struct sock *sk, long timeout) +static void sdp_close(struct socket *sk, long timeout) { - struct sk_buff *skb; + struct mbuf *mb; int data_was_unread = 0; lock_sock(sk); @@ -631,15 +631,15 @@ static void sdp_close(struct sock *sk, l * descriptor close, not protocol-sourced closes, because the * reader process may not have drained the data yet! */ - while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) { - struct sdp_bsdh *h = (struct sdp_bsdh *)skb_transport_header(skb); + while ((mb = mb_dequeue(&sk->sk_receive_queue)) != NULL) { + struct sdp_bsdh *h = (struct sdp_bsdh *)mb_transport_header(mb); if (h->mid == SDP_MID_DISCONN) { sdp_handle_disconn(sk); } else { - sdp_dbg(sk, "Data was unread. skb: %p\n", skb); + sdp_dbg(sk, "Data was unread. mb: %p\n", mb); data_was_unread = 1; } - __kfree_skb(skb); + m_freem(mb); } sk_mem_reclaim(sk); @@ -719,10 +719,10 @@ out: sk_common_release(sk); } -static int sdp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) +static int sdp_connect(struct socket *sk, struct socketaddr *uaddr, int addr_len) { struct sdp_sock *ssk = sdp_sk(sk); - struct sockaddr_in src_addr = { + struct socketaddr_in src_addr = { .sin_family = AF_INET, .sin_port = htons(inet_sk(sk)->sport), .sin_addr.s_addr = inet_sk(sk)->saddr, @@ -730,7 +730,7 @@ static int sdp_connect(struct sock *sk, int rc; flush_workqueue(sdp_wq); - if (addr_len < sizeof(struct sockaddr_in)) + if (addr_len < sizeof(struct socketaddr_in)) return -EINVAL; if (uaddr->sa_family != AF_INET && uaddr->sa_family != AF_INET_SDP) @@ -746,15 +746,15 @@ static int sdp_connect(struct sock *sk, sdp_dbg(sk, "%s %u.%u.%u.%u:%hu -> %u.%u.%u.%u:%hu\n", __func__, NIPQUAD(src_addr.sin_addr.s_addr), ntohs(src_addr.sin_port), - NIPQUAD(((struct sockaddr_in *)uaddr)->sin_addr.s_addr), - ntohs(((struct sockaddr_in *)uaddr)->sin_port)); + NIPQUAD(((struct socketaddr_in *)uaddr)->sin_addr.s_addr), + ntohs(((struct socketaddr_in *)uaddr)->sin_port)); if (!ssk->id) { printk("??? ssk->id == NULL. Ohh\n"); return -EINVAL; } - rc = rdma_resolve_addr(ssk->id, (struct sockaddr *)&src_addr, + rc = rdma_resolve_addr(ssk->id, (struct socketaddr *)&src_addr, uaddr, SDP_RESOLVE_TIMEOUT); if (rc) { sdp_dbg(sk, "rdma_resolve_addr failed: %d\n", rc); @@ -765,7 +765,7 @@ static int sdp_connect(struct sock *sk, return 0; } -static int sdp_disconnect(struct sock *sk, int flags) +static int sdp_disconnect(struct socket *sk, int flags) { struct sdp_sock *ssk = sdp_sk(sk); int rc = 0; @@ -804,7 +804,7 @@ static int sdp_disconnect(struct sock *s } /* Like inet_csk_wait_for_connect */ -static int sdp_wait_for_connect(struct sock *sk, long timeo) +static int sdp_wait_for_connect(struct socket *sk, long timeo) { struct sdp_sock *ssk = sdp_sk(sk); DEFINE_WAIT(wait); @@ -853,10 +853,10 @@ static int sdp_wait_for_connect(struct s /* Consider using request_sock_queue instead of duplicating all this */ /* Like inet_csk_accept */ -static struct sock *sdp_accept(struct sock *sk, int flags, int *err) +static struct socket *sdp_accept(struct socket *sk, int flags, int *err) { struct sdp_sock *newssk = NULL, *ssk; - struct sock *newsk; + struct socket *newsk; int error; sdp_dbg(sk, "%s state %d expected %d *err %d\n", __func__, @@ -913,7 +913,7 @@ out_err: } /* Like tcp_ioctl */ -static int sdp_ioctl(struct sock *sk, int cmd, unsigned long arg) +static int sdp_ioctl(struct socket *sk, int cmd, unsigned long arg) { struct sdp_sock *ssk = sdp_sk(sk); int answ; @@ -935,9 +935,9 @@ static int sdp_ioctl(struct sock *sk, in answ = rcv_nxt(ssk) - ssk->copied_seq; /* Subtract 1, if FIN is in queue. */ - if (answ && !skb_queue_empty(&sk->sk_receive_queue)) + if (answ && !mb_queue_empty(&sk->sk_receive_queue)) answ -= - (skb_transport_header(sk->sk_receive_queue.prev))[0] + (mb_transport_header(sk->sk_receive_queue.prev))[0] == SDP_MID_DISCONN ? 1 : 0; } else answ = ssk->urg_seq - ssk->copied_seq; @@ -984,7 +984,7 @@ static void sdp_destroy_work(struct work { struct sdp_sock *ssk = container_of(work, struct sdp_sock, destroy_work); - struct sock *sk = &ssk->isk.sk; + struct socket *sk = &ssk->isk.sk; sdp_dbg(sk, "%s: refcnt %d\n", __func__, atomic_read(&sk->sk_refcnt)); sdp_destroy_qp(ssk); @@ -1014,7 +1014,7 @@ static void sdp_dreq_wait_timeout_work(s { struct sdp_sock *ssk = container_of(work, struct sdp_sock, dreq_wait_work.work); - struct sock *sk = &ssk->isk.sk; + struct socket *sk = &ssk->isk.sk; if (!ssk->dreq_wait_timeout) goto out; @@ -1061,7 +1061,7 @@ static struct lock_class_key ib_sdp_sk_c static void sdp_destroy_work(struct work_struct *work); static void sdp_dreq_wait_timeout_work(struct work_struct *work); -int sdp_init_sock(struct sock *sk) +int sdp_init_sock(struct socket *sk) { struct sdp_sock *ssk = sdp_sk(sk); @@ -1081,7 +1081,7 @@ int sdp_init_sock(struct sock *sk) sk->sk_route_caps |= NETIF_F_SG | NETIF_F_NO_CSUM; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Oct 29 02:12:37 2010 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 12602106566C; Fri, 29 Oct 2010 02:12:37 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F3E888FC17; Fri, 29 Oct 2010 02:12:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9T2CacM052756; Fri, 29 Oct 2010 02:12:36 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9T2CaXv052748; Fri, 29 Oct 2010 02:12:36 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010290212.o9T2CaXv052748@svn.freebsd.org> From: Jeff Roberson Date: Fri, 29 Oct 2010 02:12:36 +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: r214499 - projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp 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, 29 Oct 2010 02:12:37 -0000 Author: jeff Date: Fri Oct 29 02:12:36 2010 New Revision: 214499 URL: http://svn.freebsd.org/changeset/base/214499 Log: - sed fixup of tcp states. SDP does not actually use TCP but re-uses parts of the state machine. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Fri Oct 29 01:33:44 2010 (r214498) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Fri Oct 29 02:12:36 2010 (r214499) @@ -492,9 +492,9 @@ static inline void sdp_set_error(struct sk->sk_socket->state = SS_DISCONNECTING; if ((1 << sk->sk_state) & ib_teardown_states) - sdp_exch_state(sk, ib_teardown_states, TCP_TIME_WAIT); + sdp_exch_state(sk, ib_teardown_states, TCPS_TIME_WAIT); else - sdp_exch_state(sk, ~0, TCP_CLOSE); + sdp_exch_state(sk, ~0, TCPS_CLOSED); sk->sk_error_report(sk); } Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c Fri Oct 29 01:33:44 2010 (r214498) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c Fri Oct 29 02:12:36 2010 (r214499) @@ -158,7 +158,7 @@ void sdp_nagle_timeout(unsigned long dat goto out; } - if (sk->sk_state == TCP_CLOSE) { + if (sk->sk_state == TCPS_CLOSED) { bh_unlock_sock(sk); return; } Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c Fri Oct 29 01:33:44 2010 (r214498) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c Fri Oct 29 02:12:36 2010 (r214499) @@ -203,7 +203,7 @@ static int sdp_connect_handler(struct so &sdp_sk(sk)->backlog_queue); sdp_sk(child)->parent = sk; - sdp_exch_state(child, TCPF_LISTEN | TCPF_CLOSE, TCP_SYN_RECV); + sdp_exch_state(child, TCPF_LISTEN | TCPF_CLOSE, TCPS_SYN_RECEIVED); /* child->sk_write_space(child); */ /* child->sk_data_ready(child, 0); */ @@ -219,7 +219,7 @@ static int sdp_response_handler(struct s struct socketaddr_in *dst_addr; sdp_dbg(sk, "%s\n", __func__); - sdp_exch_state(sk, TCPF_SYN_SENT, TCP_ESTABLISHED); + sdp_exch_state(sk, TCPF_SYN_SENT, TCPS_ESTABLISHED); sdp_set_default_moderation(sdp_sk(sk)); if (sock_flag(sk, SOCK_KEEPOPEN)) @@ -259,7 +259,7 @@ static int sdp_connected_handler(struct parent = sdp_sk(sk)->parent; BUG_ON(!parent); - sdp_exch_state(sk, TCPF_SYN_RECV, TCP_ESTABLISHED); + sdp_exch_state(sk, TCPF_SYN_RECV, TCPS_ESTABLISHED); sdp_set_default_moderation(sdp_sk(sk)); @@ -298,7 +298,7 @@ static int sdp_disconnected_handler(stru if (ssk->tx_ring.cq) sdp_xmit_poll(ssk, 1); - if (sk->sk_state == TCP_SYN_RECV) { + if (sk->sk_state == TCPS_SYN_RECEIVED) { sdp_connected_handler(sk, NULL); if (rcv_nxt(ssk)) @@ -457,10 +457,10 @@ int sdp_cma_handler(struct rdma_cm_id *i case RDMA_CM_EVENT_DISCONNECTED: /* This means DREQ/DREP received */ sdp_dbg(sk, "RDMA_CM_EVENT_DISCONNECTED\n"); - if (sk->sk_state == TCP_LAST_ACK) { + if (sk->sk_state == TCPS_LAST_ACK) { sdp_cancel_dreq_wait_timeout(sdp_sk(sk)); - sdp_exch_state(sk, TCPF_LAST_ACK, TCP_TIME_WAIT); + sdp_exch_state(sk, TCPF_LAST_ACK, TCPS_TIME_WAIT); sdp_dbg(sk, "%s: waiting for Infiniband tear down\n", __func__); @@ -469,10 +469,10 @@ int sdp_cma_handler(struct rdma_cm_id *i sdp_sk(sk)->qp_active = 0; rdma_disconnect(id); - if (sk->sk_state != TCP_TIME_WAIT) { - if (sk->sk_state == TCP_CLOSE_WAIT) { + if (sk->sk_state != TCPS_TIME_WAIT) { + if (sk->sk_state == TCPS_CLOSED_WAIT) { sdp_dbg(sk, "IB teardown while in " - "TCP_CLOSE_WAIT taking reference to " + "TCPS_CLOSED_WAIT taking reference to " "let close() finish the work\n"); sock_hold(sk, SOCK_REF_CMA); } Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h Fri Oct 29 01:33:44 2010 (r214498) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h Fri Oct 29 02:12:36 2010 (r214499) @@ -160,17 +160,17 @@ extern int sdp_data_debug_level; static inline char *sdp_state_str(int state) { static char *state2str[] = { - ENUM2STR(TCP_ESTABLISHED), - ENUM2STR(TCP_SYN_SENT), - ENUM2STR(TCP_SYN_RECV), - ENUM2STR(TCP_FIN_WAIT1), + ENUM2STR(TCPS_ESTABLISHED), + ENUM2STR(TCPS_SYN_SENT), + ENUM2STR(TCPS_SYN_RECEIVED), + ENUM2STR(TCPS_FIN_WAIT_1), ENUM2STR(TCP_FIN_WAIT2), - ENUM2STR(TCP_TIME_WAIT), - ENUM2STR(TCP_CLOSE), - ENUM2STR(TCP_CLOSE_WAIT), - ENUM2STR(TCP_LAST_ACK), - ENUM2STR(TCP_LISTEN), - ENUM2STR(TCP_CLOSING), + ENUM2STR(TCPS_TIME_WAIT), + ENUM2STR(TCPS_CLOSED), + ENUM2STR(TCPS_CLOSED_WAIT), + ENUM2STR(TCPS_LAST_ACK), + ENUM2STR(TCPS_LISTEN), + ENUM2STR(TCPS_CLOSING), }; if (state < 0 || state >= ARRAY_SIZE(state2str)) Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Fri Oct 29 01:33:44 2010 (r214498) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Fri Oct 29 02:12:36 2010 (r214499) @@ -237,8 +237,8 @@ static void sdp_keepalive_timer(unsigned goto out; } - if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCP_LISTEN || - sk->sk_state == TCP_CLOSE) + if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCPS_LISTEN || + sk->sk_state == TCPS_CLOSED) goto out; if (ssk->keepalive_tx_head == ring_head(ssk->tx_ring) && @@ -457,7 +457,7 @@ void sdp_reset(struct socket *sk) sdp_dbg(sk, "%s state=%d\n", __func__, sk->sk_state); - if (sk->sk_state != TCP_ESTABLISHED) + if (sk->sk_state != TCPS_ESTABLISHED) return; /* We want the right error as BSD sees it (and indeed as we do). */ @@ -560,16 +560,16 @@ static void sdp_send_disconnect(struct s /* * State processing on a close. - * TCP_ESTABLISHED -> TCP_FIN_WAIT1 -> TCP_CLOSE + * TCPS_ESTABLISHED -> TCPS_FIN_WAIT_1 -> TCPS_CLOSED */ static int sdp_close_state(struct socket *sk) { switch (sk->sk_state) { - case TCP_ESTABLISHED: - sdp_exch_state(sk, TCPF_ESTABLISHED, TCP_FIN_WAIT1); + case TCPS_ESTABLISHED: + sdp_exch_state(sk, TCPF_ESTABLISHED, TCPS_FIN_WAIT_1); break; - case TCP_CLOSE_WAIT: - sdp_exch_state(sk, TCPF_CLOSE_WAIT, TCP_LAST_ACK); + case TCPS_CLOSED_WAIT: + sdp_exch_state(sk, TCPF_CLOSE_WAIT, TCPS_LAST_ACK); break; default: return 0; @@ -616,8 +616,8 @@ static void sdp_close(struct socket *sk, goto out; } - if (sk->sk_state == TCP_LISTEN || sk->sk_state == TCP_SYN_SENT) { - sdp_exch_state(sk, TCPF_LISTEN | TCPF_SYN_SENT, TCP_CLOSE); + if (sk->sk_state == TCPS_LISTEN || sk->sk_state == TCPS_SYN_SENT) { + sdp_exch_state(sk, TCPF_LISTEN | TCPF_SYN_SENT, TCPS_CLOSED); disable_cma_handler(sk); /* Special case: stop listening. @@ -658,7 +658,7 @@ static void sdp_close(struct socket *sk, /* Unread data was tossed, zap the connection. */ NET_INC_STATS_USER(sock_net(sk), LINUX_MIB_TCPABORTONCLOSE); sdp_exch_state(sk, TCPF_CLOSE_WAIT | TCPF_ESTABLISHED, - TCP_TIME_WAIT); + TCPS_TIME_WAIT); /* Go into abortive close */ sk->sk_prot->disconnect(sk, 0); @@ -674,7 +674,7 @@ static void sdp_close(struct socket *sk, Since it currently doesn't, do it here to avoid blocking below. */ if (!sdp_sk(sk)->id) sdp_exch_state(sk, TCPF_FIN_WAIT1 | TCPF_LAST_ACK | - TCPF_CLOSE_WAIT, TCP_CLOSE); + TCPF_CLOSE_WAIT, TCPS_CLOSED); sk_stream_wait_close(sk, timeout); @@ -701,7 +701,7 @@ adjudge_to_death: * consume significant resources. Let's do it with special * linger2 option. --ANK */ - if (sk->sk_state == TCP_FIN_WAIT1) { + if (sk->sk_state == TCPS_FIN_WAIT_1) { /* TODO: liger2 unimplemented. We should wait 3.5 * rto. How do I know rto? */ /* TODO: tcp_fin_time to get timeout */ @@ -761,7 +761,7 @@ static int sdp_connect(struct socket *sk return rc; } - sdp_exch_state(sk, TCPF_CLOSE, TCP_SYN_SENT); + sdp_exch_state(sk, TCPF_CLOSE, TCPS_SYN_SENT); return 0; } @@ -774,7 +774,7 @@ static int sdp_disconnect(struct socket sdp_dbg(sk, "%s\n", __func__); - if (sk->sk_state != TCP_LISTEN) { + if (sk->sk_state != TCPS_LISTEN) { if (ssk->id) { sdp_sk(sk)->qp_active = 0; rc = rdma_disconnect(ssk->id); @@ -783,7 +783,7 @@ static int sdp_disconnect(struct socket return rc; } - sdp_exch_state(sk, TCPF_LISTEN, TCP_CLOSE); + sdp_exch_state(sk, TCPF_LISTEN, TCPS_CLOSED); id = ssk->id; ssk->id = NULL; release_sock(sk); /* release socket since locking semantics is parent @@ -837,7 +837,7 @@ static int sdp_wait_for_connect(struct s if (!list_empty(&ssk->accept_queue)) break; err = -EINVAL; - if (sk->sk_state != TCP_LISTEN) + if (sk->sk_state != TCPS_LISTEN) break; err = sock_intr_errno(timeo); if (signal_pending(current)) @@ -860,7 +860,7 @@ static struct socket *sdp_accept(struct int error; sdp_dbg(sk, "%s state %d expected %d *err %d\n", __func__, - sk->sk_state, TCP_LISTEN, *err); + sk->sk_state, TCPS_LISTEN, *err); ssk = sdp_sk(sk); lock_sock(sk); @@ -869,7 +869,7 @@ static struct socket *sdp_accept(struct * and that it has something pending. */ error = -EINVAL; - if (sk->sk_state != TCP_LISTEN) + if (sk->sk_state != TCPS_LISTEN) goto out_err; /* Find already established connection */ @@ -922,7 +922,7 @@ static int sdp_ioctl(struct socket *sk, switch (cmd) { case SIOCINQ: - if (sk->sk_state == TCP_LISTEN) + if (sk->sk_state == TCPS_LISTEN) return -EINVAL; lock_sock(sk); @@ -947,7 +947,7 @@ static int sdp_ioctl(struct socket *sk, answ = ssk->urg_data && ssk->urg_seq == ssk->copied_seq; break; case SIOCOUTQ: - if (sk->sk_state == TCP_LISTEN) + if (sk->sk_state == TCPS_LISTEN) return -EINVAL; if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) @@ -1000,13 +1000,13 @@ static void sdp_destroy_work(struct work cancel_delayed_work(&ssk->srcavail_cancel_work); - if (sk->sk_state == TCP_TIME_WAIT) + if (sk->sk_state == TCPS_TIME_WAIT) sock_put(sk, SOCK_REF_CMA); - /* In normal close current state is TCP_TIME_WAIT or TCP_CLOSE + /* In normal close current state is TCPS_TIME_WAIT or TCPS_CLOSED but if a CM connection is dropped below our legs state could be any state */ - sdp_exch_state(sk, ~0, TCP_CLOSE); + sdp_exch_state(sk, ~0, TCPS_CLOSED); sock_put(sk, SOCK_REF_RESET); } @@ -1032,10 +1032,10 @@ static void sdp_dreq_wait_timeout_work(s sdp_sk(sk)->dreq_wait_timeout = 0; - if (sk->sk_state == TCP_FIN_WAIT1) + if (sk->sk_state == TCPS_FIN_WAIT_1) percpu_counter_dec(ssk->isk.sk.sk_prot->orphan_count); - sdp_exch_state(sk, TCPF_LAST_ACK | TCPF_FIN_WAIT1, TCP_TIME_WAIT); + sdp_exch_state(sk, TCPF_LAST_ACK | TCPF_FIN_WAIT1, TCPS_TIME_WAIT); release_sock(sk); @@ -1339,7 +1339,7 @@ static int sdp_recv_urg(struct socket *s ssk->urg_data == TCP_URG_READ) return -EINVAL; /* Yes this is right ! */ - if (sk->sk_state == TCP_CLOSE && !sock_flag(sk, SOCK_DONE)) + if (sk->sk_state == TCPS_CLOSED && !sock_flag(sk, SOCK_DONE)) return -ENOTCONN; if (ssk->urg_data & TCP_URG_VALID) { @@ -1362,7 +1362,7 @@ static int sdp_recv_urg(struct socket *s return err ? -EFAULT : len; } - if (sk->sk_state == TCP_CLOSE || (sk->sk_shutdown & RCV_SHUTDOWN)) + if (sk->sk_state == TCPS_CLOSED || (sk->sk_shutdown & RCV_SHUTDOWN)) return 0; /* Fixed the recv(..., MSG_OOB) behaviour. BSD docs and @@ -2095,7 +2095,7 @@ static int sdp_recvmsg(struct kiocb *ioc sdp_prf(sk, mb, "Read from user"); err = -ENOTCONN; - if (sk->sk_state == TCP_LISTEN) + if (sk->sk_state == TCPS_LISTEN) goto out; timeo = sock_rcvtimeo(sk, noblock); @@ -2222,7 +2222,7 @@ sdp_mid_data: if (copied) { if (sk->sk_err || - sk->sk_state == TCP_CLOSE || + sk->sk_state == TCPS_CLOSED || (sk->sk_shutdown & RCV_SHUTDOWN) || !timeo || signal_pending(current) || @@ -2240,7 +2240,7 @@ sdp_mid_data: if (sk->sk_shutdown & RCV_SHUTDOWN) break; - if (sk->sk_state == TCP_CLOSE) { + if (sk->sk_state == TCPS_CLOSED) { if (!sock_flag(sk, SOCK_DONE)) { /* This occurs when user tries to read * from never connected socket. @@ -2434,7 +2434,7 @@ static int sdp_listen(struct socket *sk, sdp_warn(sk, "rdma_listen failed: %d\n", rc); sdp_set_error(sk, rc); } else - sdp_exch_state(sk, TCPF_CLOSE, TCP_LISTEN); + sdp_exch_state(sk, TCPF_CLOSE, TCPS_LISTEN); return rc; } @@ -2460,7 +2460,7 @@ static int sdp_inet_listen(struct socket /* Really, if the socket is already in listen state * we can only allow the backlog to be adjusted. */ - if (old_state != TCP_LISTEN) { + if (old_state != TCPS_LISTEN) { err = sdp_listen(sk, backlog); if (err) goto out; @@ -2504,7 +2504,7 @@ static unsigned int sdp_poll(struct file /* TODO: Slightly ugly: it would be nicer if there was function * like datagram_poll that didn't include poll_wait, * then we could reverse the order. */ - if (sk->sk_state == TCP_LISTEN) + if (sk->sk_state == TCPS_LISTEN) return sdp_listen_poll(sk); if (ssk->urg_data & TCP_URG_VALID) Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c Fri Oct 29 01:33:44 2010 (r214498) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c Fri Oct 29 02:12:36 2010 (r214499) @@ -89,20 +89,20 @@ void sdp_handle_disconn(struct socket *s sock_set_flag(sk, SOCK_DONE); switch (sk->sk_state) { - case TCP_SYN_RECV: - case TCP_ESTABLISHED: + case TCPS_SYN_RECEIVED: + case TCPS_ESTABLISHED: sdp_exch_state(sk, TCPF_SYN_RECV | TCPF_ESTABLISHED, - TCP_CLOSE_WAIT); + TCPS_CLOSED_WAIT); break; - case TCP_FIN_WAIT1: + case TCPS_FIN_WAIT_1: /* Received a reply FIN - start Infiniband tear down */ sdp_dbg(sk, "%s: Starting Infiniband tear down sending DREQ\n", __func__); sdp_cancel_dreq_wait_timeout(sdp_sk(sk)); - sdp_exch_state(sk, TCPF_FIN_WAIT1, TCP_TIME_WAIT); + sdp_exch_state(sk, TCPF_FIN_WAIT1, TCPS_TIME_WAIT); if (sdp_sk(sk)->id) { sdp_sk(sk)->qp_active = 0; @@ -112,11 +112,11 @@ void sdp_handle_disconn(struct socket *s return; } break; - case TCP_TIME_WAIT: + case TCPS_TIME_WAIT: /* This is a mutual close situation and we've got the DREQ from the peer before the SDP_MID_DISCONNECT */ break; - case TCP_CLOSE: + case TCPS_CLOSED: /* FIN arrived after IB teardown started - do nothing */ sdp_dbg(sk, "%s: fin in state %s\n", __func__, sdp_state_str(sk->sk_state)); @@ -135,7 +135,7 @@ void sdp_handle_disconn(struct socket *s /* Do not send POLL_HUP for half duplex close. */ if (sk->sk_shutdown == SHUTDOWN_MASK || - sk->sk_state == TCP_CLOSE) + sk->sk_state == TCPS_CLOSED) sk_wake_async(sk, 1, POLL_HUP); else sk_wake_async(sk, 1, POLL_IN); @@ -436,11 +436,11 @@ static int sdp_process_rx_ctl_mb(struct sdp_dbg(sk, "DATA after socket rcv was shutdown\n"); /* got data in RCV_SHUTDOWN */ - if (sk->sk_state == TCP_FIN_WAIT1) { + if (sk->sk_state == TCPS_FIN_WAIT_1) { sdp_dbg(sk, "RX data when state = FIN_WAIT1\n"); /* go into abortive close */ sdp_exch_state(sk, TCPF_FIN_WAIT1, - TCP_TIME_WAIT); + TCPS_TIME_WAIT); sk->sk_prot->disconnect(sk, 0); } @@ -746,7 +746,7 @@ void sdp_do_posts(struct sdp_sock *ssk) while ((mb = mb_dequeue(&ssk->rx_ctl_q))) sdp_process_rx_ctl_mb(ssk, mb); - if (sk->sk_state == TCP_TIME_WAIT) + if (sk->sk_state == TCPS_TIME_WAIT) return; if (!ssk->rx_ring.cq || !ssk->tx_ring.cq) Modified: projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c Fri Oct 29 01:33:44 2010 (r214498) +++ projects/ofed/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c Fri Oct 29 02:12:36 2010 (r214499) @@ -378,7 +378,7 @@ static void sdp_poll_tx_timeout(unsigned goto out; } - if (unlikely(sk->sk_state == TCP_CLOSE)) { + if (unlikely(sk->sk_state == TCPS_CLOSED)) { sdp_warn(sk, "Socket is closed\n"); goto out; } From owner-svn-src-projects@FreeBSD.ORG Sat Oct 30 16:51:26 2010 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 6173E1065672; Sat, 30 Oct 2010 16:51:26 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4F6938FC1F; Sat, 30 Oct 2010 16:51:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9UGpQ52006126; Sat, 30 Oct 2010 16:51:26 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9UGpQXY006124; Sat, 30 Oct 2010 16:51:26 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201010301651.o9UGpQXY006124@svn.freebsd.org> From: Dimitry Andric Date: Sat, 30 Oct 2010 16:51: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: r214561 - projects/binutils-2.17/libexec/rtld-elf 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, 30 Oct 2010 16:51:26 -0000 Author: dim Date: Sat Oct 30 16:51:25 2010 New Revision: 214561 URL: http://svn.freebsd.org/changeset/base/214561 Log: Use -fPIC for rtld-elf, so it can link on sparc64. Modified: projects/binutils-2.17/libexec/rtld-elf/Makefile Modified: projects/binutils-2.17/libexec/rtld-elf/Makefile ============================================================================== --- projects/binutils-2.17/libexec/rtld-elf/Makefile Sat Oct 30 16:30:50 2010 (r214560) +++ projects/binutils-2.17/libexec/rtld-elf/Makefile Sat Oct 30 16:51:25 2010 (r214561) @@ -29,7 +29,7 @@ SYMLINKS= ${BINDIR}/${PROG} /usr/libexec MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 -CFLAGS+= -fpic -DPIC +CFLAGS+= -fPIC -DPIC LDFLAGS+= -shared -Wl,-Bsymbolic DPADD= ${LIBC_PIC} LDADD= -lc_pic -lssp_nonshared