From owner-svn-src-stable-7@FreeBSD.ORG Sun Nov 22 23:46:44 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3302106568B; Sun, 22 Nov 2009 23:46:44 +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 A0E1F8FC14; Sun, 22 Nov 2009 23:46: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 nAMNki4H033372; Sun, 22 Nov 2009 23:46:44 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAMNkiTe033370; Sun, 22 Nov 2009 23:46:44 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <200911222346.nAMNkiTe033370@svn.freebsd.org> From: Attilio Rao Date: Sun, 22 Nov 2009 23:46:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199682 - stable/7/sys/fs/fifofs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Nov 2009 23:46:44 -0000 Author: attilio Date: Sun Nov 22 23:46:44 2009 New Revision: 199682 URL: http://svn.freebsd.org/changeset/base/199682 Log: MFC r199007: Fix a memory leak. Modified: stable/7/sys/fs/fifofs/fifo_vnops.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/fs/fifofs/fifo_vnops.c ============================================================================== --- stable/7/sys/fs/fifofs/fifo_vnops.c Sun Nov 22 21:58:06 2009 (r199681) +++ stable/7/sys/fs/fifofs/fifo_vnops.c Sun Nov 22 23:46:44 2009 (r199682) @@ -76,6 +76,10 @@ struct fileops fifo_ops_f = { /* * This structure is associated with the FIFO vnode and stores * the state associated with the FIFO. + * Notes about locking: + * - fi_readsock and fi_writesock are invariant since init time. + * - fi_readers and fi_writers are vnode lock protected. + * - fi_wgen is fif_mtx lock protected. */ struct fifoinfo { struct socket *fi_readsock; @@ -210,14 +214,9 @@ fail1: } /* - * General access to fi_readers and fi_writers is protected using - * the vnode lock. - * - * Protect the increment of fi_readers and fi_writers and the - * associated calls to wakeup() with the fifo mutex in addition - * to the vnode lock. This allows the vnode lock to be dropped - * for the msleep() calls below, and using the fifo mutex with - * msleep() prevents the wakeup from being missed. + * Use the fifo_mtx lock here, in addition to the vnode lock, + * in order to allow vnode lock dropping before msleep() calls + * and still avoiding missed wakeups. */ mtx_lock(&fifo_mtx); if (ap->a_mode & FREAD) { @@ -235,6 +234,8 @@ fail1: if (ap->a_mode & FWRITE) { if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) { mtx_unlock(&fifo_mtx); + if (fip->fi_writers == 0) + fifo_cleanup(vp); return (ENXIO); } fip->fi_writers++; From owner-svn-src-stable-7@FreeBSD.ORG Sun Nov 22 23:51:52 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A1AB106568B; Sun, 22 Nov 2009 23:51:52 +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 EC2BF8FC17; Sun, 22 Nov 2009 23:51:51 +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 nAMNppbB033504; Sun, 22 Nov 2009 23:51:51 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAMNpp5c033502; Sun, 22 Nov 2009 23:51:51 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <200911222351.nAMNpp5c033502@svn.freebsd.org> From: Attilio Rao Date: Sun, 22 Nov 2009 23:51:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199683 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Nov 2009 23:51:52 -0000 Author: attilio Date: Sun Nov 22 23:51:51 2009 New Revision: 199683 URL: http://svn.freebsd.org/changeset/base/199683 Log: MFC r199209: Fix a potential buffer boundaries overflow in devclass_add_device() by using all available int lenghts digits for storing the information. Modified: stable/7/sys/kern/subr_bus.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/subr_bus.c ============================================================================== --- stable/7/sys/kern/subr_bus.c Sun Nov 22 23:46:44 2009 (r199682) +++ stable/7/sys/kern/subr_bus.c Sun Nov 22 23:51:51 2009 (r199683) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -1394,7 +1395,7 @@ devclass_add_device(devclass_t dc, devic PDEBUG(("%s in devclass %s", DEVICENAME(dev), DEVCLANAME(dc))); - buflen = snprintf(NULL, 0, "%s%d$", dc->name, dev->unit); + buflen = snprintf(NULL, 0, "%s%d$", dc->name, INT_MAX); if (buflen < 0) return (ENOMEM); dev->nameunit = malloc(buflen, M_BUS, M_NOWAIT|M_ZERO); From owner-svn-src-stable-7@FreeBSD.ORG Sun Nov 22 23:54:20 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 570C3106566C; Sun, 22 Nov 2009 23:54:20 +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 451D88FC14; Sun, 22 Nov 2009 23:54:20 +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 nAMNsKkd033590; Sun, 22 Nov 2009 23:54:20 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAMNsKvX033588; Sun, 22 Nov 2009 23:54:20 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <200911222354.nAMNsKvX033588@svn.freebsd.org> From: Attilio Rao Date: Sun, 22 Nov 2009 23:54:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199684 - stable/7/usr.bin/kdump X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Nov 2009 23:54:20 -0000 Author: attilio Date: Sun Nov 22 23:54:19 2009 New Revision: 199684 URL: http://svn.freebsd.org/changeset/base/199684 Log: MFC r199024: Use a safety belt for cases where corrupted narg can be passed to the ktrsyscall(). Modified: stable/7/usr.bin/kdump/kdump.c Directory Properties: stable/7/usr.bin/kdump/ (props changed) Modified: stable/7/usr.bin/kdump/kdump.c ============================================================================== --- stable/7/usr.bin/kdump/kdump.c Sun Nov 22 23:51:51 2009 (r199683) +++ stable/7/usr.bin/kdump/kdump.c Sun Nov 22 23:54:19 2009 (r199684) @@ -802,7 +802,7 @@ ktrsyscall(struct ktr_syscall *ktr) narg--; } } - while (narg) { + while (narg > 0) { print_number(ip,narg,c); } (void)putchar(')'); From owner-svn-src-stable-7@FreeBSD.ORG Mon Nov 23 09:15:17 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0903C1065672; Mon, 23 Nov 2009 09:15:17 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EB1788FC18; Mon, 23 Nov 2009 09:15:16 +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 nAN9FGLX047204; Mon, 23 Nov 2009 09:15:16 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN9FG5h047202; Mon, 23 Nov 2009 09:15:16 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <200911230915.nAN9FG5h047202@svn.freebsd.org> From: Christian Brueffer Date: Mon, 23 Nov 2009 09:15:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199702 - stable/7/lib/libc/posix1e X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2009 09:15:17 -0000 Author: brueffer Date: Mon Nov 23 09:15:16 2009 New Revision: 199702 URL: http://svn.freebsd.org/changeset/base/199702 Log: MFC: r199317 Fix a memory leak in acl_from_text() in case the conversion succeeded. Modified: stable/7/lib/libc/posix1e/acl_from_text.c Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/posix1e/acl_from_text.c ============================================================================== --- stable/7/lib/libc/posix1e/acl_from_text.c Mon Nov 23 09:13:32 2009 (r199701) +++ stable/7/lib/libc/posix1e/acl_from_text.c Mon Nov 23 09:15:16 2009 (r199702) @@ -229,6 +229,7 @@ acl_from_text(const char *buf_p) } #endif + free(mybuf_p); return(acl); error_label: From owner-svn-src-stable-7@FreeBSD.ORG Mon Nov 23 09:45:11 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 930631065676; Mon, 23 Nov 2009 09:45:11 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 80F628FC23; Mon, 23 Nov 2009 09:45:11 +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 nAN9jB2v048428; Mon, 23 Nov 2009 09:45:11 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN9jBRa048426; Mon, 23 Nov 2009 09:45:11 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <200911230945.nAN9jBRa048426@svn.freebsd.org> From: Christian Brueffer Date: Mon, 23 Nov 2009 09:45:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199710 - stable/7/lib/libc/locale X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2009 09:45:11 -0000 Author: brueffer Date: Mon Nov 23 09:45:11 2009 New Revision: 199710 URL: http://svn.freebsd.org/changeset/base/199710 Log: MFC: r199320 Fix grammar. Modified: stable/7/lib/libc/locale/nl_langinfo.3 Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/locale/nl_langinfo.3 ============================================================================== --- stable/7/lib/libc/locale/nl_langinfo.3 Mon Nov 23 09:44:08 2009 (r199709) +++ stable/7/lib/libc/locale/nl_langinfo.3 Mon Nov 23 09:45:11 2009 (r199710) @@ -53,7 +53,7 @@ with a category corresponding to the cat or to the category .Dv LC_ALL , -may overwrite buffer pointed by the return value. +may overwrite the buffer pointed to by the return value. .Sh RETURN VALUES In a locale where langinfo data is not defined, .Fn nl_langinfo From owner-svn-src-stable-7@FreeBSD.ORG Tue Nov 24 22:13:07 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB84A106568D; Tue, 24 Nov 2009 22:13:06 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D9A3F8FC13; Tue, 24 Nov 2009 22:13:06 +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 nAOMD6PM030924; Tue, 24 Nov 2009 22:13:06 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOMD6Yk030922; Tue, 24 Nov 2009 22:13:06 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200911242213.nAOMD6Yk030922@svn.freebsd.org> From: Marius Strobl Date: Tue, 24 Nov 2009 22:13:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199768 - stable/7/sys/sparc64/sparc64 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2009 22:13:07 -0000 Author: marius Date: Tue Nov 24 22:13:06 2009 New Revision: 199768 URL: http://svn.freebsd.org/changeset/base/199768 Log: MFC: r199442 Unroll copying of the registers in {g,s}et_mcontext() and limit it to the set actually restored by tl0_ret() instead of using the whole trapframe. Additionally skip %g7 as that register is used as the userland TLS pointer. PR: 140523 Modified: stable/7/sys/sparc64/sparc64/machdep.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/sparc64/machdep.c ============================================================================== --- stable/7/sys/sparc64/sparc64/machdep.c Tue Nov 24 21:06:41 2009 (r199767) +++ stable/7/sys/sparc64/sparc64/machdep.c Tue Nov 24 22:13:06 2009 (r199768) @@ -695,12 +695,39 @@ get_mcontext(struct thread *td, mcontext tf = td->td_frame; pcb = td->td_pcb; - bcopy(tf, mc, sizeof(*tf)); + /* + * Copy the registers which will be restored by tl0_ret() from the + * trapframe. + * Note that we skip %g7 which is used as the userland TLS register + * and %wstate. + */ + mc->mc_flags = _MC_VERSION; + mc->mc_global[1] = tf->tf_global[1]; + mc->mc_global[2] = tf->tf_global[2]; + mc->mc_global[3] = tf->tf_global[3]; + mc->mc_global[4] = tf->tf_global[4]; + mc->mc_global[5] = tf->tf_global[5]; + mc->mc_global[6] = tf->tf_global[6]; if (flags & GET_MC_CLEAR_RET) { mc->mc_out[0] = 0; mc->mc_out[1] = 0; + } else { + mc->mc_out[0] = tf->tf_out[0]; + mc->mc_out[1] = tf->tf_out[1]; } - mc->mc_flags = _MC_VERSION; + mc->mc_out[2] = tf->tf_out[2]; + mc->mc_out[3] = tf->tf_out[3]; + mc->mc_out[4] = tf->tf_out[4]; + mc->mc_out[5] = tf->tf_out[5]; + mc->mc_out[6] = tf->tf_out[6]; + mc->mc_out[7] = tf->tf_out[7]; + mc->mc_fprs = tf->tf_fprs; + mc->mc_fsr = tf->tf_fsr; + mc->mc_gsr = tf->tf_gsr; + mc->mc_tnpc = tf->tf_tnpc; + mc->mc_tpc = tf->tf_tpc; + mc->mc_tstate = tf->tf_tstate; + mc->mc_y = tf->tf_y; critical_enter(); if ((tf->tf_fprs & FPRS_FEF) != 0) { savefpctx(pcb->pcb_ufp); @@ -720,7 +747,6 @@ set_mcontext(struct thread *td, const mc { struct trapframe *tf; struct pcb *pcb; - uint64_t wstate; if (!TSTATE_SECURE(mc->mc_tstate) || (mc->mc_flags & ((1L << _MC_VERSION_BITS) - 1)) != _MC_VERSION) @@ -729,9 +755,33 @@ set_mcontext(struct thread *td, const mc pcb = td->td_pcb; /* Make sure the windows are spilled first. */ flushw(); - wstate = tf->tf_wstate; - bcopy(mc, tf, sizeof(*tf)); - tf->tf_wstate = wstate; + /* + * Copy the registers which will be restored by tl0_ret() to the + * trapframe. + * Note that we skip %g7 which is used as the userland TLS register + * and %wstate. + */ + tf->tf_global[1] = mc->mc_global[1]; + tf->tf_global[2] = mc->mc_global[2]; + tf->tf_global[3] = mc->mc_global[3]; + tf->tf_global[4] = mc->mc_global[4]; + tf->tf_global[5] = mc->mc_global[5]; + tf->tf_global[6] = mc->mc_global[6]; + tf->tf_out[0] = mc->mc_out[0]; + tf->tf_out[1] = mc->mc_out[1]; + tf->tf_out[2] = mc->mc_out[2]; + tf->tf_out[3] = mc->mc_out[3]; + tf->tf_out[4] = mc->mc_out[4]; + tf->tf_out[5] = mc->mc_out[5]; + tf->tf_out[6] = mc->mc_out[6]; + tf->tf_out[7] = mc->mc_out[7]; + tf->tf_fprs = mc->mc_fprs; + tf->tf_fsr = mc->mc_fsr; + tf->tf_gsr = mc->mc_gsr; + tf->tf_tnpc = mc->mc_tnpc; + tf->tf_tpc = mc->mc_tpc; + tf->tf_tstate = mc->mc_tstate; + tf->tf_y = mc->mc_y; if ((mc->mc_fprs & FPRS_FEF) != 0) { tf->tf_fprs = 0; bcopy(mc->mc_fp, pcb->pcb_ufp, sizeof(pcb->pcb_ufp)); From owner-svn-src-stable-7@FreeBSD.ORG Wed Nov 25 11:16:39 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73B00106568D; Wed, 25 Nov 2009 11:16:39 +0000 (UTC) (envelope-from roam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 625258FC08; Wed, 25 Nov 2009 11:16:39 +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 nAPBGdMg049034; Wed, 25 Nov 2009 11:16:39 GMT (envelope-from roam@svn.freebsd.org) Received: (from roam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAPBGdC9049032; Wed, 25 Nov 2009 11:16:39 GMT (envelope-from roam@svn.freebsd.org) Message-Id: <200911251116.nAPBGdC9049032@svn.freebsd.org> From: Peter Pentchev Date: Wed, 25 Nov 2009 11:16:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199794 - stable/7/lib/libc/locale X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2009 11:16:39 -0000 Author: roam (doc,ports committer) Date: Wed Nov 25 11:16:39 2009 New Revision: 199794 URL: http://svn.freebsd.org/changeset/base/199794 Log: Merge rev. 199180 to 7.x-STABLE, the change to isblank(3): Fix the grammar as in the PR, and then some. PR: 140454 Submitted by: Jeremy Huddleston Modified: stable/7/lib/libc/locale/isblank.3 Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/locale/isblank.3 ============================================================================== --- stable/7/lib/libc/locale/isblank.3 Wed Nov 25 10:56:50 2009 (r199793) +++ stable/7/lib/libc/locale/isblank.3 Wed Nov 25 11:16:39 2009 (r199794) @@ -50,9 +50,9 @@ For any locale, this includes the follow .It "\&``\et''\t`` ''" .El .Pp -In the "C" locale +In the "C" locale, a successful .Fn isblank -successful test is limited to this characters only. +test is limited to these characters only. The value of the argument must be representable as an .Vt "unsigned char" or the value of From owner-svn-src-stable-7@FreeBSD.ORG Wed Nov 25 11:25:06 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02E1A106568B; Wed, 25 Nov 2009 11:25:06 +0000 (UTC) (envelope-from roam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E5A6E8FC15; Wed, 25 Nov 2009 11:25:05 +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 nAPBP5Ac049358; Wed, 25 Nov 2009 11:25:05 GMT (envelope-from roam@svn.freebsd.org) Received: (from roam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAPBP5l8049356; Wed, 25 Nov 2009 11:25:05 GMT (envelope-from roam@svn.freebsd.org) Message-Id: <200911251125.nAPBP5l8049356@svn.freebsd.org> From: Peter Pentchev Date: Wed, 25 Nov 2009 11:25:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199797 - stable/7/share/misc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2009 11:25:06 -0000 Author: roam (doc,ports committer) Date: Wed Nov 25 11:25:05 2009 New Revision: 199797 URL: http://svn.freebsd.org/changeset/base/199797 Log: Merge rev. 199181 to 7.x-STABLE: Correct the information about the doceng@ team members - Murray Stokely stepped down some time ago, about the same time as Giorgos Keramidas joined the team. PR: 140465 Submitted by: Denny Lin Modified: stable/7/share/misc/organization.dot Directory Properties: stable/7/share/misc/ (props changed) stable/7/share/misc/iso639 (props changed) stable/7/share/misc/pci_vendors (props changed) Modified: stable/7/share/misc/organization.dot ============================================================================== --- stable/7/share/misc/organization.dot Wed Nov 25 11:23:44 2009 (r199796) +++ stable/7/share/misc/organization.dot Wed Nov 25 11:25:05 2009 (r199797) @@ -28,7 +28,7 @@ _misc [label="Miscellaneous Hats"] core [label="Core Team\ncore@FreeBSD.org\nwilko, brooks, keramida, imp,\ngnn, wes, hrs, murray,\nrwatson"] coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\njoel"] doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] -doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nnik, blackend, hrs,\nmurray"] +doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nnik, blackend, hrs,\nkeramida"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nmarcus, kris, erwin,\nlinimon, pav, krion"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nerwin"] From owner-svn-src-stable-7@FreeBSD.ORG Wed Nov 25 18:31:59 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BC7E106568B; Wed, 25 Nov 2009 18:31:59 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3A9B48FC1F; Wed, 25 Nov 2009 18:31: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 nAPIVxRP058307; Wed, 25 Nov 2009 18:31:59 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAPIVx2G058305; Wed, 25 Nov 2009 18:31:59 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200911251831.nAPIVx2G058305@svn.freebsd.org> From: Marius Strobl Date: Wed, 25 Nov 2009 18:31:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199810 - stable/7/sys/sparc64/include X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2009 18:31:59 -0000 Author: marius Date: Wed Nov 25 18:31:58 2009 New Revision: 199810 URL: http://svn.freebsd.org/changeset/base/199810 Log: MFC: r198502 Sync with the other archs and wrap the prototype of in_cksum_skip(9) in #ifdef _KERNEL. Submitted by: Ulrich Spoerlein Modified: stable/7/sys/sparc64/include/in_cksum.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/include/in_cksum.h ============================================================================== --- stable/7/sys/sparc64/include/in_cksum.h Wed Nov 25 18:31:34 2009 (r199809) +++ stable/7/sys/sparc64/include/in_cksum.h Wed Nov 25 18:31:58 2009 (r199810) @@ -164,6 +164,8 @@ in_cksum_hdr(struct ip *ip) return (__ret); } +#ifdef _KERNEL u_short in_cksum_skip(struct mbuf *m, int len, int skip); +#endif #endif /* _MACHINE_IN_CKSUM_H_ */ From owner-svn-src-stable-7@FreeBSD.ORG Thu Nov 26 13:18:38 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6ACDE106568B; Thu, 26 Nov 2009 13:18:38 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 598F48FC12; Thu, 26 Nov 2009 13:18:38 +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 nAQDIc4I082679; Thu, 26 Nov 2009 13:18:38 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAQDIcYU082677; Thu, 26 Nov 2009 13:18:38 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <200911261318.nAQDIcYU082677@svn.freebsd.org> From: Takahashi Yoshihiro Date: Thu, 26 Nov 2009 13:18:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199823 - stable/7/release/pc98 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2009 13:18:38 -0000 Author: nyan Date: Thu Nov 26 13:18:38 2009 New Revision: 199823 URL: http://svn.freebsd.org/changeset/base/199823 Log: MFC: revision 178945 Add the ed and remove the vi. This fixes a disk-full error. Modified: stable/7/release/pc98/fixit_crunch.conf Directory Properties: stable/7/release/ (props changed) stable/7/release/doc/en_US.ISO8859-1/hardware/ (props changed) Modified: stable/7/release/pc98/fixit_crunch.conf ============================================================================== --- stable/7/release/pc98/fixit_crunch.conf Thu Nov 26 12:41:43 2009 (r199822) +++ stable/7/release/pc98/fixit_crunch.conf Thu Nov 26 13:18:38 2009 (r199823) @@ -9,6 +9,7 @@ progs cp progs dd progs df progs echo +progs ed progs expr progs kill progs ln @@ -39,9 +40,6 @@ special fdisk srcdir /usr/src/sbin/fdisk srcdirs /usr/src/usr.bin progs ftp progs telnet -progs vi -ln vi view -ln vi ex srcdirs /usr/src/usr.sbin progs chown From owner-svn-src-stable-7@FreeBSD.ORG Thu Nov 26 13:22:01 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 228A11065672; Thu, 26 Nov 2009 13:22:01 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 114F78FC13; Thu, 26 Nov 2009 13:22: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 nAQDM0lw082799; Thu, 26 Nov 2009 13:22:00 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAQDM0W7082797; Thu, 26 Nov 2009 13:22:00 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <200911261322.nAQDM0W7082797@svn.freebsd.org> From: Takahashi Yoshihiro Date: Thu, 26 Nov 2009 13:22:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199824 - stable/7/release/pc98 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2009 13:22:01 -0000 Author: nyan Date: Thu Nov 26 13:22:00 2009 New Revision: 199824 URL: http://svn.freebsd.org/changeset/base/199824 Log: MFC: revision 178974 Replace the ee with the ed to resolve disk overflow. Modified: stable/7/release/pc98/fixit-small_crunch.conf Directory Properties: stable/7/release/ (props changed) stable/7/release/doc/en_US.ISO8859-1/hardware/ (props changed) Modified: stable/7/release/pc98/fixit-small_crunch.conf ============================================================================== --- stable/7/release/pc98/fixit-small_crunch.conf Thu Nov 26 13:18:38 2009 (r199823) +++ stable/7/release/pc98/fixit-small_crunch.conf Thu Nov 26 13:22:00 2009 (r199824) @@ -9,6 +9,7 @@ progs cp progs dd progs df progs echo +progs ed progs expr progs kill progs ln @@ -37,9 +38,7 @@ ln bsdlabel disklabel special fdisk srcdir /usr/src/sbin/fdisk_pc98 srcdirs /usr/src/usr.bin -progs ee progs ftp -ln ee edit srcdirs /usr/src/usr.sbin progs chown From owner-svn-src-stable-7@FreeBSD.ORG Thu Nov 26 14:52:14 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A304F106568F; Thu, 26 Nov 2009 14:52:14 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 91D2C8FC14; Thu, 26 Nov 2009 14:52:14 +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 nAQEqE37085048; Thu, 26 Nov 2009 14:52:14 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAQEqEKX085046; Thu, 26 Nov 2009 14:52:14 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200911261452.nAQEqEKX085046@svn.freebsd.org> From: Alexander Motin Date: Thu, 26 Nov 2009 14:52:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199832 - stable/7/sys/dev/ata X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2009 14:52:14 -0000 Author: mav Date: Thu Nov 26 14:52:14 2009 New Revision: 199832 URL: http://svn.freebsd.org/changeset/base/199832 Log: MFC r199749: Use only lower byte of sectors_intr IDENTIFY word as sector count. This fixes SET_MULTI error during boot on devices supporting less then 16 sectors per interrupt. Modified: stable/7/sys/dev/ata/ata-disk.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/ata/ata-disk.c ============================================================================== --- stable/7/sys/dev/ata/ata-disk.c Thu Nov 26 14:50:01 2009 (r199831) +++ stable/7/sys/dev/ata/ata-disk.c Thu Nov 26 14:52:14 2009 (r199832) @@ -417,7 +417,7 @@ ad_init(device_t dev) /* use multiple sectors/interrupt if device supports it */ if (ad_version(atadev->param.version_major)) { - int secsperint = max(1, min(atadev->param.sectors_intr, 16)); + int secsperint = max(1, min(atadev->param.sectors_intr & 0xff, 16)); if (!ata_controlcmd(dev, ATA_SET_MULTI, 0, 0, secsperint)) atadev->max_iosize = secsperint * DEV_BSIZE; From owner-svn-src-stable-7@FreeBSD.ORG Thu Nov 26 15:18:05 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE8D01065676; Thu, 26 Nov 2009 15:18:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9CBBC8FC0C; Thu, 26 Nov 2009 15:18:05 +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 nAQFI5K0085892; Thu, 26 Nov 2009 15:18:05 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAQFI5lD085890; Thu, 26 Nov 2009 15:18:05 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200911261518.nAQFI5lD085890@svn.freebsd.org> From: Alexander Motin Date: Thu, 26 Nov 2009 15:18:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199836 - stable/7/sys/dev/hptrr X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2009 15:18:05 -0000 Author: mav Date: Thu Nov 26 15:18:05 2009 New Revision: 199836 URL: http://svn.freebsd.org/changeset/base/199836 Log: MFC r199043: Introduce hw.hptrr.attach_generic loader tunable to deny hptrr driver attach chips with generic Marvell (non-HighPoint) PCI identification. These chips are also supported by ata(4). Some vendors, like Supermicro, are using same chips without providing HPT RAID BIOS. PR: kern/120842, kern/136750 Modified: stable/7/sys/dev/hptrr/hptrr_osm_bsd.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/hptrr/hptrr_osm_bsd.c ============================================================================== --- stable/7/sys/dev/hptrr/hptrr_osm_bsd.c Thu Nov 26 15:16:03 2009 (r199835) +++ stable/7/sys/dev/hptrr/hptrr_osm_bsd.c Thu Nov 26 15:18:05 2009 (r199836) @@ -34,6 +34,9 @@ #include #include +static int attach_generic = 1; +TUNABLE_INT("hw.hptrr.attach_generic", &attach_generic); + static int hpt_probe(device_t dev) { PCI_ID pci_id; @@ -41,6 +44,9 @@ static int hpt_probe(device_t dev) int i; PHBA hba; + /* Some of supported chips are used not only by HPT. */ + if (pci_get_vendor(dev) != 0x1103 && !attach_generic) + return (ENXIO); for (him = him_list; him; him = him->next) { for (i=0; him->get_supported_device_id(i, &pci_id); i++) { if ((pci_get_vendor(dev) == pci_id.vid) && From owner-svn-src-stable-7@FreeBSD.ORG Thu Nov 26 15:23:25 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAFED106566B; Thu, 26 Nov 2009 15:23:25 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 999E98FC14; Thu, 26 Nov 2009 15:23: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 nAQFNPWq086115; Thu, 26 Nov 2009 15:23:25 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAQFNPOG086113; Thu, 26 Nov 2009 15:23:25 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200911261523.nAQFNPOG086113@svn.freebsd.org> From: Alexander Motin Date: Thu, 26 Nov 2009 15:23:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199838 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2009 15:23:25 -0000 Author: mav Date: Thu Nov 26 15:23:25 2009 New Revision: 199838 URL: http://svn.freebsd.org/changeset/base/199838 Log: MFC r199043: Introduce hw.hptrr.attach_generic loader tunable to deny hptrr driver attach chips with generic Marvell (non-HighPoint) PCI identification. These chips are also supported by ata(4). Some vendors, like Supermicro, are using same chips without providing HPT RAID BIOS. PR: kern/120842, kern/136750 Modified: stable/7/share/man/man4/hptrr.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/hptrr.4 ============================================================================== --- stable/7/share/man/man4/hptrr.4 Thu Nov 26 15:22:42 2009 (r199837) +++ stable/7/share/man/man4/hptrr.4 Thu Nov 26 15:23:25 2009 (r199838) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 2007 +.Dd November 8, 2009 .Dt HPTRR 4 .Os .Sh NAME @@ -46,6 +46,14 @@ module at boot time, place the following .Bd -literal -offset indent hptrr_load="YES" .Ed +.Pp +The following tunables are settable from the loader: +.Bl -ohang +.It Va hw.hptrr.attach_generic +set to 0 to deny driver attach to chips with generic Marvell (non-HighPoint) +PCI identification. These chips are also supported by ata(4). +Some vendors are using same chips, but without providing RAID BIOS. +.El .Sh DESCRIPTION The .Nm @@ -101,6 +109,7 @@ manual page for details on support. .Pp This driver supersedes the older rr232x driver. .Sh SEE ALSO +.Xr ata 4 , .Xr cam 4 , .Xr hptmv 4 , .Xr loader 8