From owner-svn-src-stable-7@FreeBSD.ORG Mon Mar 7 00:44:00 2011 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 EAEAD1065670; Mon, 7 Mar 2011 00:44:00 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BC55E8FC12; Mon, 7 Mar 2011 00:44:00 +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 p270i0Mr014501; Mon, 7 Mar 2011 00:44:00 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p270i0Y5014498; Mon, 7 Mar 2011 00:44:00 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201103070044.p270i0Y5014498@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 7 Mar 2011 00:44: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: r219357 - stable/7/sys/dev/sis 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, 07 Mar 2011 00:44:01 -0000 Author: yongari Date: Mon Mar 7 00:44:00 2011 New Revision: 219357 URL: http://svn.freebsd.org/changeset/base/219357 Log: MFC r219102: Make sure changing ownership of RX descriptor to be done as last operation. Previously ownership was transferred to hardware before setting address of new RX buffer such that it was possible for hardware to use wrong RX buffer address. While here keep compiler from re-ordering instructions by declaring descriptor members volatile. Memory barriers would do the same job but volatile is supposed to be cheaper than using memory barriers, especially on MP systems. Submitted by: marius Modified: stable/7/sys/dev/sis/if_sis.c stable/7/sys/dev/sis/if_sisreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/sis/if_sis.c ============================================================================== --- stable/7/sys/dev/sis/if_sis.c Mon Mar 7 00:42:22 2011 (r219356) +++ stable/7/sys/dev/sis/if_sis.c Mon Mar 7 00:44:00 2011 (r219357) @@ -1568,8 +1568,8 @@ sis_newbuf(struct sis_softc *sc, struct sc->sis_rx_sparemap = map; bus_dmamap_sync(sc->sis_rx_tag, rxd->rx_dmamap, BUS_DMASYNC_PREREAD); rxd->rx_m = m; - rxd->rx_desc->sis_cmdsts = htole32(SIS_RXLEN); rxd->rx_desc->sis_ptr = htole32(SIS_ADDR_LO(segs[0].ds_addr)); + rxd->rx_desc->sis_cmdsts = htole32(SIS_RXLEN); return (0); } Modified: stable/7/sys/dev/sis/if_sisreg.h ============================================================================== --- stable/7/sys/dev/sis/if_sisreg.h Mon Mar 7 00:42:22 2011 (r219356) +++ stable/7/sys/dev/sis/if_sisreg.h Mon Mar 7 00:44:00 2011 (r219357) @@ -337,8 +337,8 @@ struct sis_desc { /* SiS hardware descriptor section */ uint32_t sis_next; - uint32_t sis_cmdsts; - uint32_t sis_ptr; + volatile uint32_t sis_cmdsts; + volatile uint32_t sis_ptr; }; #define SIS_CMDSTS_BUFLEN 0x00000FFF From owner-svn-src-stable-7@FreeBSD.ORG Mon Mar 7 09:04:07 2011 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 5CCCC106566C; Mon, 7 Mar 2011 09:04:07 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4A7A58FC14; Mon, 7 Mar 2011 09:04:07 +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 p27947Gi027807; Mon, 7 Mar 2011 09:04:07 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p27947Cm027805; Mon, 7 Mar 2011 09:04:07 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201103070904.p27947Cm027805@svn.freebsd.org> From: Xin LI Date: Mon, 7 Mar 2011 09:04:07 +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: r219367 - in stable: 7/usr.sbin/faithd 8/usr.sbin/faithd 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, 07 Mar 2011 09:04:07 -0000 Author: delphij Date: Mon Mar 7 09:04:06 2011 New Revision: 219367 URL: http://svn.freebsd.org/changeset/base/219367 Log: MFC r219158: Correct a typo. PR: bin/155175 Submitted by: Peter J. Philipp Modified: stable/7/usr.sbin/faithd/faithd.c Directory Properties: stable/7/usr.sbin/faithd/ (props changed) Changes in other areas also in this revision: Modified: stable/8/usr.sbin/faithd/faithd.c Directory Properties: stable/8/usr.sbin/faithd/ (props changed) Modified: stable/7/usr.sbin/faithd/faithd.c ============================================================================== --- stable/7/usr.sbin/faithd/faithd.c Mon Mar 7 08:54:20 2011 (r219366) +++ stable/7/usr.sbin/faithd/faithd.c Mon Mar 7 09:04:06 2011 (r219367) @@ -339,7 +339,7 @@ daemon_main(int argc, char **argv) snprintf(logname, sizeof(logname), "faithd %s", service); snprintf(procname, sizeof(procname), "accepting port %s", service); openlog(logname, LOG_PID | LOG_NOWAIT, LOG_DAEMON); - syslog(LOG_INFO, "Staring faith daemon for %s port", service); + syslog(LOG_INFO, "Starting faith daemon for %s port", service); play_service(s_wld); /* NOTREACHED */ From owner-svn-src-stable-7@FreeBSD.ORG Mon Mar 7 17:14:18 2011 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 73B36106566C; Mon, 7 Mar 2011 17:14:18 +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 61DF58FC18; Mon, 7 Mar 2011 17:14:18 +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 p27HEI1m041771; Mon, 7 Mar 2011 17:14:18 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p27HEIbZ041768; Mon, 7 Mar 2011 17:14:18 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201103071714.p27HEIbZ041768@svn.freebsd.org> From: John Baldwin Date: Mon, 7 Mar 2011 17:14:18 +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: r219380 - in stable/7/sys: compat/linux sys 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, 07 Mar 2011 17:14:18 -0000 Author: jhb Date: Mon Mar 7 17:14:18 2011 New Revision: 219380 URL: http://svn.freebsd.org/changeset/base/219380 Log: MFC 218970,219240: Use umtx_key objects to uniquely identify futexes. Private futexes in different processes that happen to use the same user address in the separate processes will now be treated as distinct futexes rather than the same futex. We can now honor shared futexes properly by mapping them to a AUTO_SHARED umtx_key. Private futexes use THREAD_SHARED umtx_key objects. Modified: stable/7/sys/compat/linux/linux_futex.c stable/7/sys/sys/umtx.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/compat/linux/linux_futex.c ============================================================================== --- stable/7/sys/compat/linux/linux_futex.c Mon Mar 7 16:05:45 2011 (r219379) +++ stable/7/sys/compat/linux/linux_futex.c Mon Mar 7 17:14:18 2011 (r219380) @@ -52,6 +52,7 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex. #include #include #include +#include #ifdef COMPAT_LINUX32 #include @@ -77,7 +78,8 @@ struct waiting_proc { struct futex { struct sx f_lck; - uint32_t *f_uaddr; + uint32_t *f_uaddr; /* user-supplied value, for debug */ + struct umtx_key f_key; uint32_t f_refcount; LIST_ENTRY(futex) f_list; TAILQ_HEAD(lf_waiting_proc, waiting_proc) f_waiting_proc; @@ -99,6 +101,7 @@ struct mtx futex_mtx; /* protects the #define FUTEX_CREATE_WP 0x1 /* create waiting_proc */ #define FUTEX_DONTCREATE 0x2 /* don't create futex if not exists */ #define FUTEX_DONTEXISTS 0x4 /* return EINVAL if futex exists */ +#define FUTEX_SHARED 0x8 /* shared futex */ /* wp_flags */ #define FUTEX_WP_REQUEUED 0x1 /* wp requeued - wp moved from wp_list @@ -135,6 +138,7 @@ futex_put(struct futex *f, struct waitin LINUX_CTR2(sys_futex, "futex_put destroy uaddr %p ref %d", f->f_uaddr, f->f_refcount); + umtx_key_release(&f->f_key); FUTEX_DESTROY(f); free(f, M_FUTEX); return; @@ -150,13 +154,19 @@ static int futex_get0(uint32_t *uaddr, struct futex **newf, uint32_t flags) { struct futex *f, *tmpf; + struct umtx_key key; + int error; *newf = tmpf = NULL; + error = umtx_key_get(uaddr, TYPE_FUTEX, (flags & FUTEX_SHARED) ? + AUTO_SHARE : THREAD_SHARE, &key); + if (error) + return (error); retry: FUTEXES_LOCK; LIST_FOREACH(f, &futex_list, f_list) { - if (f->f_uaddr == uaddr) { + if (umtx_key_match(&f->f_key, &key)) { if (tmpf != NULL) { FUTEX_UNLOCK(tmpf); FUTEX_DESTROY(tmpf); @@ -164,6 +174,7 @@ retry: } if (flags & FUTEX_DONTEXISTS) { FUTEXES_UNLOCK; + umtx_key_release(&key); return (EINVAL); } @@ -173,6 +184,7 @@ retry: */ ++f->f_refcount; FUTEXES_UNLOCK; + umtx_key_release(&key); FUTEX_LOCK(f); *newf = f; @@ -184,6 +196,7 @@ retry: if (flags & FUTEX_DONTCREATE) { FUTEXES_UNLOCK; + umtx_key_release(&key); LINUX_CTR1(sys_futex, "futex_get uaddr %p null", uaddr); return (0); } @@ -192,6 +205,7 @@ retry: FUTEXES_UNLOCK; tmpf = malloc(sizeof(*tmpf), M_FUTEX, M_WAITOK | M_ZERO); tmpf->f_uaddr = uaddr; + tmpf->f_key = key; tmpf->f_refcount = 1; FUTEX_INIT(tmpf); TAILQ_INIT(&tmpf->f_waiting_proc); @@ -433,15 +447,13 @@ linux_sys_futex(struct thread *td, struc struct waiting_proc *wp; struct futex *f, *f2; int error = 0; + uint32_t flags; - /* - * Our implementation provides only privates futexes. Most of the apps - * should use private futexes but don't claim so. Therefore we treat - * all futexes as private by clearing the FUTEX_PRIVATE_FLAG. It works - * in most cases (ie. when futexes are not shared on file descriptor - * or between different processes.). - */ - args->op = (args->op & ~LINUX_FUTEX_PRIVATE_FLAG); + if (args->op & LINUX_FUTEX_PRIVATE_FLAG) { + flags = 0; + args->op &= ~LINUX_FUTEX_PRIVATE_FLAG; + } else + flags = FUTEX_SHARED; switch (args->op) { case LINUX_FUTEX_WAIT: @@ -453,7 +465,8 @@ linux_sys_futex(struct thread *td, struc printf(ARGS(sys_futex, "futex_wait val %d uaddr %p"), args->val, args->uaddr); #endif - error = futex_get(args->uaddr, &wp, &f, FUTEX_CREATE_WP); + error = futex_get(args->uaddr, &wp, &f, + flags | FUTEX_CREATE_WP); if (error) return (error); error = copyin(args->uaddr, &val, sizeof(val)); @@ -488,7 +501,8 @@ linux_sys_futex(struct thread *td, struc printf(ARGS(sys_futex, "futex_wake val %d uaddr %p"), args->val, args->uaddr); #endif - error = futex_get(args->uaddr, NULL, &f, FUTEX_DONTCREATE); + error = futex_get(args->uaddr, NULL, &f, + flags | FUTEX_DONTCREATE); if (error) return (error); if (f == NULL) { @@ -520,7 +534,7 @@ linux_sys_futex(struct thread *td, struc */ if (args->uaddr == args->uaddr2) return (EINVAL); - error = futex_get0(args->uaddr, &f, 0); + error = futex_get(args->uaddr, NULL, &f, flags); if (error) return (error); @@ -532,7 +546,8 @@ linux_sys_futex(struct thread *td, struc * Glibc fall back to FUTEX_WAKE in case of any error * returned by FUTEX_CMP_REQUEUE. */ - error = futex_get0(args->uaddr2, &f2, FUTEX_DONTEXISTS); + error = futex_get(args->uaddr2, NULL, &f2, + flags | FUTEX_DONTEXISTS); if (error) { futex_put(f, NULL); return (error); @@ -573,11 +588,11 @@ linux_sys_futex(struct thread *td, struc args->uaddr, args->op, args->val, args->uaddr2, args->val3); #endif - error = futex_get0(args->uaddr, &f, 0); + error = futex_get(args->uaddr, NULL, &f, flags); if (error) return (error); if (args->uaddr != args->uaddr2) - error = futex_get0(args->uaddr2, &f2, 0); + error = futex_get(args->uaddr2, NULL, &f2, flags); if (error) { futex_put(f, NULL); return (error); @@ -747,7 +762,7 @@ retry: if (!pi && (uval & FUTEX_WAITERS)) { error = futex_get(uaddr, NULL, &f, - FUTEX_DONTCREATE); + FUTEX_DONTCREATE | FUTEX_SHARED); if (error) return (error); if (f != NULL) { Modified: stable/7/sys/sys/umtx.h ============================================================================== --- stable/7/sys/sys/umtx.h Mon Mar 7 16:05:45 2011 (r219379) +++ stable/7/sys/sys/umtx.h Mon Mar 7 17:14:18 2011 (r219380) @@ -203,6 +203,7 @@ enum { TYPE_PI_UMUTEX, TYPE_PP_UMUTEX, TYPE_RWLOCK, + TYPE_FUTEX }; /* Key to represent a unique userland synchronous object */ From owner-svn-src-stable-7@FreeBSD.ORG Mon Mar 7 18:01:59 2011 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 06515106564A; Mon, 7 Mar 2011 18:01:59 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CF6FA8FC0A; Mon, 7 Mar 2011 18:01:58 +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 p27I1wS9042919; Mon, 7 Mar 2011 18:01:58 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p27I1w2K042917; Mon, 7 Mar 2011 18:01:58 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201103071801.p27I1w2K042917@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 7 Mar 2011 18:01:58 +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: r219383 - stable/7/usr.sbin/pw 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, 07 Mar 2011 18:01:59 -0000 Author: jkim Date: Mon Mar 7 18:01:58 2011 New Revision: 219383 URL: http://svn.freebsd.org/changeset/base/219383 Log: MFC: r218293 Do not let pw.conf(5) or -M option affect creation of basehome, e.g., /home. When the basehome does not exist, it creates all intermediate directories as required, which is logically equivalent to mkdir(1) with -m and -p options. However, it modifies all intermediate directories, not just the final home directory unlike mkdir. This problem was introduced in two revisions, i.e., r1.59 (SVN r167919) and r1.60 (SVN r168044). Modified: stable/7/usr.sbin/pw/pw_user.c Directory Properties: stable/7/usr.sbin/pw/ (props changed) Modified: stable/7/usr.sbin/pw/pw_user.c ============================================================================== --- stable/7/usr.sbin/pw/pw_user.c Mon Mar 7 18:00:58 2011 (r219382) +++ stable/7/usr.sbin/pw/pw_user.c Mon Mar 7 18:01:58 2011 (r219383) @@ -159,14 +159,14 @@ pw_user(struct userconf * cnf, int mode, cnf->home = arg->val; } + dmode = S_IRWXU | S_IRWXG | S_IRWXO; if ((arg = getarg(args, 'M')) != NULL) { dmode_c = arg->val; if ((set = setmode(dmode_c)) == NULL) errx(EX_DATAERR, "invalid directory creation mode '%s'", dmode_c); - dmode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO); + cnf->homemode = getmode(set, dmode); free(set); - cnf->homemode = dmode; } /* @@ -194,7 +194,7 @@ pw_user(struct userconf * cnf, int mode, if (strchr(cnf->home+1, '/') == NULL) { strcpy(dbuf, "/usr"); strncat(dbuf, cnf->home, MAXPATHLEN-5); - if (mkdir(dbuf, cnf->homemode) != -1 || errno == EEXIST) { + if (mkdir(dbuf, dmode) != -1 || errno == EEXIST) { chown(dbuf, 0, 0); /* * Skip first "/" and create symlink: @@ -210,7 +210,7 @@ pw_user(struct userconf * cnf, int mode, while ((p = strchr(++p, '/')) != NULL) { *p = '\0'; if (stat(dbuf, &st) == -1) { - if (mkdir(dbuf, cnf->homemode) == -1) + if (mkdir(dbuf, dmode) == -1) goto direrr; chown(dbuf, 0, 0); } else if (!S_ISDIR(st.st_mode)) @@ -219,7 +219,7 @@ pw_user(struct userconf * cnf, int mode, } } if (stat(dbuf, &st) == -1) { - if (mkdir(dbuf, cnf->homemode) == -1) { + if (mkdir(dbuf, dmode) == -1) { direrr: err(EX_OSFILE, "mkdir '%s'", dbuf); } chown(dbuf, 0, 0); From owner-svn-src-stable-7@FreeBSD.ORG Mon Mar 7 22:50:27 2011 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 BBEC01065670; Mon, 7 Mar 2011 22:50:27 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8FD5C8FC08; Mon, 7 Mar 2011 22:50:27 +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 p27MoRTf049807; Mon, 7 Mar 2011 22:50:27 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p27MoRqB049805; Mon, 7 Mar 2011 22:50:27 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201103072250.p27MoRqB049805@svn.freebsd.org> From: Jilles Tjoelker Date: Mon, 7 Mar 2011 22:50:27 +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: r219389 - stable/7/etc 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, 07 Mar 2011 22:50:27 -0000 Author: jilles Date: Mon Mar 7 22:50:27 2011 New Revision: 219389 URL: http://svn.freebsd.org/changeset/base/219389 Log: MFC r198216 by ed: Fix quoting in a comment, to make it look more consistent. Modified: stable/7/etc/rc.subr Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.subr ============================================================================== --- stable/7/etc/rc.subr Mon Mar 7 22:36:11 2011 (r219388) +++ stable/7/etc/rc.subr Mon Mar 7 22:50:27 2011 (r219389) @@ -551,7 +551,7 @@ run_rc_command() rc_fast=yes rc_quiet=yes ;; - force*) # "force prefix; always run + force*) # "force" prefix; always run rc_force=yes _rc_prefix=force rc_arg=${rc_arg#${_rc_prefix}} From owner-svn-src-stable-7@FreeBSD.ORG Tue Mar 8 17:43:35 2011 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 CFE9F106566C; Tue, 8 Mar 2011 17:43:35 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BCDD98FC08; Tue, 8 Mar 2011 17:43:35 +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 p28HhZoM081816; Tue, 8 Mar 2011 17:43:35 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p28HhZAr081814; Tue, 8 Mar 2011 17:43:35 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201103081743.p28HhZAr081814@svn.freebsd.org> From: Jaakko Heinonen Date: Tue, 8 Mar 2011 17:43:35 +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: r219403 - stable/7/share/man/man5 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, 08 Mar 2011 17:43:35 -0000 Author: jh Date: Tue Mar 8 17:43:35 2011 New Revision: 219403 URL: http://svn.freebsd.org/changeset/base/219403 Log: MFC r196526 by delphij: Add a missing .El. Modified: stable/7/share/man/man5/tmpfs.5 Directory Properties: stable/7/share/man/man5/ (props changed) Modified: stable/7/share/man/man5/tmpfs.5 ============================================================================== --- stable/7/share/man/man5/tmpfs.5 Tue Mar 8 17:41:07 2011 (r219402) +++ stable/7/share/man/man5/tmpfs.5 Tue Mar 8 17:43:35 2011 (r219403) @@ -70,6 +70,7 @@ permissions in octal format. maximum number of inodes. .It Cm size maximum size (in bytes) for the file system. +.El .Sh EXAMPLES To mount a .Nm From owner-svn-src-stable-7@FreeBSD.ORG Tue Mar 8 21:14:15 2011 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 6111410656A4; Tue, 8 Mar 2011 21:14:15 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4C38D8FC16; Tue, 8 Mar 2011 21:14: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 p28LEFgC087164; Tue, 8 Mar 2011 21:14:15 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p28LEFme087159; Tue, 8 Mar 2011 21:14:15 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201103082114.p28LEFme087159@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 8 Mar 2011 21:14:15 +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: r219413 - stable/7/share/zoneinfo 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, 08 Mar 2011 21:14:15 -0000 Author: edwin Date: Tue Mar 8 21:14:14 2011 New Revision: 219413 URL: http://svn.freebsd.org/changeset/base/219413 Log: MFC of tzdata2011c, r219411 - No leapsecond in June 2011 - Add and update timezones for America/Juneau, America/Sitka, America/Metlakatla - Change of Summer time to Winter time in Chili happens in April 2011, not in March 2011. Modified: stable/7/share/zoneinfo/leapseconds stable/7/share/zoneinfo/northamerica stable/7/share/zoneinfo/southamerica stable/7/share/zoneinfo/zone.tab Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/leapseconds ============================================================================== --- stable/7/share/zoneinfo/leapseconds Tue Mar 8 21:14:02 2011 (r219412) +++ stable/7/share/zoneinfo/leapseconds Tue Mar 8 21:14:14 2011 (r219413) @@ -1,5 +1,5 @@ # 
-# @(#)leapseconds	8.10
+# @(#)leapseconds	8.11
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -56,13 +56,13 @@ Leap	2008	Dec	31	23:59:60	+	S
 # SERVICE DE LA ROTATION TERRESTRE
 # OBSERVATOIRE DE PARIS
 # 61, Av. de l'Observatoire 75014 PARIS (France)
-# Tel.      : 33 (0) 1 40 51 22 26
+# Tel.      : 33 (0) 1 40 51 22 29
 # FAX       : 33 (0) 1 40 51 22 91
 # Internet  : services.iers@obspm.fr
 #
-# Paris, 14 July 2010
+# Paris, 2 February 2011
 #
-# Bulletin C 40
+# Bulletin C 41
 #
 # To authorities responsible
 # for the measurement and
@@ -70,9 +70,9 @@ Leap	2008	Dec	31	23:59:60	+	S
 #
 # INFORMATION ON UTC - TAI
 #
-# NO positive leap second will be introduced at the end of December 2010.
+# NO positive leap second will be introduced at the end of June 2011.
 # The difference between Coordinated Universal Time UTC and the
-# International Atomic Time TAI is :
+# International Atomic Time TAI is :		
 #
 # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
 #
@@ -82,6 +82,6 @@ Leap	2008	Dec	31	23:59:60	+	S
 # will be no time step at the next possible date.
 #
 # Daniel GAMBIS
-# Director
-# Earth Orientation Center of IERS
+# Head			
+# Earth Orientation Center of the IERS
 # Observatoire de Paris, France

Modified: stable/7/share/zoneinfo/northamerica
==============================================================================
--- stable/7/share/zoneinfo/northamerica	Tue Mar  8 21:14:02 2011	(r219412)
+++ stable/7/share/zoneinfo/northamerica	Tue Mar  8 21:14:14 2011	(r219413)
@@ -1,5 +1,5 @@
 # 
-# @(#)northamerica	8.40
+# @(#)northamerica	8.41
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -426,15 +426,74 @@ Zone America/Los_Angeles -7:52:58 -	LMT	
 # were nearby inhabitants in some cases and for our purposes perhaps
 # it's best to simply use the official transition.
 #
+
+# From Steve Ferguson (2011-01-31):
+# The author lives in Alaska and many of the references listed are only
+# available to Alaskan residents.
+#
+# 
+# http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
+# 
+
+# From Arthur David Olson (2011-02-01):
+# Here's database-relevant material from the 2001 "Alaska History" article:
+#
+# On September 20 [1979]...DOT...officials decreed that on April 27,
+# 1980, Juneau and other nearby communities would move to Yukon Time.
+# Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
+# Pacific Time.
+#
+# ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
+# Department's September 1979 decision. Juneau and other communities in
+# northern Southeast reverted to Pacific Time on October 26.
+#
+# On October 28 [1983]...the Metlakatla Indian Community Council voted
+# unanimously to keep the reservation on Pacific Time.
+#
+# According to DOT official Joanne Petrie, Indian reservations are not
+# bound to follow time zones imposed by neighboring jurisdictions.
+#
+# (The last is consistent with how the database now handles the Navajo
+# Nation.)
+
+# From Arthur David Olson (2011-02-09):
+# I just spoke by phone with a staff member at the Metlakatla Indian
+# Community office (using contact information available at
+# 
+# http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
+# ).
+# It's shortly after 1:00 here on the east coast of the United States;
+# the staffer said it was shortly after 10:00 there. When I asked whether
+# that meant they were on Pacific time, they said no--they were on their
+# own time. I asked about daylight saving; they said it wasn't used. I
+# did not inquire about practices in the past.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
 			 -8:57:41 -	LMT	1900 Aug 20 12:00
 			 -8:00	-	PST	1942
 			 -8:00	US	P%sT	1946
 			 -8:00	-	PST	1969
+			 -8:00	US	P%sT	1980 Apr 27 2:00
+			 -9:00	US	Y%sT	1980 Oct 26 2:00	
+			 -8:00	US	P%sT	1983 Oct 30 2:00
+			 -9:00	US	Y%sT	1983 Nov 30
+			 -9:00	US	AK%sT
+Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
+			 -9:01:13 -	LMT	1900 Aug 20 12:00
+			 -8:00	-	PST	1942
+			 -8:00	US	P%sT	1946
+			 -8:00	-	PST	1969
 			 -8:00	US	P%sT	1983 Oct 30 2:00
 			 -9:00	US	Y%sT	1983 Nov 30
 			 -9:00	US	AK%sT
+Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
+			 -8:46:18 -	LMT	1900 Aug 20 12:00
+			 -8:00	-	PST	1942
+			 -8:00	US	P%sT	1946
+			 -8:00	-	PST	1969
+			 -8:00	US	P%sT	1983 Oct 30 2:00
+			 -8:00	US	MeST
 Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
 			 -9:18:55 -	LMT	1900 Aug 20 12:00
 			 -9:00	-	YST	1942

Modified: stable/7/share/zoneinfo/southamerica
==============================================================================
--- stable/7/share/zoneinfo/southamerica	Tue Mar  8 21:14:02 2011	(r219412)
+++ stable/7/share/zoneinfo/southamerica	Tue Mar  8 21:14:14 2011	(r219413)
@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.44
+# @(#)southamerica	8.45
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1154,6 +1154,23 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1
 # From Arthur Daivd Olson (2010-03-06):
 # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
 
+# From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
+# It appears that the Chilean government has decided to postpone the
+# change from summer time to winter time again, by three weeks to April
+# 2nd:
+# 
+# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
+# 
+#
+# This is not yet reflected in the offical "cambio de hora" site, but
+# probably will be soon:
+# 
+# http://www.horaoficial.cl/cambio.htm
+# 
+
+# From Arthur David Olson (2011-03-02):
+# The emol.com article mentions a water shortage as the cause of the
+# postponement, which may mean that it's not a permanent change.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1189,8 +1206,8 @@ Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	
 # which is used below in specifying the transition.
 Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
 Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
-Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
+Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

Modified: stable/7/share/zoneinfo/zone.tab
==============================================================================
--- stable/7/share/zoneinfo/zone.tab	Tue Mar  8 21:14:02 2011	(r219412)
+++ stable/7/share/zoneinfo/zone.tab	Tue Mar  8 21:14:14 2011	(r219413)
@@ -1,5 +1,5 @@
 # 
-# @(#)zone.tab	8.40
+# @(#)zone.tab	8.41
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -412,9 +412,11 @@ US	+332654-1120424	America/Phoenix	Mount
 US	+340308-1181434	America/Los_Angeles	Pacific Time
 US	+611305-1495401	America/Anchorage	Alaska Time
 US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
 US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
 US	+643004-1652423	America/Nome	Alaska Time - west Alaska
 US	+515248-1763929	America/Adak	Aleutian Islands
+US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
 US	+211825-1575130	Pacific/Honolulu	Hawaii
 UY	-3453-05611	America/Montevideo
 UZ	+3940+06648	Asia/Samarkand	west Uzbekistan

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Mar 10 01:02:54 2011
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 CDE091065670;
	Thu, 10 Mar 2011 01:02:54 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A11778FC18;
	Thu, 10 Mar 2011 01:02: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 p2A12sSp026160;
	Thu, 10 Mar 2011 01:02:54 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2A12sAj026158;
	Thu, 10 Mar 2011 01:02:54 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201103100102.p2A12sAj026158@svn.freebsd.org>
From: Xin LI 
Date: Thu, 10 Mar 2011 01:02:54 +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: r219440 - in stable: 7/usr.sbin/diskinfo
	8/usr.sbin/diskinfo
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, 10 Mar 2011 01:02:54 -0000

Author: delphij
Date: Thu Mar 10 01:02:53 2011
New Revision: 219440
URL: http://svn.freebsd.org/changeset/base/219440

Log:
  MFC r218432:
  
  Don't consider ioctl returning error as a fatal error and move on to next
  disk.  When multiple devices are specified, a non-supporting ioctl will
  cause diskinfo(8) to stop at the point which does not seem to be necessary.

Modified:
  stable/7/usr.sbin/diskinfo/diskinfo.c
Directory Properties:
  stable/7/usr.sbin/diskinfo/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/usr.sbin/diskinfo/diskinfo.c
Directory Properties:
  stable/8/usr.sbin/diskinfo/   (props changed)

Modified: stable/7/usr.sbin/diskinfo/diskinfo.c
==============================================================================
--- stable/7/usr.sbin/diskinfo/diskinfo.c	Wed Mar  9 23:11:30 2011	(r219439)
+++ stable/7/usr.sbin/diskinfo/diskinfo.c	Thu Mar 10 01:02:53 2011	(r219440)
@@ -56,7 +56,7 @@ static void commandtime(int fd, off_t me
 int
 main(int argc, char **argv)
 {
-	int i, ch, fd, error;
+	int i, ch, fd, error, exitval = 0;
 	char buf[BUFSIZ], ident[DISK_IDENT_SIZE];
 	off_t	mediasize;
 	u_int	sectorsize, fwsectors, fwheads;
@@ -90,14 +90,23 @@ main(int argc, char **argv)
 			sprintf(buf, "%s%s", _PATH_DEV, argv[i]);
 			fd = open(buf, O_RDONLY);
 		}
-		if (fd < 0)
-			err(1, argv[i]);
+		if (fd < 0) {
+			warn("%s", argv[i]);
+			exitval = 1;
+			goto out;
+		}
 		error = ioctl(fd, DIOCGMEDIASIZE, &mediasize);
-		if (error)
-			err(1, "%s: ioctl(DIOCGMEDIASIZE) failed, probably not a disk.", argv[i]);
+		if (error) {
+			warn("%s: ioctl(DIOCGMEDIASIZE) failed, probably not a disk.", argv[i]);
+			exitval = 1;
+			goto out;
+		}
 		error = ioctl(fd, DIOCGSECTORSIZE, §orsize);
-		if (error)
-			err(1, "%s: DIOCGSECTORSIZE failed, probably not a disk.", argv[i]);
+		if (error) {
+			warn("%s: DIOCGSECTORSIZE failed, probably not a disk.", argv[i]);
+			exitval = 1;
+			goto out;
+		}
 		error = ioctl(fd, DIOCGFWSECTORS, &fwsectors);
 		if (error)
 			fwsectors = 0;
@@ -141,9 +150,10 @@ main(int argc, char **argv)
 			commandtime(fd, mediasize, sectorsize);
 		if (opt_t)
 			speeddisk(fd, mediasize, sectorsize);
+out:
 		close(fd);
 	}
-	exit (0);
+	exit (exitval);
 }
 
 

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Mar 10 16:51:28 2011
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 80147106564A;
	Thu, 10 Mar 2011 16:51:28 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CD488FC16;
	Thu, 10 Mar 2011 16:51:28 +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 p2AGpSXZ049772;
	Thu, 10 Mar 2011 16:51:28 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2AGpSmC049770;
	Thu, 10 Mar 2011 16:51:28 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201103101651.p2AGpSmC049770@svn.freebsd.org>
From: Jaakko Heinonen 
Date: Thu, 10 Mar 2011 16:51:28 +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: r219453 - stable/7/sys/fs/devfs
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, 10 Mar 2011 16:51:28 -0000

Author: jh
Date: Thu Mar 10 16:51:28 2011
New Revision: 219453
URL: http://svn.freebsd.org/changeset/base/219453

Log:
  MFC r179926 by gonzo:
  
  Get pointer to devfs_ruleset struct after garbage collection has been
  performed. Otherwise if ruleset is used by given mountpoint and is empty
  it's freed by devfs_ruleset_reap and pointer becomes bogus.
  
  PR:		kern/124853

Modified:
  stable/7/sys/fs/devfs/devfs_rule.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/fs/devfs/devfs_rule.c
==============================================================================
--- stable/7/sys/fs/devfs/devfs_rule.c	Thu Mar 10 16:40:13 2011	(r219452)
+++ stable/7/sys/fs/devfs/devfs_rule.c	Thu Mar 10 16:51:28 2011	(r219453)
@@ -735,15 +735,15 @@ devfs_ruleset_use(devfs_rsnum rsnum, str
 {
 	struct devfs_ruleset *cds, *ds;
 
-	ds = devfs_ruleset_bynum(rsnum);
-	if (ds == NULL)
-		ds = devfs_ruleset_create(rsnum);
 	if (dm->dm_ruleset != 0) {
 		cds = devfs_ruleset_bynum(dm->dm_ruleset);
 		--cds->ds_refcount;
 		devfs_ruleset_reap(cds);
 	}
 
+	ds = devfs_ruleset_bynum(rsnum);
+	if (ds == NULL)
+		ds = devfs_ruleset_create(rsnum);
 	/* These should probably be made atomic somehow. */
 	++ds->ds_refcount;
 	dm->dm_ruleset = rsnum;

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 14:46:28 2011
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 2896F1065677;
	Fri, 11 Mar 2011 14:46:28 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 163048FC1C;
	Fri, 11 Mar 2011 14:46:28 +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 p2BEkR0E081839;
	Fri, 11 Mar 2011 14:46:27 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BEkRMn081836;
	Fri, 11 Mar 2011 14:46:27 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111446.p2BEkRMn081836@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 14:46:27 +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: r219485 - in stable/7/sys: amd64/include i386/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: Fri, 11 Mar 2011 14:46:28 -0000

Author: avg
Date: Fri Mar 11 14:46:27 2011
New Revision: 219485
URL: http://svn.freebsd.org/changeset/base/219485

Log:
  MFC r215522: specialreg.h: add definition for AMD Core Performance Boost bit

Modified:
  stable/7/sys/amd64/include/specialreg.h
  stable/7/sys/i386/include/specialreg.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/include/specialreg.h
==============================================================================
--- stable/7/sys/amd64/include/specialreg.h	Fri Mar 11 14:38:35 2011	(r219484)
+++ stable/7/sys/amd64/include/specialreg.h	Fri Mar 11 14:46:27 2011	(r219485)
@@ -196,6 +196,7 @@
 #define	AMDPM_100MHZ_STEPS	0x00000040
 #define	AMDPM_HW_PSTATE		0x00000080
 #define	AMDPM_TSC_INVARIANT	0x00000100
+#define	AMDPM_CPB		0x00000200
 
 /*
  * AMD extended function 8000_0008h ecx info

Modified: stable/7/sys/i386/include/specialreg.h
==============================================================================
--- stable/7/sys/i386/include/specialreg.h	Fri Mar 11 14:38:35 2011	(r219484)
+++ stable/7/sys/i386/include/specialreg.h	Fri Mar 11 14:46:27 2011	(r219485)
@@ -195,6 +195,7 @@
 #define	AMDPM_100MHZ_STEPS	0x00000040
 #define	AMDPM_HW_PSTATE		0x00000080
 #define	AMDPM_TSC_INVARIANT	0x00000100
+#define	AMDPM_CPB		0x00000200
 
 /*
  * AMD extended function 8000_0008h ecx info

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 14:55:23 2011
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 BF93B106566B;
	Fri, 11 Mar 2011 14:55:23 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 93ACD8FC18;
	Fri, 11 Mar 2011 14:55: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 p2BEtNj4082166;
	Fri, 11 Mar 2011 14:55:23 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BEtNHZ082162;
	Fri, 11 Mar 2011 14:55:23 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111455.p2BEtNHZ082162@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 14:55:23 +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: r219487 - in stable/7/sys: amd64/include i386/i386
	i386/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: Fri, 11 Mar 2011 14:55:23 -0000

Author: avg
Date: Fri Mar 11 14:55:23 2011
New Revision: 219487
URL: http://svn.freebsd.org/changeset/base/219487

Log:
  MFC r215523: specialreg.h: add AMD-specific "Hardware Configuration
  Register" MSR

Modified:
  stable/7/sys/amd64/include/specialreg.h
  stable/7/sys/i386/i386/initcpu.c
  stable/7/sys/i386/include/specialreg.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/include/specialreg.h
==============================================================================
--- stable/7/sys/amd64/include/specialreg.h	Fri Mar 11 14:53:34 2011	(r219486)
+++ stable/7/sys/amd64/include/specialreg.h	Fri Mar 11 14:55:23 2011	(r219487)
@@ -494,6 +494,7 @@
 #define	MSR_PERFCTR2	0xc0010006
 #define	MSR_PERFCTR3	0xc0010007
 #define	MSR_SYSCFG	0xc0010010
+#define	MSR_HWCR	0xc0010015
 #define	MSR_IORRBASE0	0xc0010016
 #define	MSR_IORRMASK0	0xc0010017
 #define	MSR_IORRBASE1	0xc0010018

Modified: stable/7/sys/i386/i386/initcpu.c
==============================================================================
--- stable/7/sys/i386/i386/initcpu.c	Fri Mar 11 14:53:34 2011	(r219486)
+++ stable/7/sys/i386/i386/initcpu.c	Fri Mar 11 14:55:23 2011	(r219487)
@@ -680,7 +680,7 @@ initializecpu(void)
 			     (cpu_id & ~0xf) == 0x670 ||
 			     (cpu_id & ~0xf) == 0x680)) {
 				u_int regs[4];
-				wrmsr(0xC0010015, rdmsr(0xC0010015) & ~0x08000);
+				wrmsr(MSR_HWCR, rdmsr(MSR_HWCR) & ~0x08000);
 				do_cpuid(1, regs);
 				cpu_feature = regs[3];
 			}

Modified: stable/7/sys/i386/include/specialreg.h
==============================================================================
--- stable/7/sys/i386/include/specialreg.h	Fri Mar 11 14:53:34 2011	(r219486)
+++ stable/7/sys/i386/include/specialreg.h	Fri Mar 11 14:55:23 2011	(r219487)
@@ -544,7 +544,8 @@
 #define	AMD_WT_ALLOC_FRE	0x10000	/* fixed (A0000-FFFFF) range enable */
 
 /* AMD64 MSR's */
-#define	MSR_EFER	0xc0000080	/* extended features */
+#define	MSR_EFER		0xc0000080	/* extended features */
+#define	MSR_HWCR		0xc0010015
 #define	MSR_K8_UCODE_UPDATE	0xc0010020	/* update microcode */
 #define	MSR_MC0_CTL_MASK	0xc0010044
 

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 15:01:54 2011
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 BBCB7106566C;
	Fri, 11 Mar 2011 15:01:54 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A92798FC19;
	Fri, 11 Mar 2011 15:01: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 p2BF1sw9082573;
	Fri, 11 Mar 2011 15:01:54 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BF1sMl082570;
	Fri, 11 Mar 2011 15:01:54 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111501.p2BF1sMl082570@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 15:01:54 +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: r219489 - in stable/7/sys: amd64/include i386/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: Fri, 11 Mar 2011 15:01:54 -0000

Author: avg
Date: Fri Mar 11 15:01:54 2011
New Revision: 219489
URL: http://svn.freebsd.org/changeset/base/219489

Log:
  MFC r215524: specialreg.h: add definitions for MPERF/APERF pair of MSRs

Modified:
  stable/7/sys/amd64/include/specialreg.h
  stable/7/sys/i386/include/specialreg.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/include/specialreg.h
==============================================================================
--- stable/7/sys/amd64/include/specialreg.h	Fri Mar 11 14:58:17 2011	(r219488)
+++ stable/7/sys/amd64/include/specialreg.h	Fri Mar 11 15:01:54 2011	(r219489)
@@ -230,6 +230,8 @@
 #define	MSR_BIOS_SIGN		0x08b
 #define	MSR_PERFCTR0		0x0c1
 #define	MSR_PERFCTR1		0x0c2
+#define	MSR_MPERF		0x0e7
+#define	MSR_APERF		0x0e8
 #define	MSR_IA32_EXT_CONFIG	0x0ee	/* Undocumented. Core Solo/Duo only */
 #define	MSR_MTRRcap		0x0fe
 #define	MSR_BBL_CR_ADDR		0x116

Modified: stable/7/sys/i386/include/specialreg.h
==============================================================================
--- stable/7/sys/i386/include/specialreg.h	Fri Mar 11 14:58:17 2011	(r219488)
+++ stable/7/sys/i386/include/specialreg.h	Fri Mar 11 15:01:54 2011	(r219489)
@@ -236,6 +236,8 @@
 #define	MSR_BIOS_SIGN		0x08b
 #define	MSR_PERFCTR0		0x0c1
 #define	MSR_PERFCTR1		0x0c2
+#define	MSR_MPERF		0x0e7
+#define	MSR_APERF		0x0e8
 #define	MSR_IA32_EXT_CONFIG	0x0ee	/* Undocumented. Core Solo/Duo only */
 #define	MSR_MTRRcap		0x0fe
 #define	MSR_BBL_CR_ADDR		0x116

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 15:06:57 2011
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 3D811106566B;
	Fri, 11 Mar 2011 15:06:57 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AE708FC0C;
	Fri, 11 Mar 2011 15:06:57 +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 p2BF6vu8083139;
	Fri, 11 Mar 2011 15:06:57 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BF6vU7083136;
	Fri, 11 Mar 2011 15:06:57 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111506.p2BF6vU7083136@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 15:06:57 +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: r219491 - in stable/7/sys: amd64/include i386/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: Fri, 11 Mar 2011 15:06:57 -0000

Author: avg
Date: Fri Mar 11 15:06:56 2011
New Revision: 219491
URL: http://svn.freebsd.org/changeset/base/219491

Log:
  MFC r215748: specialreg.h: add definitions for some useful bits found in
  CPUID.6 EAX and ECX

Modified:
  stable/7/sys/amd64/include/specialreg.h
  stable/7/sys/i386/include/specialreg.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/include/specialreg.h
==============================================================================
--- stable/7/sys/amd64/include/specialreg.h	Fri Mar 11 15:05:23 2011	(r219490)
+++ stable/7/sys/amd64/include/specialreg.h	Fri Mar 11 15:06:56 2011	(r219491)
@@ -133,6 +133,15 @@
 #define	CPUID2_POPCNT	0x00800000
 
 /*
+ * Important bits in the Thermal and Power Management flags
+ * CPUID.6 EAX and ECX.
+ */
+#define	CPUTPM1_SENSOR	0x00000001
+#define	CPUTPM1_TURBO	0x00000002
+#define	CPUTPM1_ARAT	0x00000004
+#define	CPUTPM2_EFFREQ	0x00000001
+
+/*
  * Important bits in the AMD extended cpuid flags
  */
 #define	AMDID_SYSCALL	0x00000800

Modified: stable/7/sys/i386/include/specialreg.h
==============================================================================
--- stable/7/sys/i386/include/specialreg.h	Fri Mar 11 15:05:23 2011	(r219490)
+++ stable/7/sys/i386/include/specialreg.h	Fri Mar 11 15:06:56 2011	(r219491)
@@ -130,6 +130,15 @@
 #define	CPUID2_POPCNT	0x00800000
 
 /*
+ * Important bits in the Thermal and Power Management flags
+ * CPUID.6 EAX and ECX.
+ */
+#define	CPUTPM1_SENSOR	0x00000001
+#define	CPUTPM1_TURBO	0x00000002
+#define	CPUTPM1_ARAT	0x00000004
+#define	CPUTPM2_EFFREQ	0x00000001
+
+/*
  * Important bits in the AMD extended cpuid flags
  */
 #define	AMDID_SYSCALL	0x00000800

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 15:53:11 2011
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 CFCA01065670;
	Fri, 11 Mar 2011 15:53:11 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BD6F68FC1C;
	Fri, 11 Mar 2011 15:53: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 p2BFrBRw084880;
	Fri, 11 Mar 2011 15:53:11 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BFrBpj084878;
	Fri, 11 Mar 2011 15:53:11 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111553.p2BFrBpj084878@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 15:53: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: r219496 - stable/7/sys/dev/cxgb/ulp/tom
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: Fri, 11 Mar 2011 15:53:11 -0000

Author: avg
Date: Fri Mar 11 15:53:11 2011
New Revision: 219496
URL: http://svn.freebsd.org/changeset/base/219496

Log:
  MFC r216373: fix incorrect use of atomic_set_xxx in cxgb

Modified:
  stable/7/sys/dev/cxgb/ulp/tom/cxgb_tom.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/cxgb/ulp/tom/cxgb_tom.c
==============================================================================
--- stable/7/sys/dev/cxgb/ulp/tom/cxgb_tom.c	Fri Mar 11 15:50:45 2011	(r219495)
+++ stable/7/sys/dev/cxgb/ulp/tom/cxgb_tom.c	Fri Mar 11 15:53:11 2011	(r219496)
@@ -240,7 +240,7 @@ init_tid_tabs(struct tid_info *t, unsign
 	t->atid_base = atid_base;
 	t->afree = NULL;
 	t->stids_in_use = t->atids_in_use = 0;
-	atomic_set_int(&t->tids_in_use, 0);
+	t->tids_in_use = 0;
 	mtx_init(&t->stid_lock, "stid", NULL, MTX_DUPOK|MTX_DEF);
 	mtx_init(&t->atid_lock, "atid", NULL, MTX_DUPOK|MTX_DEF);
 

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 16:02:39 2011
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 25188106566B;
	Fri, 11 Mar 2011 16:02:39 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ED1E18FC0C;
	Fri, 11 Mar 2011 16:02: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 p2BG2cUt085194;
	Fri, 11 Mar 2011 16:02:38 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BG2cEh085191;
	Fri, 11 Mar 2011 16:02:38 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111602.p2BG2cEh085191@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 16:02: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: r219498 - in stable/7/sys/cddl/dev/dtrace: amd64 i386
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: Fri, 11 Mar 2011 16:02:39 -0000

Author: avg
Date: Fri Mar 11 16:02:38 2011
New Revision: 219498
URL: http://svn.freebsd.org/changeset/base/219498

Log:
  MFC r216251: dtrace_xcall: no need for special handling of curcpu

Modified:
  stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
==============================================================================
--- stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c	Fri Mar 11 16:00:56 2011	(r219497)
+++ stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c	Fri Mar 11 16:02:38 2011	(r219498)
@@ -115,26 +115,13 @@ dtrace_xcall(processorid_t cpu, dtrace_x
 {
 	cpumask_t cpus;
 
-	critical_enter();
-
 	if (cpu == DTRACE_CPUALL)
 		cpus = all_cpus;
 	else
-		cpus = (cpumask_t) (1 << cpu);
-
-	/* If the current CPU is in the set, call the function directly: */
-	if ((cpus & (1 << curcpu)) != 0) {
-		(*func)(arg);
-
-		/* Mask the current CPU from the set */
-		cpus &= ~(1 << curcpu);
-	}
-
-	/* If there are any CPUs in the set, cross-call to those CPUs */
-	if (cpus != 0)
-		smp_rendezvous_cpus(cpus, NULL, func, smp_no_rendevous_barrier, arg);
+		cpus = (cpumask_t)1 << cpu;
 
-	critical_exit();
+	smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
+	    smp_no_rendevous_barrier, arg);
 }
 
 static void

Modified: stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c
==============================================================================
--- stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c	Fri Mar 11 16:00:56 2011	(r219497)
+++ stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c	Fri Mar 11 16:02:38 2011	(r219498)
@@ -115,26 +115,13 @@ dtrace_xcall(processorid_t cpu, dtrace_x
 {
 	cpumask_t cpus;
 
-	critical_enter();
-
 	if (cpu == DTRACE_CPUALL)
 		cpus = all_cpus;
 	else
-		cpus = (cpumask_t) (1 << cpu);
-
-	/* If the current CPU is in the set, call the function directly: */
-	if ((cpus & (1 << curcpu)) != 0) {
-		(*func)(arg);
-
-		/* Mask the current CPU from the set */
-		cpus &= ~(1 << curcpu);
-	}
-
-	/* If there are any CPUs in the set, cross-call to those CPUs */
-	if (cpus != 0)
-		smp_rendezvous_cpus(cpus, NULL, func, smp_no_rendevous_barrier, arg);
+		cpus = (cpumask_t)1 << cpu;
 
-	critical_exit();
+	smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
+	    smp_no_rendevous_barrier, arg);
 }
 
 static void

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 16:07:20 2011
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 A804B1065670;
	Fri, 11 Mar 2011 16:07:20 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 959858FC0A;
	Fri, 11 Mar 2011 16:07: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 p2BG7Kwx085394;
	Fri, 11 Mar 2011 16:07:20 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BG7Ke6085392;
	Fri, 11 Mar 2011 16:07:20 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111607.p2BG7Ke6085392@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 16:07: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: r219500 - stable/7/sys/cddl/dev/cyclic/i386
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: Fri, 11 Mar 2011 16:07:20 -0000

Author: avg
Date: Fri Mar 11 16:07:20 2011
New Revision: 219500
URL: http://svn.freebsd.org/changeset/base/219500

Log:
  MFC r216252: opensolaris cyclic xcall: no need for special handling of curcpu

Modified:
  stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
==============================================================================
--- stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Fri Mar 11 16:05:36 2011	(r219499)
+++ stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Fri Mar 11 16:07:20 2011	(r219500)
@@ -121,13 +121,7 @@ static void reprogram(cyb_arg_t arg, hrt
 
 static void xcall(cyb_arg_t arg, cpu_t *c, cyc_func_t func, void *param)
 {
-	/*
-	 * If the target CPU is the current one, just call the
-	 * function. This covers the non-SMP case.
-	 */
-	if (c == &solaris_cpu[curcpu])
-		(*func)(param);
-	else
-		smp_rendezvous_cpus((cpumask_t) (1 << c->cpuid), NULL,
-		    func, smp_no_rendevous_barrier, param);
+
+	smp_rendezvous_cpus((cpumask_t) (1 << c->cpuid), NULL,
+	    func, smp_no_rendevous_barrier, param);
 }

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 16:13:26 2011
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 564AA1065672;
	Fri, 11 Mar 2011 16:13:26 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 426CE8FC13;
	Fri, 11 Mar 2011 16:13: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 p2BGDQcB085666;
	Fri, 11 Mar 2011 16:13:26 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BGDQQ4085663;
	Fri, 11 Mar 2011 16:13:26 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111613.p2BGDQQ4085663@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 16:13:26 +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: r219502 - in stable/7/sys/cddl: compat/opensolaris/sys
	dev/cyclic
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: Fri, 11 Mar 2011 16:13:26 -0000

Author: avg
Date: Fri Mar 11 16:13:26 2011
New Revision: 219502
URL: http://svn.freebsd.org/changeset/base/219502

Log:
  MFC r216254: opensolaris cyclic: fix deadlock and make a little bit
  closer to upstream

Modified:
  stable/7/sys/cddl/compat/opensolaris/sys/cyclic_impl.h
  stable/7/sys/cddl/dev/cyclic/cyclic.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cddl/compat/opensolaris/sys/cyclic_impl.h
==============================================================================
--- stable/7/sys/cddl/compat/opensolaris/sys/cyclic_impl.h	Fri Mar 11 16:11:42 2011	(r219501)
+++ stable/7/sys/cddl/compat/opensolaris/sys/cyclic_impl.h	Fri Mar 11 16:13:26 2011	(r219502)
@@ -288,7 +288,14 @@ typedef struct cyc_id {
 
 typedef struct cyc_xcallarg {
 	cyc_cpu_t *cyx_cpu;
-	hrtime_t cyx_exp;
+	cyc_handler_t *cyx_hdlr;
+	cyc_time_t *cyx_when;
+	cyc_index_t cyx_ndx;
+	cyc_index_t *cyx_heap;
+	cyclic_t *cyx_cyclics;
+	cyc_index_t cyx_size;
+	uint16_t cyx_flags;
+	int cyx_wait;
 } cyc_xcallarg_t;
 
 #define	CY_DEFAULT_PERCPU	1

Modified: stable/7/sys/cddl/dev/cyclic/cyclic.c
==============================================================================
--- stable/7/sys/cddl/dev/cyclic/cyclic.c	Fri Mar 11 16:11:42 2011	(r219501)
+++ stable/7/sys/cddl/dev/cyclic/cyclic.c	Fri Mar 11 16:13:26 2011	(r219502)
@@ -473,73 +473,6 @@ cyclic_expire(cyc_cpu_t *cpu, cyc_index_
 	(*handler)(arg);
 }
 
-static void
-cyclic_enable_xcall(void *v)
-{
-	cyc_xcallarg_t *argp = v;
-	cyc_cpu_t *cpu = argp->cyx_cpu;
-	cyc_backend_t *be = cpu->cyp_backend;
-
-	be->cyb_enable(be->cyb_arg);
-}
-
-static void
-cyclic_enable(cyc_cpu_t *cpu)
-{
-	cyc_backend_t *be = cpu->cyp_backend;
-	cyc_xcallarg_t arg;
-
-	arg.cyx_cpu = cpu;
-
-	/* Cross call to the target CPU */
-	be->cyb_xcall(be->cyb_arg, cpu->cyp_cpu, cyclic_enable_xcall, &arg);
-}
-
-static void
-cyclic_disable_xcall(void *v)
-{
-	cyc_xcallarg_t *argp = v;
-	cyc_cpu_t *cpu = argp->cyx_cpu;
-	cyc_backend_t *be = cpu->cyp_backend;
-
-	be->cyb_disable(be->cyb_arg);
-}
-
-static void
-cyclic_disable(cyc_cpu_t *cpu)
-{
-	cyc_backend_t *be = cpu->cyp_backend;
-	cyc_xcallarg_t arg;
-
-	arg.cyx_cpu = cpu;
-
-	/* Cross call to the target CPU */
-	be->cyb_xcall(be->cyb_arg, cpu->cyp_cpu, cyclic_disable_xcall, &arg);
-}
-
-static void
-cyclic_reprogram_xcall(void *v)
-{
-	cyc_xcallarg_t *argp = v;
-	cyc_cpu_t *cpu = argp->cyx_cpu;
-	cyc_backend_t *be = cpu->cyp_backend;
-
-	be->cyb_reprogram(be->cyb_arg, argp->cyx_exp);
-}
-
-static void
-cyclic_reprogram(cyc_cpu_t *cpu, hrtime_t exp)
-{
-	cyc_backend_t *be = cpu->cyp_backend;
-	cyc_xcallarg_t arg;
-
-	arg.cyx_cpu = cpu;
-	arg.cyx_exp = exp;
-
-	/* Cross call to the target CPU */
-	be->cyb_xcall(be->cyb_arg, cpu->cyp_cpu, cyclic_reprogram_xcall, &arg);
-}
-
 /*
  *  cyclic_fire(cpu_t *)
  *
@@ -570,17 +503,15 @@ static void
 cyclic_fire(cpu_t *c)
 {
 	cyc_cpu_t *cpu = c->cpu_cyclic;
-
-	mtx_lock_spin(&cpu->cyp_mtx);
-
+	cyc_backend_t *be = cpu->cyp_backend;
 	cyc_index_t *heap = cpu->cyp_heap;
 	cyclic_t *cyclic, *cyclics = cpu->cyp_cyclics;
+	void *arg = be->cyb_arg;
 	hrtime_t now = gethrtime();
 	hrtime_t exp;
 
 	if (cpu->cyp_nelems == 0) {
 		/* This is a spurious fire. */
-		mtx_unlock_spin(&cpu->cyp_mtx);
 		return;
 	}
 
@@ -631,8 +562,45 @@ cyclic_fire(cpu_t *c)
 	 * Now we have a cyclic in the root slot which isn't in the past;
 	 * reprogram the interrupt source.
 	 */
-	cyclic_reprogram(cpu, exp);
+	be->cyb_reprogram(arg, exp);
+}
+
+static void
+cyclic_expand_xcall(cyc_xcallarg_t *arg)
+{
+	cyc_cpu_t *cpu = arg->cyx_cpu;
+	cyc_index_t new_size = arg->cyx_size, size = cpu->cyp_size, i;
+	cyc_index_t *new_heap = arg->cyx_heap;
+	cyclic_t *cyclics = cpu->cyp_cyclics, *new_cyclics = arg->cyx_cyclics;
+
+	/* Disable preemption and interrupts. */
+	mtx_lock_spin(&cpu->cyp_mtx);
+
+	/*
+	 * Assert that the new size is a power of 2.
+	 */
+	ASSERT((new_size & (new_size - 1)) == 0);
+	ASSERT(new_size == (size << 1));
+	ASSERT(cpu->cyp_heap != NULL && cpu->cyp_cyclics != NULL);
+
+	bcopy(cpu->cyp_heap, new_heap, sizeof (cyc_index_t) * size);
+	bcopy(cyclics, new_cyclics, sizeof (cyclic_t) * size);
+
+	/*
+	 * Set up the free list, and set all of the new cyclics to be CYF_FREE.
+	 */
+	for (i = size; i < new_size; i++) {
+		new_heap[i] = i;
+		new_cyclics[i].cy_flags = CYF_FREE;
+	}
 
+	/*
+	 * We can go ahead and plow the value of cyp_heap and cyp_cyclics;
+	 * cyclic_expand() has kept a copy.
+	 */
+	cpu->cyp_heap = new_heap;
+	cpu->cyp_cyclics = new_cyclics;
+	cpu->cyp_size = new_size;
 	mtx_unlock_spin(&cpu->cyp_mtx);
 }
 
@@ -643,102 +611,70 @@ cyclic_fire(cpu_t *c)
 static void
 cyclic_expand(cyc_cpu_t *cpu)
 {
-	cyc_index_t new_size, old_size, i;
+	cyc_index_t new_size, old_size;
 	cyc_index_t *new_heap, *old_heap;
 	cyclic_t *new_cyclics, *old_cyclics;
+	cyc_xcallarg_t arg;
+	cyc_backend_t *be = cpu->cyp_backend;
 
 	ASSERT(MUTEX_HELD(&cpu_lock));
 
-	if ((new_size = ((old_size = cpu->cyp_size) << 1)) == 0)
+	old_heap = cpu->cyp_heap;
+	old_cyclics = cpu->cyp_cyclics;
+
+	if ((new_size = ((old_size = cpu->cyp_size) << 1)) == 0) {
 		new_size = CY_DEFAULT_PERCPU;
+		ASSERT(old_heap == NULL && old_cyclics == NULL);
+	}
 
 	/*
 	 * Check that the new_size is a power of 2.
 	 */
 	ASSERT(((new_size - 1) & new_size) == 0);
 
-	/* Unlock the mutex while allocating memory so we can wait... */
-	mtx_unlock_spin(&cpu->cyp_mtx);
-
 	new_heap = malloc(sizeof(cyc_index_t) * new_size, M_CYCLIC, M_WAITOK);
 	new_cyclics = malloc(sizeof(cyclic_t) * new_size, M_CYCLIC, M_ZERO | M_WAITOK);
 
-	/* Grab the lock again now we've got the memory... */
-	mtx_lock_spin(&cpu->cyp_mtx);
-
-	/* Check if another thread beat us while the mutex was unlocked. */
-	if (old_size != cpu->cyp_size) {
-		/* Oh well, he won. */
-		mtx_unlock_spin(&cpu->cyp_mtx);
-
-		free(new_heap, M_CYCLIC);
-		free(new_cyclics, M_CYCLIC);
-
-		mtx_lock_spin(&cpu->cyp_mtx);
-		return;
-	}
-
-	old_heap = cpu->cyp_heap;
-	old_cyclics = cpu->cyp_cyclics;
-
-	bcopy(cpu->cyp_heap, new_heap, sizeof (cyc_index_t) * old_size);
-	bcopy(old_cyclics, new_cyclics, sizeof (cyclic_t) * old_size);
-
-	/*
-	 * Set up the free list, and set all of the new cyclics to be CYF_FREE.
-	 */
-	for (i = old_size; i < new_size; i++) {
-		new_heap[i] = i;
-		new_cyclics[i].cy_flags = CYF_FREE;
-	}
+	arg.cyx_cpu = cpu;
+	arg.cyx_heap = new_heap;
+	arg.cyx_cyclics = new_cyclics;
+	arg.cyx_size = new_size;
 
-	/*
-	 * We can go ahead and plow the value of cyp_heap and cyp_cyclics;
-	 * cyclic_expand() has kept a copy.
-	 */
-	cpu->cyp_heap = new_heap;
-	cpu->cyp_cyclics = new_cyclics;
-	cpu->cyp_size = new_size;
+	be->cyb_xcall(be->cyb_arg, cpu->cyp_cpu,
+	    (cyc_func_t)cyclic_expand_xcall, &arg);
 
 	if (old_cyclics != NULL) {
 		ASSERT(old_heap != NULL);
 		ASSERT(old_size != 0);
-		mtx_unlock_spin(&cpu->cyp_mtx);
-
 		free(old_cyclics, M_CYCLIC);
 		free(old_heap, M_CYCLIC);
-
-		mtx_lock_spin(&cpu->cyp_mtx);
 	}
 }
 
-static cyc_index_t
-cyclic_add_here(cyc_cpu_t *cpu, cyc_handler_t *hdlr,
-    cyc_time_t *when, uint16_t flags)
+static void
+cyclic_add_xcall(cyc_xcallarg_t *arg)
 {
+	cyc_cpu_t *cpu = arg->cyx_cpu;
+	cyc_handler_t *hdlr = arg->cyx_hdlr;
+	cyc_time_t *when = arg->cyx_when;
+	cyc_backend_t *be = cpu->cyp_backend;
 	cyc_index_t ndx, nelems;
+	cyb_arg_t bar = be->cyb_arg;
 	cyclic_t *cyclic;
 
-	ASSERT(MUTEX_HELD(&cpu_lock));
-
-	mtx_lock_spin(&cpu->cyp_mtx);
-
-	ASSERT(!(cpu->cyp_cpu->cpu_flags & CPU_OFFLINE));
-	ASSERT(when->cyt_when >= 0 && when->cyt_interval > 0);
-
-	while (cpu->cyp_nelems == cpu->cyp_size)
-		cyclic_expand(cpu);
-
 	ASSERT(cpu->cyp_nelems < cpu->cyp_size);
 
+	/* Disable preemption and interrupts. */
+	mtx_lock_spin(&cpu->cyp_mtx);
 	nelems = cpu->cyp_nelems++;
 
-	if (nelems == 0)
+	if (nelems == 0) {
 		/*
 		 * If this is the first element, we need to enable the
 		 * backend on this CPU.
 		 */
-		cyclic_enable(cpu);
+		be->cyb_enable(bar);
+	}
 
 	ndx = cpu->cyp_heap[nelems];
 	cyclic = &cpu->cyp_cyclics[ndx];
@@ -746,14 +682,20 @@ cyclic_add_here(cyc_cpu_t *cpu, cyc_hand
 	ASSERT(cyclic->cy_flags == CYF_FREE);
 	cyclic->cy_interval = when->cyt_interval;
 
-	if (when->cyt_when == 0)
-		cyclic->cy_expire = gethrtime() + cyclic->cy_interval;
-	else
+	if (when->cyt_when == 0) {
+		/*
+		 * If a start time hasn't been explicitly specified, we'll
+		 * start on the next interval boundary.
+		 */
+		cyclic->cy_expire = (gethrtime() / cyclic->cy_interval + 1) *
+		    cyclic->cy_interval;
+	} else {
 		cyclic->cy_expire = when->cyt_when;
+	}
 
 	cyclic->cy_handler = hdlr->cyh_func;
 	cyclic->cy_arg = hdlr->cyh_arg;
-	cyclic->cy_flags = flags;
+	cyclic->cy_flags = arg->cyx_flags;
 
 	if (cyclic_upheap(cpu, nelems)) {
 		hrtime_t exp = cyclic->cy_expire;
@@ -762,31 +704,63 @@ cyclic_add_here(cyc_cpu_t *cpu, cyc_hand
 		 * If our upheap propagated to the root, we need to
 		 * reprogram the interrupt source.
 		 */
-		cyclic_reprogram(cpu, exp);
+		be->cyb_reprogram(bar, exp);
 	}
-
 	mtx_unlock_spin(&cpu->cyp_mtx);
 
-	return (ndx);
+	arg->cyx_ndx = ndx;
 }
 
-
-static int
-cyclic_remove_here(cyc_cpu_t *cpu, cyc_index_t ndx, cyc_time_t *when, int wait)
+static cyc_index_t
+cyclic_add_here(cyc_cpu_t *cpu, cyc_handler_t *hdlr,
+    cyc_time_t *when, uint16_t flags)
 {
-	cyc_index_t nelems, i;
-	cyclic_t *cyclic;
-	cyc_index_t *heap, last;
+	cyc_backend_t *be = cpu->cyp_backend;
+	cyb_arg_t bar = be->cyb_arg;
+	cyc_xcallarg_t arg;
 
 	ASSERT(MUTEX_HELD(&cpu_lock));
-	ASSERT(wait == CY_WAIT || wait == CY_NOWAIT);
+	ASSERT(!(cpu->cyp_cpu->cpu_flags & CPU_OFFLINE));
+	ASSERT(when->cyt_when >= 0 && when->cyt_interval > 0);
 
-	mtx_lock_spin(&cpu->cyp_mtx);
+	if (cpu->cyp_nelems == cpu->cyp_size) {
+		/*
+		 * This is expensive; it will cross call onto the other
+		 * CPU to perform the expansion.
+		 */
+		cyclic_expand(cpu);
+		ASSERT(cpu->cyp_nelems < cpu->cyp_size);
+	}
+
+	/*
+	 * By now, we know that we're going to be able to successfully
+	 * perform the add.  Now cross call over to the CPU of interest to
+	 * actually add our cyclic.
+	 */
+	arg.cyx_cpu = cpu;
+	arg.cyx_hdlr = hdlr;
+	arg.cyx_when = when;
+	arg.cyx_flags = flags;
+
+	be->cyb_xcall(bar, cpu->cyp_cpu, (cyc_func_t)cyclic_add_xcall, &arg);
+
+	return (arg.cyx_ndx);
+}
 
-	heap = cpu->cyp_heap;
+static void
+cyclic_remove_xcall(cyc_xcallarg_t *arg)
+{
+	cyc_cpu_t *cpu = arg->cyx_cpu;
+	cyc_backend_t *be = cpu->cyp_backend;
+	cyb_arg_t bar = be->cyb_arg;
+	cyc_index_t ndx = arg->cyx_ndx, nelems = cpu->cyp_nelems, i;
+	cyc_index_t *heap = cpu->cyp_heap, last;
+	cyclic_t *cyclic;
 
-	nelems = cpu->cyp_nelems;
+	ASSERT(nelems > 0);
 
+	/* Disable preemption and interrupts. */
+	mtx_lock_spin(&cpu->cyp_mtx);
 	cyclic = &cpu->cyp_cyclics[ndx];
 
 	/*
@@ -794,11 +768,17 @@ cyclic_remove_here(cyc_cpu_t *cpu, cyc_i
 	 * removed as part of a juggling operation, the expiration time
 	 * will be used when the cyclic is added to the new CPU.
 	 */
-	if (when != NULL) {
-		when->cyt_when = cyclic->cy_expire;
-		when->cyt_interval = cyclic->cy_interval;
+	if (arg->cyx_when != NULL) {
+		arg->cyx_when->cyt_when = cyclic->cy_expire;
+		arg->cyx_when->cyt_interval = cyclic->cy_interval;
 	}
 
+	/*
+	 * Now set the flags to CYF_FREE.  We don't need a membar_enter()
+	 * between zeroing pend and setting the flags because we're at
+	 * CY_HIGH_LEVEL (that is, the zeroing of pend and the setting
+	 * of cy_flags appear atomic to softints).
+	 */
 	cyclic->cy_flags = CYF_FREE;
 
 	for (i = 0; i < nelems; i++) {
@@ -811,19 +791,21 @@ cyclic_remove_here(cyc_cpu_t *cpu, cyc_i
 
 	cpu->cyp_nelems = --nelems;
 
-	if (nelems == 0)
+	if (nelems == 0) {
 		/*
 		 * If we just removed the last element, then we need to
 		 * disable the backend on this CPU.
 		 */
-		cyclic_disable(cpu);
+		be->cyb_disable(bar);
+	}
 
-	if (i == nelems)
+	if (i == nelems) {
 		/*
 		 * If we just removed the last element of the heap, then
 		 * we don't have to downheap.
 		 */
-		goto done;
+		goto out;
+	}
 
 	/*
 	 * Swap the last element of the heap with the one we want to
@@ -833,17 +815,18 @@ cyclic_remove_here(cyc_cpu_t *cpu, cyc_i
 	heap[i] = (last = heap[nelems]);
 	heap[nelems] = ndx;
 
-	if (i == 0)
+	if (i == 0) {
 		cyclic_downheap(cpu, 0);
-	else {
+	} else {
 		if (cyclic_upheap(cpu, i) == 0) {
 			/*
 			 * The upheap didn't propagate to the root; if it
 			 * didn't propagate at all, we need to downheap.
 			 */
-			if (heap[i] == last)
+			if (heap[i] == last) {
 				cyclic_downheap(cpu, i);
-			goto done;
+			}
+			goto out;
 		}
 	}
 
@@ -854,10 +837,27 @@ cyclic_remove_here(cyc_cpu_t *cpu, cyc_i
 	cyclic = &cpu->cyp_cyclics[heap[0]];
 
 	ASSERT(nelems != 0);
-	cyclic_reprogram(cpu, cyclic->cy_expire);
-
-done:
+	be->cyb_reprogram(bar, cyclic->cy_expire);
+out:
 	mtx_unlock_spin(&cpu->cyp_mtx);
+}
+
+static int
+cyclic_remove_here(cyc_cpu_t *cpu, cyc_index_t ndx, cyc_time_t *when, int wait)
+{
+	cyc_backend_t *be = cpu->cyp_backend;
+	cyc_xcallarg_t arg;
+
+	ASSERT(MUTEX_HELD(&cpu_lock));
+	ASSERT(wait == CY_WAIT || wait == CY_NOWAIT);
+
+	arg.cyx_ndx = ndx;
+	arg.cyx_cpu = cpu;
+	arg.cyx_when = when;
+	arg.cyx_wait = wait;
+
+	be->cyb_xcall(be->cyb_arg, cpu->cyp_cpu,
+	    (cyc_func_t)cyclic_remove_xcall, &arg);
 
 	return (1);
 }
@@ -1214,15 +1214,10 @@ cyclic_add_omni(cyc_omni_handler_t *omni
 
 	idp->cyi_omni_hdlr = *omni;
 
-	for (i = 0; i < MAXCPU; i++) {
-		if (pcpu_find(i) == NULL)
-			continue;
-
+	CPU_FOREACH(i) {
 		c = &solaris_cpu[i];
-
 		if ((cpu = c->cpu_cyclic) == NULL)
 			continue;
-
 		cyclic_omni_start(idp, cpu);
 	}
 
@@ -1325,12 +1320,8 @@ cyclic_mp_init(void)
 
 	mutex_enter(&cpu_lock);
 
-	for (i = 0; i <= mp_maxid; i++) {
-		if (pcpu_find(i) == NULL)
-			continue;
-
+	CPU_FOREACH(i) {
 		c = &solaris_cpu[i];
-
 		if (c->cpu_cyclic == NULL)
 			cyclic_configure(c);
 	}
@@ -1349,10 +1340,8 @@ cyclic_uninit(void)
 			continue;
 
 		c = &solaris_cpu[id];
-
 		if (c->cpu_cyclic == NULL)
 			continue;
-
 		cyclic_unconfigure(c);
 	}
 

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 17:12:39 2011
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 96120106564A;
	Fri, 11 Mar 2011 17:12:39 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 836C58FC13;
	Fri, 11 Mar 2011 17:12: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 p2BHCdrY087366;
	Fri, 11 Mar 2011 17:12:39 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BHCdXi087361;
	Fri, 11 Mar 2011 17:12:39 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111712.p2BHCdXi087361@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 17:12: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: r219510 - stable/7/sys/dev/acpica
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: Fri, 11 Mar 2011 17:12:39 -0000

Author: avg
Date: Fri Mar 11 17:12:39 2011
New Revision: 219510
URL: http://svn.freebsd.org/changeset/base/219510

Log:
  MFC r216503: small cleanup of acpi battery status setting and checking
  
  PR:		kern/124744

Modified:
  stable/7/sys/dev/acpica/acpi_battery.c
  stable/7/sys/dev/acpica/acpi_cmbat.c
  stable/7/sys/dev/acpica/acpi_smbat.c
  stable/7/sys/dev/acpica/acpiio.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/acpica/acpi_battery.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi_battery.c	Fri Mar 11 17:01:14 2011	(r219509)
+++ stable/7/sys/dev/acpica/acpi_battery.c	Fri Mar 11 17:12:39 2011	(r219510)
@@ -101,8 +101,9 @@ acpi_battery_get_info_expire(void)
 int
 acpi_battery_bst_valid(struct acpi_bst *bst)
 {
-    return (bst->state < ACPI_BATT_STAT_MAX && bst->cap != ACPI_BATT_UNKNOWN &&
-	bst->volt != ACPI_BATT_UNKNOWN);
+
+    return (bst->state != ACPI_BATT_STAT_NOT_PRESENT &&
+	bst->cap != ACPI_BATT_UNKNOWN && bst->volt != ACPI_BATT_UNKNOWN);
 }
 
 /* Check _BIF results for validity. */

Modified: stable/7/sys/dev/acpica/acpi_cmbat.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi_cmbat.c	Fri Mar 11 17:01:14 2011	(r219509)
+++ stable/7/sys/dev/acpica/acpi_cmbat.c	Fri Mar 11 17:12:39 2011	(r219510)
@@ -278,6 +278,12 @@ acpi_cmbat_get_bst(void *arg)
 	goto end;
     acpi_cmbat_info_updated(&sc->bst_lastupdated);
 
+    /* Clear out undefined/extended bits that might be set by hardware. */
+    sc->bst.state &= ACPI_BATT_STAT_BST_MASK;
+    if ((sc->bst.state & ACPI_BATT_STAT_INVALID) == ACPI_BATT_STAT_INVALID)
+	ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev),
+	    "battery reports simultaneous charging and discharging\n");
+
     /* XXX If all batteries are critical, perhaps we should suspend. */
     if (sc->bst.state & ACPI_BATT_STAT_CRITICAL) {
     	if ((sc->flags & ACPI_BATT_STAT_CRITICAL) == 0) {

Modified: stable/7/sys/dev/acpica/acpi_smbat.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi_smbat.c	Fri Mar 11 17:01:14 2011	(r219509)
+++ stable/7/sys/dev/acpica/acpi_smbat.c	Fri Mar 11 17:12:39 2011	(r219510)
@@ -389,6 +389,7 @@ acpi_smbat_get_bst(device_t dev, struct 
 
 	if (val > 0) {
 		sc->bst.rate = val * factor;
+		sc->bst.state &= ~SMBATT_BS_DISCHARGING;
 		sc->bst.state |= ACPI_BATT_STAT_CHARGING;
 	} else if (val < 0)
 		sc->bst.rate = (-val) * factor;

Modified: stable/7/sys/dev/acpica/acpiio.h
==============================================================================
--- stable/7/sys/dev/acpica/acpiio.h	Fri Mar 11 17:01:14 2011	(r219509)
+++ stable/7/sys/dev/acpica/acpiio.h	Fri Mar 11 17:12:39 2011	(r219510)
@@ -74,11 +74,22 @@ struct acpi_bst {
     uint32_t volt;			/* Present Voltage */
 };
 
+/*
+ * Note that the following definitions represent status bits for internal
+ * driver state.  The first three of them (charging, discharging and critical)
+ * conveninetly conform to ACPI specification of status returned by _BST
+ * method.  Other definitions (not present, etc) are synthetic.
+ * Also note that according to the specification the charging and discharging
+ * status bits must not be set at the same time.
+ */
 #define ACPI_BATT_STAT_DISCHARG		0x0001
 #define ACPI_BATT_STAT_CHARGING		0x0002
 #define ACPI_BATT_STAT_CRITICAL		0x0004
-#define ACPI_BATT_STAT_NOT_PRESENT	0x0007
-#define ACPI_BATT_STAT_MAX		0x0007
+#define ACPI_BATT_STAT_INVALID					\
+    (ACPI_BATT_STAT_DISCHARG | ACPI_BATT_STAT_CHARGING)
+#define ACPI_BATT_STAT_BST_MASK					\
+    (ACPI_BATT_STAT_INVALID | ACPI_BATT_STAT_CRITICAL)
+#define ACPI_BATT_STAT_NOT_PRESENT	ACPI_BATT_STAT_BST_MASK
 
 union acpi_battery_ioctl_arg {
     int			 unit;	/* Device unit or ACPI_BATTERY_ALL_UNITS. */

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 18:10:37 2011
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 A2498106566B;
	Fri, 11 Mar 2011 18:10:37 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FB918FC1E;
	Fri, 11 Mar 2011 18:10: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 p2BIAbu4088744;
	Fri, 11 Mar 2011 18:10:37 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BIAbJJ088742;
	Fri, 11 Mar 2011 18:10:37 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111810.p2BIAbJJ088742@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 18:10:37 +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: r219514 - stable/7/sys/dev/acpi_support
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: Fri, 11 Mar 2011 18:10:37 -0000

Author: avg
Date: Fri Mar 11 18:10:37 2011
New Revision: 219514
URL: http://svn.freebsd.org/changeset/base/219514

Log:
  MFC r216376: acpi_fujitsu: update for P8010
  
  PR:		kern/121102

Modified:
  stable/7/sys/dev/acpi_support/acpi_fujitsu.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/acpi_support/acpi_fujitsu.c
==============================================================================
--- stable/7/sys/dev/acpi_support/acpi_fujitsu.c	Fri Mar 11 18:07:49 2011	(r219513)
+++ stable/7/sys/dev/acpi_support/acpi_fujitsu.c	Fri Mar 11 18:10:37 2011	(r219514)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002 Sean Bullington 
- *               2003-2006 Anish Mistry 
+ *               2003-2008 Anish Mistry 
  *               2004 Mark Santcroos 
  * All Rights Reserved.
  *
@@ -84,6 +84,7 @@ ACPI_MODULE_NAME("Fujitsu")
 #define METHOD_RVOL	6
 #define METHOD_GSIF	7
 #define METHOD_GHKS	8
+#define METHOD_GBLS	9
 
 /* Notify event */
 #define	ACPI_NOTIFY_STATUS_CHANGED	0x80
@@ -108,6 +109,7 @@ struct acpi_fujitsu_softc {
 	/* Control methods */
 	struct int_nameval	_sta,	/* unused */
 				gbll,	/* brightness */
+				gbls,	/* get brightness state */
 				ghks,	/* hotkey selector */
 				gbuf,	/* unused (buffer?) */
 				gmou,	/* mouse */
@@ -189,6 +191,11 @@ static struct {
 		.description	= "Brightness level of the LCD panel"
 	},
 	{
+		.name		= "lcd_brightness",
+		.method		= METHOD_GBLS,
+		.description	= "Brightness level of the LCD panel"
+	},
+	{
 		.name		= "volume",
 		.method		= METHOD_GVOL,
 		.description	= "Speakers/headphones volume level"
@@ -358,6 +365,7 @@ acpi_fujitsu_init(struct acpi_fujitsu_so
 	/* Setup all of the names for each control method */
 	sc->_sta.name = "_STA";
 	sc->gbll.name = "GBLL";
+	sc->gbls.name = "GBLS";
 	sc->ghks.name = "GHKS";
 	sc->gmou.name = "GMOU";
 	sc->gsif.name = "GSIF";
@@ -386,6 +394,9 @@ acpi_fujitsu_init(struct acpi_fujitsu_so
 			case METHOD_GBLL:
 				exists = sc->gbll.exists;
 				break;
+			case METHOD_GBLS:
+				exists = sc->gbls.exists;
+				break;
 			case METHOD_GVOL:
 			case METHOD_MUTE:
 				exists = sc->gvol.exists;
@@ -462,6 +473,9 @@ acpi_fujitsu_method_get(struct acpi_fuji
 		case METHOD_GBLL:
 			nv = sc->gbll;
 			break;
+		case METHOD_GBLS:
+			nv = sc->gbls;
+			break;
 		case METHOD_GMOU:
 			nv = sc->gmou;
 			break;
@@ -519,6 +533,11 @@ acpi_fujitsu_method_set(struct acpi_fuji
 			control = "SBLL";
 			nv = sc->gbll;
 			break;
+		case METHOD_GBLS:
+			changed = BRIGHT_CHANGED;
+			control = "SBL2";
+			nv = sc->gbls;
+			break;
 		case METHOD_GMOU:
 			changed = MOUSE_CHANGED;
 			control = "SMOU";
@@ -587,6 +606,14 @@ acpi_fujitsu_check_hardware(struct acpi_
 	}
 
 	if (ACPI_FAILURE(acpi_GetInteger(sc->handle,
+		sc->gbls.name, &val))) {
+		sc->gbls.exists = 0;
+	} else {
+		sc->gbls.exists = 1;
+	}
+
+	// don't add if we can use the new method
+	if (sc->gbls.exists || ACPI_FAILURE(acpi_GetInteger(sc->handle,
 	    sc->gbll.name, &val))) {
 		sc->gbll.exists = 0;
 	} else {
@@ -683,6 +710,9 @@ acpi_fujitsu_update(struct acpi_fujitsu_
 			/* Clear the modification bit */
 			sc->gmou.value &= MOUSE_SETTING_BITS;
 			
+			/* Set the value in case it is not hardware controlled */
+                        acpi_fujitsu_method_set(sc, METHOD_GMOU, sc->gmou.value);
+
 			acpi_UserNotify("FUJITSU", sc->handle, FN_POINTER_ENABLE);
 	
 			ACPI_VPRINT(sc->dev, acpi_sc, "Internal pointer is now %s\n",
@@ -690,6 +720,29 @@ acpi_fujitsu_update(struct acpi_fujitsu_
 		}
 	}
 
+	/* Screen Brightness Level P8XXX */
+	if(sc->gbls.exists) {
+		if (ACPI_FAILURE(acpi_GetInteger(sc->handle,
+                sc->gbls.name, &(sc->gbls.value)))) {
+                        device_printf(sc->dev, "Couldn't query P8XXX brightness level\n");
+                        return (FALSE);
+                }
+		if (changed & BRIGHT_CHANGED) {
+			/* No state to record here. */
+
+			/* Clear the modification bit */
+			sc->gbls.value &= BRIGHTNESS_SETTING_BITS;
+
+			/* Set the value in case it is not hardware controlled */
+			acpi_fujitsu_method_set(sc, METHOD_GBLS, sc->gbls.value);
+
+			acpi_UserNotify("FUJITSU", sc->handle, FN_LCD_BRIGHTNESS);
+
+			ACPI_VPRINT(sc->dev, acpi_sc, "P8XXX Brightness level is now %d\n",
+			sc->gbls.value);
+                }
+	}
+
 	/* Screen Brightness Level */
 	if(sc->gbll.exists) {
 		if (ACPI_FAILURE(acpi_GetInteger(sc->handle,

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 18:21:17 2011
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 572E61065673;
	Fri, 11 Mar 2011 18:21:17 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 457D58FC1C;
	Fri, 11 Mar 2011 18:21: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 p2BILHgP089054;
	Fri, 11 Mar 2011 18:21:17 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BILHJv089052;
	Fri, 11 Mar 2011 18:21:17 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111821.p2BILHJv089052@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 18:21:17 +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: r219516 - stable/7/sys/dev/drm
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: Fri, 11 Mar 2011 18:21:17 -0000

Author: avg
Date: Fri Mar 11 18:21:16 2011
New Revision: 219516
URL: http://svn.freebsd.org/changeset/base/219516

Log:
  MFC r216374: fix atomic_set_xxx misuse in drm

Modified:
  stable/7/sys/dev/drm/drm_irq.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/drm/drm_irq.c
==============================================================================
--- stable/7/sys/dev/drm/drm_irq.c	Fri Mar 11 18:15:30 2011	(r219515)
+++ stable/7/sys/dev/drm/drm_irq.c	Fri Mar 11 18:21:16 2011	(r219516)
@@ -140,7 +140,7 @@ int drm_vblank_init(struct drm_device *d
 	for (i = 0; i < num_crtcs; i++) {
 		DRM_INIT_WAITQUEUE(&dev->vblank[i].queue);
 		dev->vblank[i].refcount = 0;
-		atomic_set_rel_32(&dev->vblank[i].count, 0);
+		atomic_store_rel_32(&dev->vblank[i].count, 0);
 	}
 	dev->vblank_disable_allowed = 0;
 	DRM_SPINUNLOCK(&dev->vbl_lock);

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 18:42:17 2011
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 788A41065670;
	Fri, 11 Mar 2011 18:42:17 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6666D8FC1A;
	Fri, 11 Mar 2011 18:42: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 p2BIgHO4089679;
	Fri, 11 Mar 2011 18:42:17 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BIgHgt089677;
	Fri, 11 Mar 2011 18:42:17 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111842.p2BIgHgt089677@svn.freebsd.org>
From: Andriy Gapon 
Date: Fri, 11 Mar 2011 18:42:17 +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: r219518 - stable/7/sys/cddl/dev/cyclic/i386
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: Fri, 11 Mar 2011 18:42:17 -0000

Author: avg
Date: Fri Mar 11 18:42:17 2011
New Revision: 219518
URL: http://svn.freebsd.org/changeset/base/219518

Log:
  MFC r216505: cyclic xcall: use smp_no_rendevous_barrier as setup
  function parameter

Modified:
  stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
==============================================================================
--- stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Fri Mar 11 18:28:20 2011	(r219517)
+++ stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Fri Mar 11 18:42:17 2011	(r219518)
@@ -122,6 +122,6 @@ static void reprogram(cyb_arg_t arg, hrt
 static void xcall(cyb_arg_t arg, cpu_t *c, cyc_func_t func, void *param)
 {
 
-	smp_rendezvous_cpus((cpumask_t) (1 << c->cpuid), NULL,
-	    func, smp_no_rendevous_barrier, param);
+	smp_rendezvous_cpus((cpumask_t) (1 << c->cpuid),
+	    smp_no_rendevous_barrier, func, smp_no_rendevous_barrier, param);
 }

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 22:09:13 2011
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 CB2F0106566B;
	Fri, 11 Mar 2011 22:09:13 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B71C48FC0A;
	Fri, 11 Mar 2011 22:09:13 +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 p2BM9Dbl095309;
	Fri, 11 Mar 2011 22:09:13 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BM9Dri095262;
	Fri, 11 Mar 2011 22:09:13 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201103112209.p2BM9Dri095262@svn.freebsd.org>
From: Ulrich Spoerlein 
Date: Fri, 11 Mar 2011 22:09:13 +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: r219540 - in stable/7: lib/libelf usr.sbin/ntp/doc
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: Fri, 11 Mar 2011 22:09:13 -0000

Author: uqs
Date: Fri Mar 11 22:09:13 2011
New Revision: 219540
URL: http://svn.freebsd.org/changeset/base/219540

Log:
  MFH r206622,210933,219210: Typo fixes, prologue ordering.

Modified:
  stable/7/lib/libelf/elf.3
  stable/7/lib/libelf/elf_begin.3
  stable/7/lib/libelf/elf_cntl.3
  stable/7/lib/libelf/elf_end.3
  stable/7/lib/libelf/elf_errmsg.3
  stable/7/lib/libelf/elf_fill.3
  stable/7/lib/libelf/elf_flagdata.3
  stable/7/lib/libelf/elf_getarhdr.3
  stable/7/lib/libelf/elf_getarsym.3
  stable/7/lib/libelf/elf_getbase.3
  stable/7/lib/libelf/elf_getdata.3
  stable/7/lib/libelf/elf_getident.3
  stable/7/lib/libelf/elf_getphnum.3
  stable/7/lib/libelf/elf_getscn.3
  stable/7/lib/libelf/elf_getshnum.3
  stable/7/lib/libelf/elf_getshstrndx.3
  stable/7/lib/libelf/elf_hash.3
  stable/7/lib/libelf/elf_kind.3
  stable/7/lib/libelf/elf_memory.3
  stable/7/lib/libelf/elf_next.3
  stable/7/lib/libelf/elf_rand.3
  stable/7/lib/libelf/elf_rawfile.3
  stable/7/lib/libelf/elf_strptr.3
  stable/7/lib/libelf/elf_update.3
  stable/7/lib/libelf/elf_version.3
  stable/7/lib/libelf/gelf.3
  stable/7/lib/libelf/gelf_checksum.3
  stable/7/lib/libelf/gelf_fsize.3
  stable/7/lib/libelf/gelf_getcap.3
  stable/7/lib/libelf/gelf_getclass.3
  stable/7/lib/libelf/gelf_getdyn.3
  stable/7/lib/libelf/gelf_getehdr.3
  stable/7/lib/libelf/gelf_getmove.3
  stable/7/lib/libelf/gelf_getphdr.3
  stable/7/lib/libelf/gelf_getrel.3
  stable/7/lib/libelf/gelf_getrela.3
  stable/7/lib/libelf/gelf_getshdr.3
  stable/7/lib/libelf/gelf_getsym.3
  stable/7/lib/libelf/gelf_getsyminfo.3
  stable/7/lib/libelf/gelf_getsymshndx.3
  stable/7/lib/libelf/gelf_newehdr.3
  stable/7/lib/libelf/gelf_newphdr.3
  stable/7/lib/libelf/gelf_update_ehdr.3
  stable/7/lib/libelf/gelf_xlatetof.3
  stable/7/usr.sbin/ntp/doc/ntp.conf.5
  stable/7/usr.sbin/ntp/doc/ntpq.8
Directory Properties:
  stable/7/lib/libelf/   (props changed)
  stable/7/usr.sbin/ntp/   (props changed)

Modified: stable/7/lib/libelf/elf.3
==============================================================================
--- stable/7/lib/libelf/elf.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd December 11, 2006
-.Os
 .Dt ELF 3
+.Os
 .Sh NAME
 .Nm elf
 .Nd API for manipulating ELF objects

Modified: stable/7/lib/libelf/elf_begin.3
==============================================================================
--- stable/7/lib/libelf/elf_begin.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_begin.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 20, 2010
-.Os
 .Dt ELF_BEGIN 3
+.Os
 .Sh NAME
 .Nm elf_begin
 .Nd open an ELF file or ar(1) archive

Modified: stable/7/lib/libelf/elf_cntl.3
==============================================================================
--- stable/7/lib/libelf/elf_cntl.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_cntl.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 9, 2006
-.Os
 .Dt ELF_CNTL 3
+.Os
 .Sh NAME
 .Nm elf_cntl
 .Nd control an elf file descriptor
@@ -75,7 +75,7 @@ archive, an ELF file, or other data file
 .Sh IMPLEMENTATION NOTES
 Due to use of
 .Xr mmap 2
-internally, this function is a no-op for for ELF objects opened in
+internally, this function is a no-op for ELF objects opened in
 .Dv ELF_C_READ
 mode.
 .Sh RETURN VALUES

Modified: stable/7/lib/libelf/elf_end.3
==============================================================================
--- stable/7/lib/libelf/elf_end.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_end.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 29, 2006
-.Os
 .Dt ELF_END 3
+.Os
 .Sh NAME
 .Nm elf_end
 .Nd release an ELF descriptor

Modified: stable/7/lib/libelf/elf_errmsg.3
==============================================================================
--- stable/7/lib/libelf/elf_errmsg.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_errmsg.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 11, 2006
-.Os
 .Dt ELF_ERRMSG 3
+.Os
 .Sh NAME
 .Nm elf_errmsg ,
 .Nm elf_errno

Modified: stable/7/lib/libelf/elf_fill.3
==============================================================================
--- stable/7/lib/libelf/elf_fill.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_fill.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 11, 2006
-.Os
 .Dt ELF_FILL 3
+.Os
 .Sh NAME
 .Nm elf_fill
 .Nd set fill byte for inter-section padding

Modified: stable/7/lib/libelf/elf_flagdata.3
==============================================================================
--- stable/7/lib/libelf/elf_flagdata.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_flagdata.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 10, 2006
-.Os
 .Dt ELF_FLAGDATA 3
+.Os
 .Sh NAME
 .Nm elf_flagdata ,
 .Nm elf_flagehdr ,

Modified: stable/7/lib/libelf/elf_getarhdr.3
==============================================================================
--- stable/7/lib/libelf/elf_getarhdr.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getarhdr.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 15, 2006
-.Os
 .Dt ELF_GETARHDR 3
+.Os
 .Sh NAME
 .Nm elf_getarhdr
 .Nd retrieve ar(1) header for an archive member

Modified: stable/7/lib/libelf/elf_getarsym.3
==============================================================================
--- stable/7/lib/libelf/elf_getarsym.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getarsym.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 15, 2006
-.Os
 .Dt ELF_GETARSYM 3
+.Os
 .Sh NAME
 .Nm elf_getarsym
 .Nd retrieve the symbol table of an archive

Modified: stable/7/lib/libelf/elf_getbase.3
==============================================================================
--- stable/7/lib/libelf/elf_getbase.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getbase.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 6, 2010
-.Os
 .Dt ELF_GETBASE 3
+.Os
 .Sh NAME
 .Nm elf_getbase
 .Nd get the base offset for an object file

Modified: stable/7/lib/libelf/elf_getdata.3
==============================================================================
--- stable/7/lib/libelf/elf_getdata.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getdata.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd April 30, 2010
-.Os
 .Dt ELF_GETDATA 3
+.Os
 .Sh NAME
 .Nm elf_getdata ,
 .Nm elf_newdata ,

Modified: stable/7/lib/libelf/elf_getident.3
==============================================================================
--- stable/7/lib/libelf/elf_getident.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getident.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd July 3, 2006
-.Os
 .Dt ELF_GETIDENT 3
+.Os
 .Sh NAME
 .Nm elf_getident
 .Nd return the initial bytes of a file

Modified: stable/7/lib/libelf/elf_getphnum.3
==============================================================================
--- stable/7/lib/libelf/elf_getphnum.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getphnum.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 5, 2009
-.Os
 .Dt ELF_GETPHNUM 3
+.Os
 .Sh NAME
 .Nm elf_getphnum
 .Nd return the number of program headers in an ELF file

Modified: stable/7/lib/libelf/elf_getscn.3
==============================================================================
--- stable/7/lib/libelf/elf_getscn.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getscn.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 26, 2006
-.Os
 .Dt ELF_GETSCN 3
+.Os
 .Sh NAME
 .Nm elf_getscn ,
 .Nm elf_ndxscn ,

Modified: stable/7/lib/libelf/elf_getshnum.3
==============================================================================
--- stable/7/lib/libelf/elf_getshnum.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getshnum.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 5, 2009
-.Os
 .Dt ELF_GETSHNUM 3
+.Os
 .Sh NAME
 .Nm elf_getshnum
 .Nd return the number of sections in an ELF file

Modified: stable/7/lib/libelf/elf_getshstrndx.3
==============================================================================
--- stable/7/lib/libelf/elf_getshstrndx.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_getshstrndx.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 5, 2009
-.Os
 .Dt ELF_GETSHSTRNDX 3
+.Os
 .Sh NAME
 .Nm elf_getshstrndx ,
 .Nm elf_setshstrndx

Modified: stable/7/lib/libelf/elf_hash.3
==============================================================================
--- stable/7/lib/libelf/elf_hash.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_hash.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 15, 2006
-.Os
 .Dt ELF_HASH 3
+.Os
 .Sh NAME
 .Nm elf_hash
 .Nd compute a hash value for a string

Modified: stable/7/lib/libelf/elf_kind.3
==============================================================================
--- stable/7/lib/libelf/elf_kind.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_kind.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 1, 2006
-.Os
 .Dt ELF_KIND 3
+.Os
 .Sh NAME
 .Nm elf_kind
 .Nd determine ELF file type

Modified: stable/7/lib/libelf/elf_memory.3
==============================================================================
--- stable/7/lib/libelf/elf_memory.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_memory.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 28, 2006
-.Os
 .Dt ELF_MEMORY 3
+.Os
 .Sh NAME
 .Nm elf_memory
 .Nd process an ELF or ar(1) archive mapped into memory

Modified: stable/7/lib/libelf/elf_next.3
==============================================================================
--- stable/7/lib/libelf/elf_next.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_next.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 17, 2006
-.Os
 .Dt ELF_NEXT 3
+.Os
 .Sh NAME
 .Nm elf_next
 .Nd provide sequential access to the next archive member

Modified: stable/7/lib/libelf/elf_rand.3
==============================================================================
--- stable/7/lib/libelf/elf_rand.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_rand.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 17, 2006
-.Os
 .Dt ELF_RAND 3
+.Os
 .Sh NAME
 .Nm elf_rand
 .Nd provide sequential access to the next archive member

Modified: stable/7/lib/libelf/elf_rawfile.3
==============================================================================
--- stable/7/lib/libelf/elf_rawfile.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_rawfile.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd July 3, 2006
-.Os
 .Dt ELF_RAWFILE 3
+.Os
 .Sh NAME
 .Nm elf_rawfile
 .Nd return uninterpreted contents of an ELF file

Modified: stable/7/lib/libelf/elf_strptr.3
==============================================================================
--- stable/7/lib/libelf/elf_strptr.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_strptr.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd December 16, 2006
-.Os
 .Dt ELF_STRPTR 3
+.Os
 .Sh NAME
 .Nm elf_strptr
 .Nd retrieve a string pointer in a string table

Modified: stable/7/lib/libelf/elf_update.3
==============================================================================
--- stable/7/lib/libelf/elf_update.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_update.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd September 08, 2007
-.Os
 .Dt ELF_UPDATE 3
+.Os
 .Sh NAME
 .Nm elf_update
 .Nd update an ELF descriptor

Modified: stable/7/lib/libelf/elf_version.3
==============================================================================
--- stable/7/lib/libelf/elf_version.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/elf_version.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd June 1, 2006
-.Os
 .Dt ELF_VERSION 3
+.Os
 .Sh NAME
 .Nm elf_version
 .Nd retrieve or set ELF library operating version

Modified: stable/7/lib/libelf/gelf.3
==============================================================================
--- stable/7/lib/libelf/gelf.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd September 1, 2006
-.Os
 .Dt GELF 3
+.Os
 .Sh NAME
 .Nm GElf
 .Nd class-independent API for ELF manipulation

Modified: stable/7/lib/libelf/gelf_checksum.3
==============================================================================
--- stable/7/lib/libelf/gelf_checksum.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_checksum.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 29, 2006
-.Os
 .Dt GELF_CHECKSUM 3
+.Os
 .Sh NAME
 .Nm elf32_checksum ,
 .Nm elf64_checksum ,

Modified: stable/7/lib/libelf/gelf_fsize.3
==============================================================================
--- stable/7/lib/libelf/gelf_fsize.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_fsize.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd February 5, 2008
-.Os
 .Dt GELF_FSIZE 3
+.Os
 .Sh NAME
 .Nm gelf_fsize ,
 .Nm elf32_fsize ,

Modified: stable/7/lib/libelf/gelf_getcap.3
==============================================================================
--- stable/7/lib/libelf/gelf_getcap.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getcap.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 29, 2006
-.Os
 .Dt GELF_GETCAP 3
+.Os
 .Sh NAME
 .Nm gelf_getcap ,
 .Nm gelf_update_cap

Modified: stable/7/lib/libelf/gelf_getclass.3
==============================================================================
--- stable/7/lib/libelf/gelf_getclass.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getclass.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd July 3, 2006
-.Os
 .Dt GELF_GETCLASS 3
+.Os
 .Sh NAME
 .Nm gelf_getclass
 .Nd retrieve the class of an ELF descriptor

Modified: stable/7/lib/libelf/gelf_getdyn.3
==============================================================================
--- stable/7/lib/libelf/gelf_getdyn.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getdyn.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 29, 2006
-.Os
 .Dt GELF_GETDYN 3
+.Os
 .Sh NAME
 .Nm gelf_getdyn ,
 .Nm gelf_update_dyn

Modified: stable/7/lib/libelf/gelf_getehdr.3
==============================================================================
--- stable/7/lib/libelf/gelf_getehdr.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getehdr.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd December 16, 2006
-.Os
 .Dt GELF_GETEHDR 3
+.Os
 .Sh NAME
 .Nm elf32_getehdr ,
 .Nm elf64_getehdr ,

Modified: stable/7/lib/libelf/gelf_getmove.3
==============================================================================
--- stable/7/lib/libelf/gelf_getmove.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getmove.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 29, 2006
-.Os
 .Dt GELF_GETMOVE 3
+.Os
 .Sh NAME
 .Nm gelf_getmove ,
 .Nm gelf_update_move

Modified: stable/7/lib/libelf/gelf_getphdr.3
==============================================================================
--- stable/7/lib/libelf/gelf_getphdr.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getphdr.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd December 16, 2006
-.Os
 .Dt GELF_GETPHDR 3
+.Os
 .Sh NAME
 .Nm elf32_getphdr ,
 .Nm elf64_getphdr ,

Modified: stable/7/lib/libelf/gelf_getrel.3
==============================================================================
--- stable/7/lib/libelf/gelf_getrel.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getrel.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 29, 2006
-.Os
 .Dt GELF_GETREL 3
+.Os
 .Sh NAME
 .Nm gelf_getrel ,
 .Nm gelf_update_rel

Modified: stable/7/lib/libelf/gelf_getrela.3
==============================================================================
--- stable/7/lib/libelf/gelf_getrela.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getrela.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 29, 2006
-.Os
 .Dt GELF_GETRELA 3
+.Os
 .Sh NAME
 .Nm gelf_getrela ,
 .Nm gelf_update_rela

Modified: stable/7/lib/libelf/gelf_getshdr.3
==============================================================================
--- stable/7/lib/libelf/gelf_getshdr.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getshdr.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 27, 2006
-.Os
 .Dt GELF_GETSHDR 3
+.Os
 .Sh NAME
 .Nm elf32_getshdr ,
 .Nm elf64_getshdr ,

Modified: stable/7/lib/libelf/gelf_getsym.3
==============================================================================
--- stable/7/lib/libelf/gelf_getsym.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getsym.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 29, 2006
-.Os
 .Dt GELF_GETSYM 3
+.Os
 .Sh NAME
 .Nm gelf_getsym ,
 .Nm gelf_update_sym

Modified: stable/7/lib/libelf/gelf_getsyminfo.3
==============================================================================
--- stable/7/lib/libelf/gelf_getsyminfo.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getsyminfo.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 29, 2006
-.Os
 .Dt GELF_GETSYMINFO 3
+.Os
 .Sh NAME
 .Nm gelf_getsyminfo ,
 .Nm gelf_update_syminfo

Modified: stable/7/lib/libelf/gelf_getsymshndx.3
==============================================================================
--- stable/7/lib/libelf/gelf_getsymshndx.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_getsymshndx.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd November 5, 2006
-.Os
 .Dt GELF_GETSYMSHNDX 3
+.Os
 .Sh NAME
 .Nm gelf_getsymshndx ,
 .Nm gelf_update_symshndx

Modified: stable/7/lib/libelf/gelf_newehdr.3
==============================================================================
--- stable/7/lib/libelf/gelf_newehdr.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_newehdr.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd December 16, 2006
-.Os
 .Dt GELF_NEWEHDR 3
+.Os
 .Sh NAME
 .Nm elf32_newehdr ,
 .Nm elf64_newehdr ,

Modified: stable/7/lib/libelf/gelf_newphdr.3
==============================================================================
--- stable/7/lib/libelf/gelf_newphdr.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_newphdr.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 25, 2006
-.Os
 .Dt GELF_NEWPHDR 3
+.Os
 .Sh NAME
 .Nm elf32_newphdr ,
 .Nm elf64_newphdr ,

Modified: stable/7/lib/libelf/gelf_update_ehdr.3
==============================================================================
--- stable/7/lib/libelf/gelf_update_ehdr.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_update_ehdr.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd August 27, 2006
-.Os
 .Dt GELF_UPDATE_EHDR 3
+.Os
 .Sh NAME
 .Nm gelf_update_ehdr ,
 .Nm gelf_update_phdr ,

Modified: stable/7/lib/libelf/gelf_xlatetof.3
==============================================================================
--- stable/7/lib/libelf/gelf_xlatetof.3	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/lib/libelf/gelf_xlatetof.3	Fri Mar 11 22:09:13 2011	(r219540)
@@ -24,8 +24,8 @@
 .\" $FreeBSD$
 .\"
 .Dd July 24, 2006
-.Os
 .Dt GELF_XLATETOF 3
+.Os
 .Sh NAME
 .Nm elf32_xlate ,
 .Nm elf64_xlate ,

Modified: stable/7/usr.sbin/ntp/doc/ntp.conf.5
==============================================================================
--- stable/7/usr.sbin/ntp/doc/ntp.conf.5	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/usr.sbin/ntp/doc/ntp.conf.5	Fri Mar 11 22:09:13 2011	(r219540)
@@ -317,7 +317,7 @@ the
 option to a lower limit of 4 (16 s).
 .It Cm noselect
 Marks the server as unused, except for display purposes.
-The server is discarded by the selection algroithm.
+The server is discarded by the selection algorithm.
 .It Cm prefer
 Marks the server as preferred.
 All other things being equal,
@@ -1368,7 +1368,7 @@ The
 daemon implements a general purpose address/mask based restriction
 list.
 The list contains address/match entries sorted first
-by increasing address values and and then by increasing mask values.
+by increasing address values and then by increasing mask values.
 A match occurs when the bitwise AND of the mask and the packet
 source address is equal to the bitwise AND of the mask and
 address in the list.
@@ -1405,9 +1405,9 @@ at abusive rates.
 Some violations cause denied service
 only for the offending packet, others cause denied service
 for a timed period and others cause the denied service for
-an indefinate period.
+an indefinite period.
 When a client or network is denied access
-for an indefinate period, the only way at present to remove
+for an indefinite period, the only way at present to remove
 the restrictions is by restarting the server.
 .Ss The Kiss-of-Death Packet
 Ordinarily, packets denied service are simply dropped with no

Modified: stable/7/usr.sbin/ntp/doc/ntpq.8
==============================================================================
--- stable/7/usr.sbin/ntp/doc/ntpq.8	Fri Mar 11 22:07:28 2011	(r219539)
+++ stable/7/usr.sbin/ntp/doc/ntpq.8	Fri Mar 11 22:09:13 2011	(r219540)
@@ -269,7 +269,7 @@ Exit
 .It Ic raw
 Causes all output from query commands is printed as received
 from the remote server.
-The only formating/interpretation done on
+The only formatting/interpretation done on
 the data is to transform nonascii data into a printable (but barely
 understandable) form.
 .It Ic timeout Ar milliseconds

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 11 23:16:04 2011
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 B5CA21065673;
	Fri, 11 Mar 2011 23:16:04 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A360C8FC0C;
	Fri, 11 Mar 2011 23:16:04 +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 p2BNG4mY097458;
	Fri, 11 Mar 2011 23:16:04 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BNG4YM097455;
	Fri, 11 Mar 2011 23:16:04 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201103112316.p2BNG4YM097455@svn.freebsd.org>
From: Doug Barton 
Date: Fri, 11 Mar 2011 23:16:04 +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: r219551 - stable/7/share/examples/cvsup
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: Fri, 11 Mar 2011 23:16:04 -0000

Author: dougb
Date: Fri Mar 11 23:16:04 2011
New Revision: 219551
URL: http://svn.freebsd.org/changeset/base/219551

Log:
  MFC r219353:
  
  mbone is no longer a physical category
  
  Submitted by:	pav

Modified:
  stable/7/share/examples/cvsup/cvs-supfile
  stable/7/share/examples/cvsup/ports-supfile
Directory Properties:
  stable/7/share/examples/   (props changed)

Modified: stable/7/share/examples/cvsup/cvs-supfile
==============================================================================
--- stable/7/share/examples/cvsup/cvs-supfile	Fri Mar 11 23:13:22 2011	(r219550)
+++ stable/7/share/examples/cvsup/cvs-supfile	Fri Mar 11 23:16:04 2011	(r219551)
@@ -140,7 +140,6 @@ ports-all
 #ports-lang
 #ports-mail
 #ports-math
-#ports-mbone
 #ports-misc
 #ports-multimedia
 #ports-net

Modified: stable/7/share/examples/cvsup/ports-supfile
==============================================================================
--- stable/7/share/examples/cvsup/ports-supfile	Fri Mar 11 23:13:22 2011	(r219550)
+++ stable/7/share/examples/cvsup/ports-supfile	Fri Mar 11 23:16:04 2011	(r219551)
@@ -104,7 +104,6 @@ ports-all
 #ports-lang
 #ports-mail
 #ports-math
-#ports-mbone
 #ports-misc
 #ports-multimedia
 #ports-net