From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 00:42:59 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E0F9106566B for ; Sun, 19 Dec 2010 00:42:59 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx23.fluidhosting.com [204.14.89.6]) by mx1.freebsd.org (Postfix) with ESMTP id ECB3F8FC16 for ; Sun, 19 Dec 2010 00:42:58 +0000 (UTC) Received: (qmail 17955 invoked by uid 399); 19 Dec 2010 00:16:18 -0000 Received: from localhost (HELO doug-optiplex.ka9q.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 19 Dec 2010 00:16:18 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4D0D4ED0.2050903@FreeBSD.org> Date: Sat, 18 Dec 2010 16:16:16 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20101210 Thunderbird/3.1.7 MIME-Version: 1.0 To: Alexander Leidinger References: <201008191324.o7JDOEtY005222@svn.freebsd.org> In-Reply-To: <201008191324.o7JDOEtY005222@svn.freebsd.org> X-Enigmail-Version: 1.1.2 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r211506 - stable/8/etc/periodic/daily X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 00:42:59 -0000 This should not have been done. It added a bunch of extraneous mergeinfo in the RELENG_8 etc branch. This change was important, but not so important that it didn't warrant asking for help to get the merge right. Doug On 08/19/2010 06:24, Alexander Leidinger wrote: > Author: netchild > Date: Thu Aug 19 13:24:13 2010 > New Revision: 211506 > URL: http://svn.freebsd.org/changeset/base/211506 > > Log: > sort of MFC: r211495 was supposed to add this script from HEAD, and while > the merge seems to have been successful, the script does not show up > in releng-8. This is a "svn copy head/.../800.zfs-scrub ." as retrying > the svn merge does not result in the file showing up. This may not be > the best way to fix the problem in svn, but it is the only way I'm aware of > to fix the stable branch (which is IMO more important than to use a potential > best way I'm not aware of). > > Relevant commit log for this file (r209195): > Add a periodic zfs scrub script. > > Features: > - configurable amount of days between scrubs (default value or per pool) > - do not scrub directly after pool creation (respects the configured > number of days between scrubs) > - do not scrub if a scrub is in progress > - tells how to see the status of the scrub > - tells how many days since the last scrub if it skips the scrubbing > - warns if a non-existent pool is specified explicitely > (default: no pools specified -> all currently imported pools are > handled) > - runs late in the periodic run to not slow down the other periodic daily > scripts > > Added: > - copied unchanged from r211505, head/etc/periodic/daily/800.scrub-zfs > Directory Properties: > stable/8/etc/periodic/daily/800.scrub-zfs (props changed) > > Copied: stable/8/etc/periodic/daily/800.scrub-zfs (from r211505, head/etc/periodic/daily/800.scrub-zfs) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ stable/8/etc/periodic/daily/800.scrub-zfs Thu Aug 19 13:24:13 2010 (r211506, copy of r211505, head/etc/periodic/daily/800.scrub-zfs) > @@ -0,0 +1,86 @@ > +#!/bin/sh > +# > +# $FreeBSD$ > +# > + > +# If there is a global system configuration file, suck it in. > +# > +if [ -r /etc/defaults/periodic.conf ] > +then > + . /etc/defaults/periodic.conf > + source_periodic_confs > +fi > + > +: ${daily_scrub_zfs_default_threshold=30} > + > +case "$daily_scrub_zfs_enable" in > + [Yy][Ee][Ss]) > + echo > + echo 'Scrubbing of zfs pools:' > + > + if [ -z "${daily_scrub_zfs_pools}" ]; then > + daily_scrub_zfs_pools="$(zpool list -H -o name)" > + fi > + > + for pool in ${daily_scrub_zfs_pools}; do > + # sanity check > + zpool list ${pool}>/dev/null 2>&1 > + if [ $? -ne 0 ]; then > + echo " WARNING: pool '${pool}' specified in" > + echo " '/etc/periodic.conf:daily_scrub_zfs_pools'" > + echo " does not exist" > + continue > + fi > + > + # successful only if there is at least one pool to scrub > + rc=0 > + > + # determine how many days shall be between scrubs > + eval _pool_threshold=\${daily_scrub_zfs_${pool}_threshold} > + if [ -z "${_pool_threshold}" ];then > + _pool_threshold=${daily_scrub_zfs_default_threshold} > + fi > + > + _last_scrub=$(zpool history ${pool} | \ > + egrep "^[0-9\.\:\-]{19} zpool scrub ${pool}\$" | tail -1 |\ > + cut -d ' ' -f 1) > + if [ -z "${_last_scrub}" ]; then > + # creation time of the pool if no scrub was done > + _last_scrub=$(zpool history ${pool} | \ > + sed -ne '2s/ .*$//p') > + fi > + > + # Now minus last scrub (both in seconds) converted to days. > + _scrub_diff=$(expr -e \( $(date +%s) - \ > + $(date -j -f %F.%T ${_last_scrub} +%s) \) / 60 / 60 / 24) > + if [ ${_scrub_diff} -le ${_pool_threshold} ]; then > + echo " skipping scrubbing of pool '${pool}':" > + echo " last scrubbing is ${_scrub_diff} days ago, threshold is set to ${_pool_threshold} days" > + continue > + fi > + > + _status="$(zpool status ${pool} | grep scrub:)" > + case "${_status}" in > + *"scrub in progress"*) > + echo " scrubbing of pool '${pool}' already in progress, skipping:" > + ;; > + *"none requested"*) > + echo " starting first scrubbing (after reboot) of pool '${pool}':" > + zpool scrub ${pool} > + ;; > + *) > + echo " starting scrubbing of pool '${pool}':" > + zpool scrub ${pool} > + ;; > + esac > + > + echo " consult 'zpool status ${pool}' for the result" > + done > + ;; > + > + *) > + rc=0 > + ;; > +esac > + > +exit $rc > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 06:07:36 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20E7D106564A; Sun, 19 Dec 2010 06:07:36 +0000 (UTC) (envelope-from mlaier@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0ED858FC1A; Sun, 19 Dec 2010 06:07:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBJ67Z1Y061029; Sun, 19 Dec 2010 06:07:35 GMT (envelope-from mlaier@svn.freebsd.org) Received: (from mlaier@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBJ67Zqb061026; Sun, 19 Dec 2010 06:07:35 GMT (envelope-from mlaier@svn.freebsd.org) Message-Id: <201012190607.oBJ67Zqb061026@svn.freebsd.org> From: Max Laier Date: Sun, 19 Dec 2010 06:07:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216553 - stable/8/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 06:07:36 -0000 Author: mlaier Date: Sun Dec 19 06:07:35 2010 New Revision: 216553 URL: http://svn.freebsd.org/changeset/base/216553 Log: MFC r216335: Fix a long standing (from the original 4.4BSD lite sources) race between vmspace_fork and vm_map_wire that would lead to "vm_fault_copy_wired: page missing" panics. While faulting in pages for a map entry that is being wired down, mark the containing map as busy. In vmspace_fork wait until the map is unbusy, before we try to copy the entries. Sponsored by: Isilon Systems, Inc. Approved by: re (kib) Modified: stable/8/sys/vm/vm_map.c stable/8/sys/vm/vm_map.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/vm/vm_map.c ============================================================================== --- stable/8/sys/vm/vm_map.c Sun Dec 19 00:00:29 2010 (r216552) +++ stable/8/sys/vm/vm_map.c Sun Dec 19 06:07:35 2010 (r216553) @@ -678,6 +678,41 @@ vm_map_wakeup(vm_map_t map) wakeup(&map->root); } +void +vm_map_busy(vm_map_t map) +{ + + VM_MAP_ASSERT_LOCKED(map); + map->busy++; +} + +void +vm_map_unbusy(vm_map_t map) +{ + + VM_MAP_ASSERT_LOCKED(map); + KASSERT(map->busy, ("vm_map_unbusy: not busy")); + if (--map->busy == 0 && (map->flags & MAP_BUSY_WAKEUP)) { + vm_map_modflags(map, 0, MAP_BUSY_WAKEUP); + wakeup(&map->busy); + } +} + +void +vm_map_wait_busy(vm_map_t map) +{ + + VM_MAP_ASSERT_LOCKED(map); + while (map->busy) { + vm_map_modflags(map, MAP_BUSY_WAKEUP, 0); + if (map->system_map) + msleep(&map->busy, &map->system_mtx, 0, "mbusy", 0); + else + sx_sleep(&map->busy, &map->lock, 0, "mbusy", 0); + } + map->timestamp++; +} + long vmspace_resident_count(struct vmspace *vmspace) { @@ -726,6 +761,7 @@ _vm_map_init(vm_map_t map, vm_offset_t m map->flags = 0; map->root = NULL; map->timestamp = 0; + map->busy = 0; } void @@ -2398,12 +2434,14 @@ vm_map_wire(vm_map_t map, vm_offset_t st entry->object.vm_object->type == OBJT_SG); /* * Release the map lock, relying on the in-transition - * mark. + * mark. Mark the map busy for fork. */ + vm_map_busy(map); vm_map_unlock(map); rv = vm_fault_wire(map, saved_start, saved_end, user_wire, fictitious); vm_map_lock(map); + vm_map_unbusy(map); if (last_timestamp + 1 != map->timestamp) { /* * Look again for the entry because the map was @@ -3011,6 +3049,8 @@ vmspace_fork(struct vmspace *vm1, vm_oof int locked; vm_map_lock(old_map); + if (old_map->busy) + vm_map_wait_busy(old_map); vm2 = vmspace_alloc(old_map->min_offset, old_map->max_offset); if (vm2 == NULL) goto unlock_and_return; Modified: stable/8/sys/vm/vm_map.h ============================================================================== --- stable/8/sys/vm/vm_map.h Sun Dec 19 00:00:29 2010 (r216552) +++ stable/8/sys/vm/vm_map.h Sun Dec 19 06:07:35 2010 (r216553) @@ -187,12 +187,14 @@ struct vm_map { pmap_t pmap; /* (c) Physical map */ #define min_offset header.start /* (c) */ #define max_offset header.end /* (c) */ + int busy; }; /* * vm_flags_t values */ #define MAP_WIREFUTURE 0x01 /* wire all future pages */ +#define MAP_BUSY_WAKEUP 0x02 #ifdef _KERNEL static __inline vm_offset_t @@ -275,6 +277,9 @@ int _vm_map_lock_upgrade(vm_map_t map, c void _vm_map_lock_downgrade(vm_map_t map, const char *file, int line); int vm_map_locked(vm_map_t map); void vm_map_wakeup(vm_map_t map); +void vm_map_busy(vm_map_t map); +void vm_map_unbusy(vm_map_t map); +void vm_map_wait_busy(vm_map_t map); #define vm_map_lock(map) _vm_map_lock(map, LOCK_FILE, LOCK_LINE) #define vm_map_unlock(map) _vm_map_unlock(map, LOCK_FILE, LOCK_LINE) From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 06:09:02 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0F5B106564A; Sun, 19 Dec 2010 06:09:02 +0000 (UTC) (envelope-from mlaier@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AED698FC1B; Sun, 19 Dec 2010 06:09:02 +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 oBJ6925m061179; Sun, 19 Dec 2010 06:09:02 GMT (envelope-from mlaier@svn.freebsd.org) Received: (from mlaier@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBJ692Pq061176; Sun, 19 Dec 2010 06:09:02 GMT (envelope-from mlaier@svn.freebsd.org) Message-Id: <201012190609.oBJ692Pq061176@svn.freebsd.org> From: Max Laier Date: Sun, 19 Dec 2010 06:09:02 +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: r216554 - stable/7/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 06:09:03 -0000 Author: mlaier Date: Sun Dec 19 06:09:02 2010 New Revision: 216554 URL: http://svn.freebsd.org/changeset/base/216554 Log: MFC r216335: Fix a long standing (from the original 4.4BSD lite sources) race between vmspace_fork and vm_map_wire that would lead to "vm_fault_copy_wired: page missing" panics. While faulting in pages for a map entry that is being wired down, mark the containing map as busy. In vmspace_fork wait until the map is unbusy, before we try to copy the entries. Sponsored by: Isilon Systems, Inc. Approved by: re (kib) Modified: stable/7/sys/vm/vm_map.c stable/7/sys/vm/vm_map.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/vm/vm_map.c ============================================================================== --- stable/7/sys/vm/vm_map.c Sun Dec 19 06:07:35 2010 (r216553) +++ stable/7/sys/vm/vm_map.c Sun Dec 19 06:09:02 2010 (r216554) @@ -561,6 +561,56 @@ vm_map_wakeup(vm_map_t map) wakeup(&map->root); } +void +vm_map_busy(vm_map_t map) +{ + +#ifdef INVARIANTS + if (map->system_map) { + mtx_assert(&map->system_mtx, MA_OWNED); + } else + sx_assert(&map->lock, SX_XLOCKED); +#endif + map->busy++; +} + +void +vm_map_unbusy(vm_map_t map) +{ + +#ifdef INVARIANTS + if (map->system_map) { + mtx_assert(&map->system_mtx, MA_OWNED); + } else + sx_assert(&map->lock, SX_XLOCKED); +#endif + KASSERT(map->busy, ("vm_map_unbusy: not busy")); + if (--map->busy == 0 && (map->flags & MAP_BUSY_WAKEUP)) { + vm_map_modflags(map, 0, MAP_BUSY_WAKEUP); + wakeup(&map->busy); + } +} + +void +vm_map_wait_busy(vm_map_t map) +{ + +#ifdef INVARIANTS + if (map->system_map) { + mtx_assert(&map->system_mtx, MA_OWNED); + } else + sx_assert(&map->lock, SX_XLOCKED); +#endif + while (map->busy) { + vm_map_modflags(map, MAP_BUSY_WAKEUP, 0); + if (map->system_map) + msleep(&map->busy, &map->system_mtx, 0, "mbusy", 0); + else + sx_sleep(&map->busy, &map->lock, 0, "mbusy", 0); + } + map->timestamp++; +} + long vmspace_resident_count(struct vmspace *vmspace) { @@ -609,6 +659,7 @@ _vm_map_init(vm_map_t map, vm_offset_t m map->flags = 0; map->root = NULL; map->timestamp = 0; + map->busy = 0; } void @@ -2070,12 +2121,14 @@ vm_map_wire(vm_map_t map, vm_offset_t st entry->object.vm_object->type == OBJT_SG); /* * Release the map lock, relying on the in-transition - * mark. + * mark. Mark the map busy for fork. */ + vm_map_busy(map); vm_map_unlock(map); rv = vm_fault_wire(map, saved_start, saved_end, user_wire, fictitious); vm_map_lock(map); + vm_map_unbusy(map); if (last_timestamp + 1 != map->timestamp) { /* * Look again for the entry because the map was @@ -2605,6 +2658,8 @@ vmspace_fork(struct vmspace *vm1) vm_object_t object; vm_map_lock(old_map); + if (old_map->busy) + vm_map_wait_busy(old_map); vm2 = vmspace_alloc(old_map->min_offset, old_map->max_offset); if (vm2 == NULL) Modified: stable/7/sys/vm/vm_map.h ============================================================================== --- stable/7/sys/vm/vm_map.h Sun Dec 19 06:07:35 2010 (r216553) +++ stable/7/sys/vm/vm_map.h Sun Dec 19 06:09:02 2010 (r216554) @@ -194,12 +194,14 @@ struct vm_map { pmap_t pmap; /* (c) Physical map */ #define min_offset header.start /* (c) */ #define max_offset header.end /* (c) */ + int busy; }; /* * vm_flags_t values */ #define MAP_WIREFUTURE 0x01 /* wire all future pages */ +#define MAP_BUSY_WAKEUP 0x02 #ifdef _KERNEL static __inline vm_offset_t @@ -276,6 +278,9 @@ int _vm_map_lock_upgrade(vm_map_t map, c void _vm_map_lock_downgrade(vm_map_t map, const char *file, int line); int vm_map_unlock_and_wait(vm_map_t map, boolean_t user_wait); void vm_map_wakeup(vm_map_t map); +void vm_map_busy(vm_map_t map); +void vm_map_unbusy(vm_map_t map); +void vm_map_wait_busy(vm_map_t map); #define vm_map_lock(map) _vm_map_lock(map, LOCK_FILE, LOCK_LINE) #define vm_map_unlock(map) _vm_map_unlock(map, LOCK_FILE, LOCK_LINE) From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 20:10:49 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EB96106566C; Sun, 19 Dec 2010 20:10:49 +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 1D6E08FC1A; Sun, 19 Dec 2010 20:10:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBJKAnCi023239; Sun, 19 Dec 2010 20:10:49 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBJKAnAU023237; Sun, 19 Dec 2010 20:10:49 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201012192010.oBJKAnAU023237@svn.freebsd.org> From: Doug Barton Date: Sun, 19 Dec 2010 20:10:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216568 - in stable/8/etc: periodic/daily rc.d X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 20:10:49 -0000 Author: dougb Date: Sun Dec 19 20:10:48 2010 New Revision: 216568 URL: http://svn.freebsd.org/changeset/base/216568 Log: MFC r215824: Add a sync to the shutdown step. In the common case this will be harmless at worst. On a heavily loaded server it will give the fs a chance to do its business without the axe hanging over its head. Submitted by: ivoras Approved by: re (kib) Modified: stable/8/etc/rc.d/mountcritlocal Directory Properties: stable/8/etc/ (props changed) stable/8/etc/periodic/daily/ (props changed) stable/8/etc/periodic/daily/800.scrub-zfs (props changed) stable/8/etc/periodic/security/ (props changed) Modified: stable/8/etc/rc.d/mountcritlocal ============================================================================== --- stable/8/etc/rc.d/mountcritlocal Sun Dec 19 18:21:25 2010 (r216567) +++ stable/8/etc/rc.d/mountcritlocal Sun Dec 19 20:10:48 2010 (r216568) @@ -5,13 +5,13 @@ # PROVIDE: mountcritlocal # REQUIRE: root -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr name="mountcritlocal" start_cmd="mountcritlocal_start" -stop_cmd=":" +stop_cmd=sync mountcritlocal_start() { From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 20:11:21 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 819A11065674; Sun, 19 Dec 2010 20:11:21 +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 708AC8FC15; Sun, 19 Dec 2010 20:11:21 +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 oBJKBLQM023353; Sun, 19 Dec 2010 20:11:21 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBJKBLQf023351; Sun, 19 Dec 2010 20:11:21 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201012192011.oBJKBLQf023351@svn.freebsd.org> From: Doug Barton Date: Sun, 19 Dec 2010 20:11:21 +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: r216569 - stable/7/etc/rc.d X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 20:11:21 -0000 Author: dougb Date: Sun Dec 19 20:11:21 2010 New Revision: 216569 URL: http://svn.freebsd.org/changeset/base/216569 Log: MFC r215824: Add a sync to the shutdown step. In the common case this will be harmless at worst. On a heavily loaded server it will give the fs a chance to do its business without the axe hanging over its head. Submitted by: ivoras Approved by: re (kib) Modified: stable/7/etc/rc.d/mountcritlocal Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.d/mountcritlocal ============================================================================== --- stable/7/etc/rc.d/mountcritlocal Sun Dec 19 20:10:48 2010 (r216568) +++ stable/7/etc/rc.d/mountcritlocal Sun Dec 19 20:11:21 2010 (r216569) @@ -5,13 +5,13 @@ # PROVIDE: mountcritlocal # REQUIRE: root -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr name="mountcritlocal" start_cmd="mountcritlocal_start" -stop_cmd=":" +stop_cmd=sync mountcritlocal_start() { From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 20:12:17 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74A2C106566B; Sun, 19 Dec 2010 20:12:17 +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 63F638FC1C; Sun, 19 Dec 2010 20:12: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 oBJKCHQJ023455; Sun, 19 Dec 2010 20:12:17 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBJKCHPZ023453; Sun, 19 Dec 2010 20:12:17 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201012192012.oBJKCHPZ023453@svn.freebsd.org> From: Doug Barton Date: Sun, 19 Dec 2010 20:12:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216570 - stable/8 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 20:12:17 -0000 Author: dougb Date: Sun Dec 19 20:12:17 2010 New Revision: 216570 URL: http://svn.freebsd.org/changeset/base/216570 Log: MFC r216187: Add MAKEDEV.8 Submitted by: Alex Kozlov Approved by: re (kib) Modified: stable/8/ObsoleteFiles.inc (contents, props changed) Modified: stable/8/ObsoleteFiles.inc ============================================================================== --- stable/8/ObsoleteFiles.inc Sun Dec 19 20:11:21 2010 (r216569) +++ stable/8/ObsoleteFiles.inc Sun Dec 19 20:12:17 2010 (r216570) @@ -16,6 +16,8 @@ # 20101123: removed subblock.h from liblzma OLD_FILES+=usr/include/lzma/subblock.h +# 20101114: Remove long-obsolete MAKEDEV.8 +OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago OLD_FILES+=usr/share/man/man9/vgonel.9.gz # 20101025: catch up with vm_page_sleep_if_busy rename From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 20:12:44 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3B8E106564A; Sun, 19 Dec 2010 20:12:44 +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 A30978FC1B; Sun, 19 Dec 2010 20:12:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBJKCiGP023596; Sun, 19 Dec 2010 20:12:44 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBJKCis1023594; Sun, 19 Dec 2010 20:12:44 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201012192012.oBJKCis1023594@svn.freebsd.org> From: Doug Barton Date: Sun, 19 Dec 2010 20:12:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216571 - stable/7 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 20:12:44 -0000 Author: dougb Date: Sun Dec 19 20:12:44 2010 New Revision: 216571 URL: http://svn.freebsd.org/changeset/base/216571 Log: MFC r216187: Add MAKEDEV.8 Submitted by: Alex Kozlov Approved by: re (kib) Modified: stable/7/ObsoleteFiles.inc (contents, props changed) Modified: stable/7/ObsoleteFiles.inc ============================================================================== --- stable/7/ObsoleteFiles.inc Sun Dec 19 20:12:17 2010 (r216570) +++ stable/7/ObsoleteFiles.inc Sun Dec 19 20:12:44 2010 (r216571) @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20101114: Remove long-obsolete MAKEDEV.8 +OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago OLD_FILES+=usr/share/man/man9/vgonel.9.gz # 20101025: catch up with vm_page_sleep_if_busy rename From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 21:33:28 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E579E106564A; Sun, 19 Dec 2010 21:33:28 +0000 (UTC) (envelope-from joerg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D3DA88FC0A; Sun, 19 Dec 2010 21:33: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 oBJLXSKp030432; Sun, 19 Dec 2010 21:33:28 GMT (envelope-from joerg@svn.freebsd.org) Received: (from joerg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBJLXSvF030430; Sun, 19 Dec 2010 21:33:28 GMT (envelope-from joerg@svn.freebsd.org) Message-Id: <201012192133.oBJLXSvF030430@svn.freebsd.org> From: Joerg Wunsch Date: Sun, 19 Dec 2010 21:33:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216573 - stable/8/sys/dev/ieee488 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 21:33:29 -0000 Author: joerg Date: Sun Dec 19 21:33:28 2010 New Revision: 216573 URL: http://svn.freebsd.org/changeset/base/216573 Log: Fix __retval vs. retval confusion: retval is meant to store the (userland) pointer where data is to be returned by ibask() (currently unimplemented), while __retval holds the value returned by the libgpib ibfoo() functions. The confusion resulted in the ibfoo() functions returning an uninitialized value except in situations where the GPIB activity has been terminated abnormally. Implement more of __ibsta: END and SRQI status bits (taken out of the uPD7210 IRQ status). Approved by: re (kib) Modified: stable/8/sys/dev/ieee488/ibfoo.c Modified: stable/8/sys/dev/ieee488/ibfoo.c ============================================================================== --- stable/8/sys/dev/ieee488/ibfoo.c Sun Dec 19 21:18:33 2010 (r216572) +++ stable/8/sys/dev/ieee488/ibfoo.c Sun Dec 19 21:33:28 2010 (r216573) @@ -333,6 +333,14 @@ gpib_ib_wait_xfer(struct upd7210 *u, str break; } } + if ((u->rreg[ISR1] & IXR1_ENDRX) != 0) { + ib->ap->__retval |= END; + ib->ap->__ibsta |= END; + } + if ((u->rreg[ISR2] & IXR2_SRQI) != 0) { + ib->ap->__retval |= SRQI; + ib->ap->__ibsta |= SRQI; + } ib->mode = BUSY; ib->buf = NULL; upd7210_wr(u, IMR1, 0); @@ -1027,7 +1035,7 @@ gpib_ib_ioctl(struct cdev *dev, u_long c ap->__iberr = 0; ap->__ibsta = 0; ap->__ibcnt = 0; - ap->retval = 0; + ap->__retval = 0; if (ap->__field & __F_TMO) { if (ap->tmo < 0 || ap->tmo >= max_timeouts) From owner-svn-src-stable@FreeBSD.ORG Sun Dec 19 21:51:11 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA9401065695; Sun, 19 Dec 2010 21:51:11 +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 9EE448FC25; Sun, 19 Dec 2010 21:51: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 oBJLpB7S032464; Sun, 19 Dec 2010 21:51:11 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBJLpBaA032463; Sun, 19 Dec 2010 21:51:11 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201012192151.oBJLpBaA032463@svn.freebsd.org> From: Doug Barton Date: Sun, 19 Dec 2010 21:51:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216574 - stable/8/etc/periodic/daily X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 21:51:11 -0000 Author: dougb Date: Sun Dec 19 21:51:11 2010 New Revision: 216574 URL: http://svn.freebsd.org/changeset/base/216574 Log: Pull svn:mergeinfo up from subdirectories and files onto etc/ where it belongs. Approved by: re (kib) Modified: Directory Properties: stable/8/etc/ (props changed) stable/8/etc/periodic/daily/ (props changed) stable/8/etc/periodic/daily/800.scrub-zfs (props changed) stable/8/etc/periodic/security/ (props changed) From owner-svn-src-stable@FreeBSD.ORG Mon Dec 20 17:08:22 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60D52106564A; Mon, 20 Dec 2010 17:08:22 +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 4F05B8FC08; Mon, 20 Dec 2010 17:08:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBKH8Mi4068926; Mon, 20 Dec 2010 17:08:22 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBKH8M9Q068924; Mon, 20 Dec 2010 17:08:22 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201012201708.oBKH8M9Q068924@svn.freebsd.org> From: John Baldwin Date: Mon, 20 Dec 2010 17:08:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216593 - stable/8/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Dec 2010 17:08:22 -0000 Author: jhb Date: Mon Dec 20 17:08:22 2010 New Revision: 216593 URL: http://svn.freebsd.org/changeset/base/216593 Log: MFC 216504: Add back a bounds check on valid idle priorities that was lost in an earlier commit. While here, move the thread lock down in rtp_to_pri(). It is not needed for all of the priority value checks and the computation of newpri. Approved by: re (kib) Modified: stable/8/sys/kern/kern_resource.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/kern/kern_resource.c ============================================================================== --- stable/8/sys/kern/kern_resource.c Mon Dec 20 16:39:43 2010 (r216592) +++ stable/8/sys/kern/kern_resource.c Mon Dec 20 17:08:22 2010 (r216593) @@ -472,29 +472,27 @@ rtp_to_pri(struct rtprio *rtp, struct th u_char newpri; u_char oldpri; - thread_lock(td); switch (RTP_PRIO_BASE(rtp->type)) { case RTP_PRIO_REALTIME: - if (rtp->prio > RTP_PRIO_MAX) { - thread_unlock(td); + if (rtp->prio > RTP_PRIO_MAX) return (EINVAL); - } newpri = PRI_MIN_REALTIME + rtp->prio; break; case RTP_PRIO_NORMAL: - if (rtp->prio > (PRI_MAX_TIMESHARE - PRI_MIN_TIMESHARE)) { - thread_unlock(td); + if (rtp->prio > (PRI_MAX_TIMESHARE - PRI_MIN_TIMESHARE)) return (EINVAL); - } newpri = PRI_MIN_TIMESHARE + rtp->prio; break; case RTP_PRIO_IDLE: + if (rtp->prio > RTP_PRIO_MAX) + return (EINVAL); newpri = PRI_MIN_IDLE + rtp->prio; break; default: - thread_unlock(td); return (EINVAL); } + + thread_lock(td); sched_class(td, rtp->type); /* XXX fix */ oldpri = td->td_user_pri; sched_user_prio(td, newpri); From owner-svn-src-stable@FreeBSD.ORG Mon Dec 20 20:25:42 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D876A106566B; Mon, 20 Dec 2010 20:25:42 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AC8578FC24; Mon, 20 Dec 2010 20:25:42 +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 oBKKPgsX081505; Mon, 20 Dec 2010 20:25:42 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBKKPgWN081504; Mon, 20 Dec 2010 20:25:42 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201012202025.oBKKPgWN081504@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 20 Dec 2010 20:25:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216601 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Dec 2010 20:25:43 -0000 Author: bz Date: Mon Dec 20 20:25:42 2010 New Revision: 216601 URL: http://svn.freebsd.org/changeset/base/216601 Log: Record merge-info for r216355,216364 previously merged as r216573. Approved by: re (kib) Modified: Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) From owner-svn-src-stable@FreeBSD.ORG Mon Dec 20 20:39:50 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1343B1065675; Mon, 20 Dec 2010 20:39:50 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EADD28FC27; Mon, 20 Dec 2010 20:39:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBKKdnKf083161; Mon, 20 Dec 2010 20:39:49 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBKKdnSp083154; Mon, 20 Dec 2010 20:39:49 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201012202039.oBKKdnSp083154@svn.freebsd.org> From: Colin Percival Date: Mon, 20 Dec 2010 20:39:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216602 - in stable/8/sys: dev/xen/blkfront i386/i386 i386/xen xen/evtchn X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Dec 2010 20:39:50 -0000 Author: cperciva Date: Mon Dec 20 20:39:49 2010 New Revision: 216602 URL: http://svn.freebsd.org/changeset/base/216602 Log: MFC Xen-related commits r215470, r215472, r215525, r215663, r215813, r215819, r215844, r216041, r216241, r216280, r216382, and r216385. * Make blkfront not advertise a larger maximum I/O size than it can handle for unaligned data (r216241) * Correctly reserve CPU #0's DPCPU pages (r216041) * Make machdep.independent_wallclock do what it claims (r216382) * Don't round xen timecounter to the nearest tick (r215663), but decrease its frequency to avoid wrapping at ~4.3s (r216385) * Remove debugging code which caused a massing slowdown in fork-heavy workloads (r215813) * Add a missing page table flush before invalidating TLBs in pmap_qremove (r215819+215844) * In pmap_release, don't unpin pages which weren't pinned (r215525) and don't KASSERT page mappings which don't exist (r215470); but do pmap_qremove all the relevant pages (r215472) * Don't unmask an event channel until after we register the interrupt handler for it (r216280) Approved by: re (rwatson) Modified: stable/8/sys/dev/xen/blkfront/blkfront.c stable/8/sys/i386/i386/machdep.c stable/8/sys/i386/xen/clock.c stable/8/sys/i386/xen/pmap.c stable/8/sys/i386/xen/xen_machdep.c stable/8/sys/xen/evtchn/evtchn.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- stable/8/sys/dev/xen/blkfront/blkfront.c Mon Dec 20 20:25:42 2010 (r216601) +++ stable/8/sys/dev/xen/blkfront/blkfront.c Mon Dec 20 20:39:49 2010 (r216602) @@ -508,7 +508,7 @@ blkfront_initialize(struct xb_softc *sc) sc->ring_pages = 1; sc->max_requests = BLKIF_MAX_RING_REQUESTS(PAGE_SIZE); sc->max_request_segments = BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK; - sc->max_request_size = sc->max_request_segments * PAGE_SIZE; + sc->max_request_size = (sc->max_request_segments - 1) * PAGE_SIZE; sc->max_request_blocks = BLKIF_SEGS_TO_BLOCKS(sc->max_request_segments); /* Modified: stable/8/sys/i386/i386/machdep.c ============================================================================== --- stable/8/sys/i386/i386/machdep.c Mon Dec 20 20:25:42 2010 (r216601) +++ stable/8/sys/i386/i386/machdep.c Mon Dec 20 20:39:49 2010 (r216602) @@ -2561,6 +2561,8 @@ init386(first) pmap_kenter(pa + KERNBASE, pa); dpcpu_init((void *)(first + KERNBASE), 0); first += DPCPU_SIZE; + physfree += DPCPU_SIZE; + init_first += DPCPU_SIZE / PAGE_SIZE; PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); Modified: stable/8/sys/i386/xen/clock.c ============================================================================== --- stable/8/sys/i386/xen/clock.c Mon Dec 20 20:25:42 2010 (r216601) +++ stable/8/sys/i386/xen/clock.c Mon Dec 20 20:39:49 2010 (r216602) @@ -340,7 +340,8 @@ clkintr(void *arg) * time base. */ - if (shadow_tv_version != HYPERVISOR_shared_info->wc_version) { + if (shadow_tv_version != HYPERVISOR_shared_info->wc_version && + !independent_wallclock) { printf("[XEN] hypervisor wallclock nudged; nudging TOD.\n"); update_wallclock(); add_uptime_to_wallclock(); @@ -522,7 +523,8 @@ startrtclock() set_cyc2ns_scale(cpu_khz/1000); tsc_freq = cpu_khz * 1000; - timer_freq = xen_timecounter.tc_frequency = 1000000000LL; + timer_freq = 1000000000LL; + xen_timecounter.tc_frequency = timer_freq >> 9; tc_init(&xen_timecounter); rdtscll(alarm); @@ -829,7 +831,7 @@ xen_get_timecount(struct timecounter *tc clk = shadow->system_timestamp + get_nsec_offset(shadow); - return (uint32_t)((clk / NS_PER_TICK) * NS_PER_TICK); + return (uint32_t)(clk >> 9); } Modified: stable/8/sys/i386/xen/pmap.c ============================================================================== --- stable/8/sys/i386/xen/pmap.c Mon Dec 20 20:25:42 2010 (r216601) +++ stable/8/sys/i386/xen/pmap.c Mon Dec 20 20:39:49 2010 (r216602) @@ -1384,6 +1384,7 @@ pmap_qremove(vm_offset_t sva, int count) pmap_kremove(va); va += PAGE_SIZE; } + PT_UPDATES_FLUSH(); pmap_invalidate_range(kernel_pmap, sva, va); critical_exit(); vm_page_unlock_queues(); @@ -1854,15 +1855,24 @@ pmap_release(pmap_t pmap) m = ptdpg[i]; ma = xpmap_ptom(VM_PAGE_TO_PHYS(m)); /* unpinning L1 and L2 treated the same */ +#if 0 xen_pgd_unpin(ma); +#else + if (i == NPGPTD) + xen_pgd_unpin(ma); +#endif #ifdef PAE - KASSERT(xpmap_ptom(VM_PAGE_TO_PHYS(m)) == (pmap->pm_pdpt[i] & PG_FRAME), - ("pmap_release: got wrong ptd page")); + if (i < NPGPTD) + KASSERT(xpmap_ptom(VM_PAGE_TO_PHYS(m)) == (pmap->pm_pdpt[i] & PG_FRAME), + ("pmap_release: got wrong ptd page")); #endif m->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free(m); } +#ifdef PAE + pmap_qremove((vm_offset_t)pmap->pm_pdpt, 1); +#endif PMAP_LOCK_DESTROY(pmap); } Modified: stable/8/sys/i386/xen/xen_machdep.c ============================================================================== --- stable/8/sys/i386/xen/xen_machdep.c Mon Dec 20 20:25:42 2010 (r216601) +++ stable/8/sys/i386/xen/xen_machdep.c Mon Dec 20 20:39:49 2010 (r216602) @@ -482,7 +482,6 @@ xen_pt_pin(vm_paddr_t ma) struct mmuext_op op; op.cmd = MMUEXT_PIN_L1_TABLE; op.arg1.mfn = ma >> PAGE_SHIFT; - printk("xen_pt_pin(): mfn=%x\n", op.arg1.mfn); xen_flush_queue(); PANIC_IF(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0); } Modified: stable/8/sys/xen/evtchn/evtchn.c ============================================================================== --- stable/8/sys/xen/evtchn/evtchn.c Mon Dec 20 20:25:42 2010 (r216601) +++ stable/8/sys/xen/evtchn/evtchn.c Mon Dec 20 20:39:49 2010 (r216602) @@ -256,7 +256,7 @@ find_unbound_irq(void) } static int -bind_caller_port_to_irq(unsigned int caller_port) +bind_caller_port_to_irq(unsigned int caller_port, int * port) { int irq; @@ -271,7 +271,7 @@ bind_caller_port_to_irq(unsigned int cal } irq_bindcount[irq]++; - unmask_evtchn(caller_port); + *port = caller_port; out: mtx_unlock_spin(&irq_mapping_update_lock); @@ -279,7 +279,7 @@ bind_caller_port_to_irq(unsigned int cal } static int -bind_local_port_to_irq(unsigned int local_port) +bind_local_port_to_irq(unsigned int local_port, int * port) { int irq; @@ -298,7 +298,7 @@ bind_local_port_to_irq(unsigned int loca evtchn_to_irq[local_port] = irq; irq_info[irq] = mk_irq_info(IRQT_LOCAL_PORT, 0, local_port); irq_bindcount[irq]++; - unmask_evtchn(local_port); + *port = local_port; out: mtx_unlock_spin(&irq_mapping_update_lock); @@ -306,7 +306,7 @@ bind_local_port_to_irq(unsigned int loca } static int -bind_listening_port_to_irq(unsigned int remote_domain) +bind_listening_port_to_irq(unsigned int remote_domain, int * port) { struct evtchn_alloc_unbound alloc_unbound; int err; @@ -317,12 +317,12 @@ bind_listening_port_to_irq(unsigned int err = HYPERVISOR_event_channel_op(EVTCHNOP_alloc_unbound, &alloc_unbound); - return err ? : bind_local_port_to_irq(alloc_unbound.port); + return err ? : bind_local_port_to_irq(alloc_unbound.port, port); } static int bind_interdomain_evtchn_to_irq(unsigned int remote_domain, - unsigned int remote_port) + unsigned int remote_port, int * port) { struct evtchn_bind_interdomain bind_interdomain; int err; @@ -333,11 +333,11 @@ bind_interdomain_evtchn_to_irq(unsigned err = HYPERVISOR_event_channel_op(EVTCHNOP_bind_interdomain, &bind_interdomain); - return err ? : bind_local_port_to_irq(bind_interdomain.local_port); + return err ? : bind_local_port_to_irq(bind_interdomain.local_port, port); } static int -bind_virq_to_irq(unsigned int virq, unsigned int cpu) +bind_virq_to_irq(unsigned int virq, unsigned int cpu, int * port) { struct evtchn_bind_virq bind_virq; int evtchn = 0, irq; @@ -363,7 +363,7 @@ bind_virq_to_irq(unsigned int virq, unsi } irq_bindcount[irq]++; - unmask_evtchn(evtchn); + *port = evtchn; out: mtx_unlock_spin(&irq_mapping_update_lock); @@ -371,10 +371,8 @@ out: } -extern int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu); - -int -bind_ipi_to_irq(unsigned int ipi, unsigned int cpu) +static int +bind_ipi_to_irq(unsigned int ipi, unsigned int cpu, int * port) { struct evtchn_bind_ipi bind_ipi; int irq; @@ -398,7 +396,7 @@ bind_ipi_to_irq(unsigned int ipi, unsign bind_evtchn_to_cpu(evtchn, cpu); } irq_bindcount[irq]++; - unmask_evtchn(evtchn); + *port = evtchn; out: mtx_unlock_spin(&irq_mapping_update_lock); @@ -449,9 +447,10 @@ bind_caller_port_to_irqhandler(unsigned unsigned long irqflags, unsigned int *irqp) { unsigned int irq; + int port = -1; int error; - irq = bind_caller_port_to_irq(caller_port); + irq = bind_caller_port_to_irq(caller_port, &port); intr_register_source(&xp->xp_pins[irq].xp_intsrc); error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags, &xp->xp_pins[irq].xp_cookie); @@ -460,6 +459,8 @@ bind_caller_port_to_irqhandler(unsigned unbind_from_irq(irq); return (error); } + if (port != -1) + unmask_evtchn(port); if (irqp) *irqp = irq; @@ -473,9 +474,10 @@ bind_listening_port_to_irqhandler(unsign unsigned long irqflags, unsigned int *irqp) { unsigned int irq; + int port = -1; int error; - irq = bind_listening_port_to_irq(remote_domain); + irq = bind_listening_port_to_irq(remote_domain, &port); intr_register_source(&xp->xp_pins[irq].xp_intsrc); error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags, &xp->xp_pins[irq].xp_cookie); @@ -483,6 +485,8 @@ bind_listening_port_to_irqhandler(unsign unbind_from_irq(irq); return (error); } + if (port != -1) + unmask_evtchn(port); if (irqp) *irqp = irq; @@ -496,9 +500,10 @@ bind_interdomain_evtchn_to_irqhandler(un unsigned int *irqp) { unsigned int irq; + int port = -1; int error; - irq = bind_interdomain_evtchn_to_irq(remote_domain, remote_port); + irq = bind_interdomain_evtchn_to_irq(remote_domain, remote_port, &port); intr_register_source(&xp->xp_pins[irq].xp_intsrc); error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags, &xp->xp_pins[irq].xp_cookie); @@ -506,6 +511,8 @@ bind_interdomain_evtchn_to_irqhandler(un unbind_from_irq(irq); return (error); } + if (port != -1) + unmask_evtchn(port); if (irqp) *irqp = irq; @@ -518,9 +525,10 @@ bind_virq_to_irqhandler(unsigned int vir void *arg, unsigned long irqflags, unsigned int *irqp) { unsigned int irq; + int port = -1; int error; - irq = bind_virq_to_irq(virq, cpu); + irq = bind_virq_to_irq(virq, cpu, &port); intr_register_source(&xp->xp_pins[irq].xp_intsrc); error = intr_add_handler(devname, irq, filter, handler, arg, irqflags, &xp->xp_pins[irq].xp_cookie); @@ -528,6 +536,8 @@ bind_virq_to_irqhandler(unsigned int vir unbind_from_irq(irq); return (error); } + if (port != -1) + unmask_evtchn(port); if (irqp) *irqp = irq; @@ -540,9 +550,10 @@ bind_ipi_to_irqhandler(unsigned int ipi, unsigned long irqflags, unsigned int *irqp) { unsigned int irq; + int port = -1; int error; - irq = bind_ipi_to_irq(ipi, cpu); + irq = bind_ipi_to_irq(ipi, cpu, &port); intr_register_source(&xp->xp_pins[irq].xp_intsrc); error = intr_add_handler(devname, irq, filter, NULL, NULL, irqflags, &xp->xp_pins[irq].xp_cookie); @@ -550,6 +561,8 @@ bind_ipi_to_irqhandler(unsigned int ipi, unbind_from_irq(irq); return (error); } + if (port != -1) + unmask_evtchn(port); if (irqp) *irqp = irq; From owner-svn-src-stable@FreeBSD.ORG Tue Dec 21 09:13:24 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0494106566B; Tue, 21 Dec 2010 09:13:24 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9E8728FC15; Tue, 21 Dec 2010 09:13:24 +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 oBL9DOVO045280; Tue, 21 Dec 2010 09:13:24 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBL9DOjE045278; Tue, 21 Dec 2010 09:13:24 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201012210913.oBL9DOjE045278@svn.freebsd.org> From: Bernhard Schmidt Date: Tue, 21 Dec 2010 09:13:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216608 - stable/8/sys/dev/wpi X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Dec 2010 09:13:24 -0000 Author: bschmidt Date: Tue Dec 21 09:13:24 2010 New Revision: 216608 URL: http://svn.freebsd.org/changeset/base/216608 Log: Fix a panic while disabling the RF kill button, caller of the wpi_rfkill_resume() function will take care of the lock. PR: kern/14489 Approved by: re (kib) Modified: stable/8/sys/dev/wpi/if_wpi.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/wpi/if_wpi.c ============================================================================== --- stable/8/sys/dev/wpi/if_wpi.c Mon Dec 20 23:41:31 2010 (r216607) +++ stable/8/sys/dev/wpi/if_wpi.c Tue Dec 21 09:13:24 2010 (r216608) @@ -3004,14 +3004,12 @@ wpi_rfkill_resume(struct wpi_softc *sc) if (ntries == 1000) { device_printf(sc->sc_dev, "timeout waiting for thermal calibration\n"); - WPI_UNLOCK(sc); return; } DPRINTFN(WPI_DEBUG_TEMP,("temperature %d\n", sc->temp)); if (wpi_config(sc) != 0) { device_printf(sc->sc_dev, "device config failed\n"); - WPI_UNLOCK(sc); return; } From owner-svn-src-stable@FreeBSD.ORG Tue Dec 21 09:15:00 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AB10106566B; Tue, 21 Dec 2010 09:15:00 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ED21E8FC1D; Tue, 21 Dec 2010 09:14:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBL9ExfM045453; Tue, 21 Dec 2010 09:14:59 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBL9ExG4045451; Tue, 21 Dec 2010 09:14:59 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201012210914.oBL9ExG4045451@svn.freebsd.org> From: Bernhard Schmidt Date: Tue, 21 Dec 2010 09:14:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216609 - stable/8/sys/dev/wpi X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Dec 2010 09:15:00 -0000 Author: bschmidt Date: Tue Dec 21 09:14:59 2010 New Revision: 216609 URL: http://svn.freebsd.org/changeset/base/216609 Log: Fix association on 5GHz channels. The device is initially configured using a 2GHz channel with appropriate flags set to sc->config. Due to not zeroing sc->config for auth/assoc those flags are still set while trying to connect on a 5GHz channel. Approved by: re (kib) Modified: stable/8/sys/dev/wpi/if_wpi.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/wpi/if_wpi.c ============================================================================== --- stable/8/sys/dev/wpi/if_wpi.c Tue Dec 21 09:13:24 2010 (r216608) +++ stable/8/sys/dev/wpi/if_wpi.c Tue Dec 21 09:14:59 2010 (r216609) @@ -2429,6 +2429,9 @@ wpi_auth(struct wpi_softc *sc, struct ie if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) { sc->config.flags |= htole32(WPI_CONFIG_AUTO | WPI_CONFIG_24GHZ); + } else { + sc->config.flags &= ~htole32(WPI_CONFIG_AUTO | + WPI_CONFIG_24GHZ); } if (IEEE80211_IS_CHAN_A(ni->ni_chan)) { sc->config.cck_mask = 0; From owner-svn-src-stable@FreeBSD.ORG Tue Dec 21 09:16:43 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DB71106566C; Tue, 21 Dec 2010 09:16:43 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F027E8FC08; Tue, 21 Dec 2010 09:16:42 +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 oBL9Ggfu045630; Tue, 21 Dec 2010 09:16:42 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBL9Gglc045628; Tue, 21 Dec 2010 09:16:42 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201012210916.oBL9Gglc045628@svn.freebsd.org> From: Bernhard Schmidt Date: Tue, 21 Dec 2010 09:16:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216610 - stable/8/sys/dev/wpi X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Dec 2010 09:16:43 -0000 Author: bschmidt Date: Tue Dec 21 09:16:42 2010 New Revision: 216610 URL: http://svn.freebsd.org/changeset/base/216610 Log: Add 2 missing bus_dmamap_sync() calls. Those fix random 'scan timeout', 'could not set power mode', 'device config failed' and other errors due reading invalid memory. Approved by: re (kib) Obtained from: OpenBSD Modified: stable/8/sys/dev/wpi/if_wpi.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/wpi/if_wpi.c ============================================================================== --- stable/8/sys/dev/wpi/if_wpi.c Tue Dec 21 09:14:59 2010 (r216609) +++ stable/8/sys/dev/wpi/if_wpi.c Tue Dec 21 09:16:42 2010 (r216610) @@ -1645,9 +1645,15 @@ wpi_notif_intr(struct wpi_softc *sc) struct wpi_rx_data *data; uint32_t hw; + bus_dmamap_sync(sc->shared_dma.tag, sc->shared_dma.map, + BUS_DMASYNC_POSTREAD); + hw = le32toh(sc->shared->next); while (sc->rxq.cur != hw) { data = &sc->rxq.data[sc->rxq.cur]; + + bus_dmamap_sync(sc->rxq.data_dmat, data->map, + BUS_DMASYNC_POSTREAD); desc = (void *)data->m->m_ext.ext_buf; DPRINTFN(WPI_DEBUG_NOTIFY, From owner-svn-src-stable@FreeBSD.ORG Tue Dec 21 09:31:49 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 213391065670; Tue, 21 Dec 2010 09:31:49 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0F7FC8FC08; Tue, 21 Dec 2010 09:31:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBL9VmfW047106; Tue, 21 Dec 2010 09:31:48 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBL9Vm1t047104; Tue, 21 Dec 2010 09:31:48 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <201012210931.oBL9Vm1t047104@svn.freebsd.org> From: Andrew Thompson Date: Tue, 21 Dec 2010 09:31:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216611 - stable/8/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Dec 2010 09:31:49 -0000 Author: thompsa Date: Tue Dec 21 09:31:48 2010 New Revision: 216611 URL: http://svn.freebsd.org/changeset/base/216611 Log: MFC r216371: Fix race in devfs by using LIST_FIRST() instead of LIST_FOREACH_SAFE() when freeing the devfs private data entries. Approved by: re (kib) Modified: stable/8/sys/kern/kern_conf.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/kern/kern_conf.c ============================================================================== --- stable/8/sys/kern/kern_conf.c Tue Dec 21 09:16:42 2010 (r216610) +++ stable/8/sys/kern/kern_conf.c Tue Dec 21 09:31:48 2010 (r216611) @@ -871,7 +871,7 @@ static void destroy_devl(struct cdev *dev) { struct cdevsw *csw; - struct cdev_privdata *p, *p1; + struct cdev_privdata *p; mtx_assert(&devmtx, MA_OWNED); KASSERT(dev->si_flags & SI_NAMED, @@ -919,7 +919,7 @@ destroy_devl(struct cdev *dev) dev_unlock(); notify_destroy(dev); mtx_lock(&cdevpriv_mtx); - LIST_FOREACH_SAFE(p, &cdev2priv(dev)->cdp_fdpriv, cdpd_list, p1) { + while ((p = LIST_FIRST(&cdev2priv(dev)->cdp_fdpriv)) != NULL) { devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } From owner-svn-src-stable@FreeBSD.ORG Tue Dec 21 09:33:06 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C21810656A9; Tue, 21 Dec 2010 09:33:06 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A8AC8FC25; Tue, 21 Dec 2010 09:33:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBL9X6Ro047219; Tue, 21 Dec 2010 09:33:06 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBL9X6QA047217; Tue, 21 Dec 2010 09:33:06 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <201012210933.oBL9X6QA047217@svn.freebsd.org> From: Andrew Thompson Date: Tue, 21 Dec 2010 09:33:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216612 - stable/7/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Dec 2010 09:33:06 -0000 Author: thompsa Date: Tue Dec 21 09:33:06 2010 New Revision: 216612 URL: http://svn.freebsd.org/changeset/base/216612 Log: MFC r216371: Fix race in devfs by using LIST_FIRST() instead of LIST_FOREACH_SAFE() when freeing the devfs private data entries. Approved by: re (kib) Modified: stable/7/sys/kern/kern_conf.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/kern/kern_conf.c ============================================================================== --- stable/7/sys/kern/kern_conf.c Tue Dec 21 09:31:48 2010 (r216611) +++ stable/7/sys/kern/kern_conf.c Tue Dec 21 09:33:06 2010 (r216612) @@ -863,7 +863,7 @@ static void destroy_devl(struct cdev *dev) { struct cdevsw *csw; - struct cdev_privdata *p, *p1; + struct cdev_privdata *p; mtx_assert(&devmtx, MA_OWNED); KASSERT(dev->si_flags & SI_NAMED, @@ -908,7 +908,7 @@ destroy_devl(struct cdev *dev) dev_unlock(); notify_destroy(dev); mtx_lock(&cdevpriv_mtx); - LIST_FOREACH_SAFE(p, &dev->si_priv->cdp_fdpriv, cdpd_list, p1) { + while ((p = LIST_FIRST(&dev->si_priv->cdp_fdpriv)) != NULL) { devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } From owner-svn-src-stable@FreeBSD.ORG Tue Dec 21 10:43:52 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46ACB106566C; Tue, 21 Dec 2010 10:43:52 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A62E8FC0C; Tue, 21 Dec 2010 10:43:52 +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 oBLAhpJt054181; Tue, 21 Dec 2010 10:43:51 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBLAhpWM054178; Tue, 21 Dec 2010 10:43:51 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201012211043.oBLAhpWM054178@svn.freebsd.org> From: Michael Tuexen Date: Tue, 21 Dec 2010 10:43:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216613 - stable/8/sys/netinet X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Dec 2010 10:43:52 -0000 Author: tuexen Date: Tue Dec 21 10:43:51 2010 New Revision: 216613 URL: http://svn.freebsd.org/changeset/base/216613 Log: MFC c216495: Bugfix: Take also the nr-mapping array into account when detecting gaps. Approved by: re@ Modified: stable/8/sys/netinet/sctp_indata.c stable/8/sys/netinet/sctp_input.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/netinet/sctp_indata.c ============================================================================== --- stable/8/sys/netinet/sctp_indata.c Tue Dec 21 09:33:06 2010 (r216612) +++ stable/8/sys/netinet/sctp_indata.c Tue Dec 21 10:43:51 2010 (r216613) @@ -2585,8 +2585,9 @@ sctp_process_data(struct mbuf **mm, int int num_chunks = 0; /* number of control chunks processed */ int stop_proc = 0; int chk_length, break_flag, last_chunk; - int abort_flag = 0, was_a_gap = 0; + int abort_flag = 0, was_a_gap; struct mbuf *m; + uint32_t highest_tsn; /* set the rwnd */ sctp_set_rwnd(stcb, &stcb->asoc); @@ -2594,11 +2595,12 @@ sctp_process_data(struct mbuf **mm, int m = *mm; SCTP_TCB_LOCK_ASSERT(stcb); asoc = &stcb->asoc; - if (compare_with_wrap(stcb->asoc.highest_tsn_inside_map, - stcb->asoc.cumulative_tsn, MAX_TSN)) { - /* there was a gap before this data was processed */ - was_a_gap = 1; + if (compare_with_wrap(asoc->highest_tsn_inside_nr_map, asoc->highest_tsn_inside_map, MAX_TSN)) { + highest_tsn = asoc->highest_tsn_inside_nr_map; + } else { + highest_tsn = asoc->highest_tsn_inside_map; } + was_a_gap = compare_with_wrap(highest_tsn, stcb->asoc.cumulative_tsn, MAX_TSN); /* * setup where we got the last DATA packet from for any SACK that * may need to go out. Don't bump the net. This is done ONLY when a Modified: stable/8/sys/netinet/sctp_input.c ============================================================================== --- stable/8/sys/netinet/sctp_input.c Tue Dec 21 09:33:06 2010 (r216612) +++ stable/8/sys/netinet/sctp_input.c Tue Dec 21 10:43:51 2010 (r216613) @@ -5650,13 +5650,15 @@ sctp_common_input_processing(struct mbuf */ } if ((data_processed == 0) && (fwd_tsn_seen)) { - int was_a_gap = 0; + int was_a_gap; + uint32_t highest_tsn; - if (compare_with_wrap(stcb->asoc.highest_tsn_inside_map, - stcb->asoc.cumulative_tsn, MAX_TSN)) { - /* there was a gap before this data was processed */ - was_a_gap = 1; + if (compare_with_wrap(stcb->asoc.highest_tsn_inside_nr_map, stcb->asoc.highest_tsn_inside_map, MAX_TSN)) { + highest_tsn = stcb->asoc.highest_tsn_inside_nr_map; + } else { + highest_tsn = stcb->asoc.highest_tsn_inside_map; } + was_a_gap = compare_with_wrap(highest_tsn, stcb->asoc.cumulative_tsn, MAX_TSN); stcb->asoc.send_sack = 1; sctp_sack_check(stcb, was_a_gap, &abort_flag); if (abort_flag) { From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:25:56 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACC39106566B; Wed, 22 Dec 2010 14:25:56 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9B2848FC15; Wed, 22 Dec 2010 14:25:56 +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 oBMEPuKO016466; Wed, 22 Dec 2010 14:25:56 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMEPutf016464; Wed, 22 Dec 2010 14:25:56 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201012221425.oBMEPutf016464@svn.freebsd.org> From: Ken Smith Date: Wed, 22 Dec 2010 14:25:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216652 - stable/8/gnu/usr.bin/groff/tmac X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:25:56 -0000 Author: kensmith Date: Wed Dec 22 14:25:56 2010 New Revision: 216652 URL: http://svn.freebsd.org/changeset/base/216652 Log: Adjust the version of FreeBSD printed on the manual pages. Approved by: re (implicit) Modified: stable/8/gnu/usr.bin/groff/tmac/mdoc.local Modified: stable/8/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- stable/8/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 22 13:06:51 2010 (r216651) +++ stable/8/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 22 14:25:56 2010 (r216652) @@ -67,7 +67,7 @@ .ds doc-volume-as-arm arm . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~8.1 +.ds doc-default-operating-system FreeBSD\~8.2 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-7.2 7.2 @@ -76,6 +76,7 @@ .ds doc-operating-system-FreeBSD-8.0 8.0 .ds doc-operating-system-FreeBSD-8.1 8.1 .ds doc-operating-system-FreeBSD-8.2 8.2 +.ds doc-operating-system-FreeBSD-8.3 8.3 .ds doc-operating-system-FreeBSD-9.0 9.0 . .\" Definitions not (yet) in doc-syms From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:27:13 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD8251065675; Wed, 22 Dec 2010 14:27:13 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AC5958FC17; Wed, 22 Dec 2010 14:27: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 oBMERDEe016586; Wed, 22 Dec 2010 14:27:13 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMERDLZ016584; Wed, 22 Dec 2010 14:27:13 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201012221427.oBMERDLZ016584@svn.freebsd.org> From: Ken Smith Date: Wed, 22 Dec 2010 14:27:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216653 - stable/8/release X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:27:13 -0000 Author: kensmith Date: Wed Dec 22 14:27:13 2010 New Revision: 216653 URL: http://svn.freebsd.org/changeset/base/216653 Log: Misc. 8.1 -> 8.2 shifts as part of progress with FreeBSD 8.2 release. Approved by: re (implicit) Modified: stable/8/release/Makefile Modified: stable/8/release/Makefile ============================================================================== --- stable/8/release/Makefile Wed Dec 22 14:25:56 2010 (r216652) +++ stable/8/release/Makefile Wed Dec 22 14:27:13 2010 (r216653) @@ -24,11 +24,11 @@ # Set these, release builder! # # Fixed version: -#BUILDNAME=8.1-STABLE +#BUILDNAME=8.2-STABLE # # Automatic SNAP versioning: DATE != date +%Y%m%d -BASE = 8.1 +BASE = 8.2 BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:29:42 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 586321065672; Wed, 22 Dec 2010 14:29:42 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 476738FC08; Wed, 22 Dec 2010 14:29:42 +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 oBMETg99016668; Wed, 22 Dec 2010 14:29:42 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMETgDL016666; Wed, 22 Dec 2010 14:29:42 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201012221429.oBMETgDL016666@svn.freebsd.org> From: Ken Smith Date: Wed, 22 Dec 2010 14:29:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216654 - stable/8/sys/sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:29:42 -0000 Author: kensmith Date: Wed Dec 22 14:29:42 2010 New Revision: 216654 URL: http://svn.freebsd.org/changeset/base/216654 Log: Adjust __FreeBSD_version to reflect we're past the point of branching releng/8.2 in preparation for the FreeBSD 8.2 release. Approved by: re (implicit) Modified: stable/8/sys/sys/param.h Modified: stable/8/sys/sys/param.h ============================================================================== --- stable/8/sys/sys/param.h Wed Dec 22 14:27:13 2010 (r216653) +++ stable/8/sys/sys/param.h Wed Dec 22 14:29:42 2010 (r216654) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 801501 /* Master, propagated to newvers */ +#define __FreeBSD_version 802500 /* Master, propagated to newvers */ #ifdef _KERNEL #define P_OSREL_SIGSEGV 700004 From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:31:42 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83CE71065672; Wed, 22 Dec 2010 14:31:42 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 725EF8FC21; Wed, 22 Dec 2010 14:31:42 +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 oBMEVg2N016750; Wed, 22 Dec 2010 14:31:42 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMEVg9Q016748; Wed, 22 Dec 2010 14:31:42 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201012221431.oBMEVg9Q016748@svn.freebsd.org> From: Ken Smith Date: Wed, 22 Dec 2010 14:31:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216655 - stable/8/usr.sbin/pkg_install/add X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:31:42 -0000 Author: kensmith Date: Wed Dec 22 14:31:42 2010 New Revision: 216655 URL: http://svn.freebsd.org/changeset/base/216655 Log: Add the packages directories that will be used for the upcoming 8.2/7.4 releases. Approved by: re (implicit) Modified: stable/8/usr.sbin/pkg_install/add/main.c Modified: stable/8/usr.sbin/pkg_install/add/main.c ============================================================================== --- stable/8/usr.sbin/pkg_install/add/main.c Wed Dec 22 14:29:42 2010 (r216654) +++ stable/8/usr.sbin/pkg_install/add/main.c Wed Dec 22 14:31:42 2010 (r216655) @@ -83,8 +83,10 @@ struct { { 701000, 701099, "/packages-7.1-release" }, { 702000, 702099, "/packages-7.2-release" }, { 703000, 703099, "/packages-7.3-release" }, + { 704000, 704099, "/packages-7.4-release" }, { 800000, 800499, "/packages-8.0-release" }, { 801000, 801499, "/packages-8.1-release" }, + { 802000, 802499, "/packages-8.2-release" }, { 300000, 399000, "/packages-3-stable" }, { 400000, 499000, "/packages-4-stable" }, { 502100, 502128, "/packages-5-current" }, From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:43:21 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EA711065670; Wed, 22 Dec 2010 14:43:21 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F17908FC12; Wed, 22 Dec 2010 14:43: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 oBMEhKIB016988; Wed, 22 Dec 2010 14:43:20 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMEhKC5016986; Wed, 22 Dec 2010 14:43:20 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201012221443.oBMEhKC5016986@svn.freebsd.org> From: Ken Smith Date: Wed, 22 Dec 2010 14:43: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: r216656 - stable/7/gnu/usr.bin/groff/tmac X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:43:21 -0000 Author: kensmith Date: Wed Dec 22 14:43:20 2010 New Revision: 216656 URL: http://svn.freebsd.org/changeset/base/216656 Log: Adjust the version of FreeBSD printed on the manual pages. Approved by: re (implicit) Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- stable/7/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 22 14:31:42 2010 (r216655) +++ stable/7/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 22 14:43:20 2010 (r216656) @@ -64,7 +64,7 @@ .ds doc-volume-as-arm arm . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~7.3 +.ds doc-default-operating-system FreeBSD\~7.4 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 @@ -75,6 +75,7 @@ .ds doc-operating-system-FreeBSD-7.4 7.4 .ds doc-operating-system-FreeBSD-8.0 8.0 .ds doc-operating-system-FreeBSD-8.1 8.1 +.ds doc-operating-system-FreeBSD-8.2 8.2 .ds doc-operating-system-FreeBSD-9.0 9.0 . .ec From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:44:22 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC1A51065698; Wed, 22 Dec 2010 14:44:22 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AB4D48FC2D; Wed, 22 Dec 2010 14:44:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBMEiMYR017059; Wed, 22 Dec 2010 14:44:22 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMEiMC6017057; Wed, 22 Dec 2010 14:44:22 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201012221444.oBMEiMC6017057@svn.freebsd.org> From: Ken Smith Date: Wed, 22 Dec 2010 14:44:22 +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: r216657 - stable/7/release X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:44:22 -0000 Author: kensmith Date: Wed Dec 22 14:44:22 2010 New Revision: 216657 URL: http://svn.freebsd.org/changeset/base/216657 Log: Misc. 7.3 -> 7.4 adjustments as part of progress on the FreeBSD 7.4 release. Approved by: re (implicit) Modified: stable/7/release/Makefile Modified: stable/7/release/Makefile ============================================================================== --- stable/7/release/Makefile Wed Dec 22 14:43:20 2010 (r216656) +++ stable/7/release/Makefile Wed Dec 22 14:44:22 2010 (r216657) @@ -24,11 +24,11 @@ # Set these, release builder! # # Fixed version: -#BUILDNAME=7.3-STABLE +#BUILDNAME=7.4-STABLE # # Automatic SNAP versioning: DATE != date +%Y%m%d -BASE = 7.3 +BASE = 7.4 BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:45:43 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F10EC106564A; Wed, 22 Dec 2010 14:45:43 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E01F88FC24; Wed, 22 Dec 2010 14:45:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBMEjhou017129; Wed, 22 Dec 2010 14:45:43 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMEjhpS017127; Wed, 22 Dec 2010 14:45:43 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201012221445.oBMEjhpS017127@svn.freebsd.org> From: Ken Smith Date: Wed, 22 Dec 2010 14:45:43 +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: r216658 - stable/7/sys/sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:45:44 -0000 Author: kensmith Date: Wed Dec 22 14:45:43 2010 New Revision: 216658 URL: http://svn.freebsd.org/changeset/base/216658 Log: Adjust __FreeBSD_version to reflect that the branch for the FreeBSD 7.4 release has happened. Approved by: re (implicit) Modified: stable/7/sys/sys/param.h Modified: stable/7/sys/sys/param.h ============================================================================== --- stable/7/sys/sys/param.h Wed Dec 22 14:44:22 2010 (r216657) +++ stable/7/sys/sys/param.h Wed Dec 22 14:45:43 2010 (r216658) @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 703100 /* Master, propagated to newvers */ +#define __FreeBSD_version 704100 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:46:39 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EABE1065695; Wed, 22 Dec 2010 14:46:39 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F17858FC28; Wed, 22 Dec 2010 14:46: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 oBMEkcod017191; Wed, 22 Dec 2010 14:46:38 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMEkcYY017189; Wed, 22 Dec 2010 14:46:38 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201012221446.oBMEkcYY017189@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 22 Dec 2010 14:46:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216659 - stable/8/release/powerpc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:46:39 -0000 Author: nwhitehorn Date: Wed Dec 22 14:46:38 2010 New Revision: 216659 URL: http://svn.freebsd.org/changeset/base/216659 Log: MFC r216469: Fix the overflowing livefs ISO by removing man pages from the HFS part of the hybrid disk. This is a stopgap until a better solution can be found, but lets the powerpc release build complete for the time being. Approved by: re (kensmith) Modified: stable/8/release/powerpc/mkisoimages.sh Directory Properties: stable/8/release/powerpc/ (props changed) Modified: stable/8/release/powerpc/mkisoimages.sh ============================================================================== --- stable/8/release/powerpc/mkisoimages.sh Wed Dec 22 14:45:43 2010 (r216658) +++ stable/8/release/powerpc/mkisoimages.sh Wed Dec 22 14:46:38 2010 (r216659) @@ -25,7 +25,7 @@ if [ "x$1" = "x-b" ]; then cp /usr/src/release/powerpc/boot.tbxi ${4}/boot - bootable="-hfs-bless ${4}/boot -map /usr/src/release/powerpc/hfs.map" + bootable="-hfs -hfs-bless ${4}/boot -map /usr/src/release/powerpc/hfs.map -hide-hfs ${4}/usr/share/man" shift else bootable="" @@ -54,4 +54,4 @@ fi LABEL=$1; shift NAME=$1; shift -mkisofs $bootable -r -hfs -part -no-desktop -hfs-volid $LABEL -l -J -allow-leading-dots -o $NAME $* +mkisofs $bootable -l -r -part -no-desktop -V $LABEL -o $NAME $* From owner-svn-src-stable@FreeBSD.ORG Wed Dec 22 14:47:45 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87F11106566B; Wed, 22 Dec 2010 14:47:45 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 768D38FC08; Wed, 22 Dec 2010 14:47:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBMElj45017260; Wed, 22 Dec 2010 14:47:45 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBMEljbC017258; Wed, 22 Dec 2010 14:47:45 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201012221447.oBMEljbC017258@svn.freebsd.org> From: Ken Smith Date: Wed, 22 Dec 2010 14:47:45 +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: r216660 - stable/7/usr.sbin/pkg_install/add X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Dec 2010 14:47:45 -0000 Author: kensmith Date: Wed Dec 22 14:47:45 2010 New Revision: 216660 URL: http://svn.freebsd.org/changeset/base/216660 Log: Add the package directories for the 7.4, 8.1, and 8.2 releases. Approved by: re (implicit) Modified: stable/7/usr.sbin/pkg_install/add/main.c Modified: stable/7/usr.sbin/pkg_install/add/main.c ============================================================================== --- stable/7/usr.sbin/pkg_install/add/main.c Wed Dec 22 14:46:38 2010 (r216659) +++ stable/7/usr.sbin/pkg_install/add/main.c Wed Dec 22 14:47:45 2010 (r216660) @@ -83,7 +83,10 @@ struct { { 701000, 701099, "/packages-7.1-release" }, { 702000, 702099, "/packages-7.2-release" }, { 703000, 703099, "/packages-7.3-release" }, + { 704000, 704099, "/packages-7.4-release" }, { 800000, 800499, "/packages-8.0-release" }, + { 801000, 801499, "/packages-8.1-release" }, + { 802000, 802499, "/packages-8.2-release" }, { 300000, 399000, "/packages-3-stable" }, { 400000, 499000, "/packages-4-stable" }, { 502100, 502128, "/packages-5-current" },