From owner-svn-src-stable-6@FreeBSD.ORG Wed Dec 10 10:46:59 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19E4A1065676; Wed, 10 Dec 2008 10:46:59 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 097D38FC13; Wed, 10 Dec 2008 10:46:59 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAAkwXG026231; Wed, 10 Dec 2008 10:46:58 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAAkwcu026230; Wed, 10 Dec 2008 10:46:58 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <200812101046.mBAAkwcu026230@svn.freebsd.org> From: Maxim Sobolev Date: Wed, 10 Dec 2008 10:46:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185853 - stable/6/sys/i386/cpufreq X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 10:46:59 -0000 Author: sobomax Date: Wed Dec 10 10:46:58 2008 New Revision: 185853 URL: http://svn.freebsd.org/changeset/base/185853 Log: MFC: Add Pentium D cores into the list that can't handle 12.5% and 25% throttle. Also, fix logic error which makes detection always negative while I am here (already fixed in current). Modified: stable/6/sys/i386/cpufreq/p4tcc.c Modified: stable/6/sys/i386/cpufreq/p4tcc.c ============================================================================== --- stable/6/sys/i386/cpufreq/p4tcc.c Wed Dec 10 10:46:34 2008 (r185852) +++ stable/6/sys/i386/cpufreq/p4tcc.c Wed Dec 10 10:46:58 2008 (r185853) @@ -164,7 +164,7 @@ p4tcc_attach(device_t dev) */ sc->auto_mode = TRUE; - switch (cpu_id & 0xf) { + switch (cpu_id & 0xff) { case 0x22: case 0x24: case 0x25: @@ -180,9 +180,11 @@ p4tcc_attach(device_t dev) case 0x0a: case 0x12: case 0x13: - /* + case 0x62: /* Pentium D B1: errata AA21 */ + case 0x64: /* Pentium D C1: errata AA21 */ + case 0x65: /* Pentium D D0: errata AA21 */ /* * These CPU models hang when set to 12.5% or 25%. - * See Errata N44 and P18l. + * See Errata N44, P18l and AA21. */ sc->set_count -= 2; break; From owner-svn-src-stable-6@FreeBSD.ORG Wed Dec 10 10:50:19 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55B00106564A; Wed, 10 Dec 2008 10:50:19 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4594F8FC1A; Wed, 10 Dec 2008 10:50:19 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAAoJFo026340; Wed, 10 Dec 2008 10:50:19 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAAoJR2026339; Wed, 10 Dec 2008 10:50:19 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <200812101050.mBAAoJR2026339@svn.freebsd.org> From: Maxim Sobolev Date: Wed, 10 Dec 2008 10:50:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185854 - stable/6/sys/i386/cpufreq X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 10:50:19 -0000 Author: sobomax Date: Wed Dec 10 10:50:19 2008 New Revision: 185854 URL: http://svn.freebsd.org/changeset/base/185854 Log: Fix misplaced /* slipped in the previous commit. Modified: stable/6/sys/i386/cpufreq/p4tcc.c Modified: stable/6/sys/i386/cpufreq/p4tcc.c ============================================================================== --- stable/6/sys/i386/cpufreq/p4tcc.c Wed Dec 10 10:46:58 2008 (r185853) +++ stable/6/sys/i386/cpufreq/p4tcc.c Wed Dec 10 10:50:19 2008 (r185854) @@ -182,7 +182,8 @@ p4tcc_attach(device_t dev) case 0x13: case 0x62: /* Pentium D B1: errata AA21 */ case 0x64: /* Pentium D C1: errata AA21 */ - case 0x65: /* Pentium D D0: errata AA21 */ /* + case 0x65: /* Pentium D D0: errata AA21 */ + /* * These CPU models hang when set to 12.5% or 25%. * See Errata N44, P18l and AA21. */ From owner-svn-src-stable-6@FreeBSD.ORG Wed Dec 10 11:09:31 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B09A21065679; Wed, 10 Dec 2008 11:09:31 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A0D3C8FC1B; Wed, 10 Dec 2008 11:09:31 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAB9VL6028856; Wed, 10 Dec 2008 11:09:31 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAB9VnV028855; Wed, 10 Dec 2008 11:09:31 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <200812101109.mBAB9VnV028855@svn.freebsd.org> From: Maxim Sobolev Date: Wed, 10 Dec 2008 11:09:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185856 - stable/6/usr.sbin/mergemaster X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 11:09:31 -0000 Author: sobomax Date: Wed Dec 10 11:09:31 2008 New Revision: 185856 URL: http://svn.freebsd.org/changeset/base/185856 Log: MFC: automatically upgrade files that only differ in CVS Id tag. Modified: stable/6/usr.sbin/mergemaster/ (props changed) stable/6/usr.sbin/mergemaster/mergemaster.sh Modified: stable/6/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/6/usr.sbin/mergemaster/mergemaster.sh Wed Dec 10 11:03:16 2008 (r185855) +++ stable/6/usr.sbin/mergemaster/mergemaster.sh Wed Dec 10 11:09:31 2008 (r185856) @@ -947,6 +947,25 @@ for COMPFILE in `find . -type f -size +0 echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting" rm "${COMPFILE}" ;; + + *) + tempfoo=`basename $0` + TMPFILE1=`mktemp -t ${tempfoo}` || break + TMPFILE2=`mktemp -t ${tempfoo}` || break + sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${DESTDIR}${COMPFILE#.}" > "${TMPFILE1}" + sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${COMPFILE}" > "${TMPFILE2}" + if diff -q ${DIFF_OPTIONS} "${TMPFILE1}" "${TMPFILE2}" > \ + /dev/null 2>&1; then + echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, replacing" + if mm_install "${COMPFILE}"; then + echo " *** ${COMPFILE} upgraded successfully" + echo '' + else + echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" + fi + fi + rm -f "${TMPFILE1}" "${TMPFILE2}" + ;; esac ;; esac From owner-svn-src-stable-6@FreeBSD.ORG Wed Dec 10 22:50:12 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 107F3106564A; Wed, 10 Dec 2008 22:50:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF5188FC18; Wed, 10 Dec 2008 22:50:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAMoBm0045372; Wed, 10 Dec 2008 22:50:11 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAMoBXc045371; Wed, 10 Dec 2008 22:50:11 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200812102250.mBAMoBXc045371@svn.freebsd.org> From: John Baldwin Date: Wed, 10 Dec 2008 22:50:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185894 - in stable/6/sys: . kern X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 22:50:12 -0000 Author: jhb Date: Wed Dec 10 22:50:11 2008 New Revision: 185894 URL: http://svn.freebsd.org/changeset/base/185894 Log: MFC: Check for duplicate attempts to add the same positive entry to the name cache. If a duplicate attempt is made, just do nothing. This fixes a race with shared locking in pathname lockups. Modified: stable/6/sys/ (props changed) stable/6/sys/kern/vfs_cache.c Modified: stable/6/sys/kern/vfs_cache.c ============================================================================== --- stable/6/sys/kern/vfs_cache.c Wed Dec 10 22:17:09 2008 (r185893) +++ stable/6/sys/kern/vfs_cache.c Wed Dec 10 22:50:11 2008 (r185894) @@ -511,8 +511,39 @@ cache_enter(dvp, vp, cnp) hold = 0; zap = 0; + + /* + * Calculate the hash key and setup as much of the new + * namecache entry as possible before acquiring the lock. + */ ncp = cache_alloc(cnp->cn_namelen); + ncp->nc_vp = vp; + ncp->nc_dvp = dvp; + len = ncp->nc_nlen = cnp->cn_namelen; + hash = fnv_32_buf(cnp->cn_nameptr, len, FNV1_32_INIT); + bcopy(cnp->cn_nameptr, ncp->nc_name, len); + hash = fnv_32_buf(&dvp, sizeof(dvp), hash); CACHE_LOCK(); + + /* + * See if this vnode is already in the cache with this name. + * This can happen with concurrent lookups of the same path + * name. + */ + if (vp) { + struct namecache *n2; + + TAILQ_FOREACH(n2, &vp->v_cache_dst, nc_dst) { + if (n2->nc_dvp == dvp && + n2->nc_nlen == cnp->cn_namelen && + !bcmp(n2->nc_name, cnp->cn_nameptr, n2->nc_nlen)) { + CACHE_UNLOCK(); + cache_free(ncp); + return; + } + } + } + numcache++; if (!vp) { numneg++; @@ -524,16 +555,9 @@ cache_enter(dvp, vp, cnp) } /* - * Set the rest of the namecache entry elements, calculate it's - * hash key and insert it into the appropriate chain within - * the cache entries table. + * Insert the new namecache entry into the appropriate chain + * within the cache entries table. */ - ncp->nc_vp = vp; - ncp->nc_dvp = dvp; - len = ncp->nc_nlen = cnp->cn_namelen; - hash = fnv_32_buf(cnp->cn_nameptr, len, FNV1_32_INIT); - bcopy(cnp->cn_nameptr, ncp->nc_name, len); - hash = fnv_32_buf(&dvp, sizeof(dvp), hash); ncpp = NCHHASH(hash); LIST_INSERT_HEAD(ncpp, ncp, nc_hash); if (LIST_EMPTY(&dvp->v_cache_src)) { From owner-svn-src-stable-6@FreeBSD.ORG Thu Dec 11 18:07:54 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D03FE106564A; Thu, 11 Dec 2008 18:07:54 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C17408FC14; Thu, 11 Dec 2008 18:07:54 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBI7saQ072008; Thu, 11 Dec 2008 18:07:54 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBBI7sSk072007; Thu, 11 Dec 2008 18:07:54 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <200812111807.mBBI7sSk072007@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 11 Dec 2008 18:07:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185939 - in stable/6/sys: . kern X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 18:07:55 -0000 Author: kib Date: Thu Dec 11 18:07:54 2008 New Revision: 185939 URL: http://svn.freebsd.org/changeset/base/185939 Log: MFC r185557: Prevent creation of the duplicated negative entries. Requested by: jhb Modified: stable/6/sys/ (props changed) stable/6/sys/kern/vfs_cache.c Modified: stable/6/sys/kern/vfs_cache.c ============================================================================== --- stable/6/sys/kern/vfs_cache.c Thu Dec 11 16:48:35 2008 (r185938) +++ stable/6/sys/kern/vfs_cache.c Thu Dec 11 18:07:54 2008 (r185939) @@ -475,7 +475,7 @@ cache_enter(dvp, vp, cnp) struct vnode *vp; struct componentname *cnp; { - struct namecache *ncp; + struct namecache *ncp, *n2; struct nchashhead *ncpp; u_int32_t hash; int hold; @@ -531,8 +531,6 @@ cache_enter(dvp, vp, cnp) * name. */ if (vp) { - struct namecache *n2; - TAILQ_FOREACH(n2, &vp->v_cache_dst, nc_dst) { if (n2->nc_dvp == dvp && n2->nc_nlen == cnp->cn_namelen && @@ -542,7 +540,16 @@ cache_enter(dvp, vp, cnp) return; } } - } + } else { + TAILQ_FOREACH(n2, &ncneg, nc_dst) { + if (n2->nc_nlen == cnp->cn_namelen && + !bcmp(n2->nc_name, cnp->cn_nameptr, n2->nc_nlen)) { + CACHE_UNLOCK(); + cache_free(ncp); + return; + } + } + } numcache++; if (!vp) { From owner-svn-src-stable-6@FreeBSD.ORG Sat Dec 13 19:11:47 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F1AE1065673; Sat, 13 Dec 2008 19:11:47 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0C3078FC08; Sat, 13 Dec 2008 19:11:47 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDJBkta037297; Sat, 13 Dec 2008 19:11:46 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBDJBkcQ037296; Sat, 13 Dec 2008 19:11:46 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <200812131911.mBDJBkcQ037296@svn.freebsd.org> From: Ken Smith Date: Sat, 13 Dec 2008 19:11:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186047 - stable/6/gnu/usr.bin/groff/tmac X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 19:11:47 -0000 Author: kensmith Date: Sat Dec 13 19:11:46 2008 New Revision: 186047 URL: http://svn.freebsd.org/changeset/base/186047 Log: Due to a mis-understanding on my part with Ruslan I haven't been updating this like I should have been. Mis-understanding is cleared up I think. Change default operating system for upcoming release. Add release names not in contrib/groff/tmac/doc-common yet. Submitted by: ru Modified: stable/6/gnu/usr.bin/groff/tmac/mdoc.local Modified: stable/6/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- stable/6/gnu/usr.bin/groff/tmac/mdoc.local Sat Dec 13 18:49:01 2008 (r186046) +++ stable/6/gnu/usr.bin/groff/tmac/mdoc.local Sat Dec 13 19:11:46 2008 (r186047) @@ -62,10 +62,11 @@ .ds doc-volume-as-arm arm . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~6.2 +.ds doc-default-operating-system FreeBSD\~6.4 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 +.ds doc-operating-system-FreeBSD-6.4 6.4 . .ec .