From owner-svn-src-stable-7@FreeBSD.ORG Sun Dec 19 06:09:02 2010 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 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-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 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-7@FreeBSD.ORG Sun Dec 19 20:11:21 2010 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 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-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 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-7@FreeBSD.ORG Sun Dec 19 20:12:44 2010 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 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-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 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-7@FreeBSD.ORG Tue Dec 21 09:33:06 2010 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 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-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, 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-7@FreeBSD.ORG Wed Dec 22 14:43:21 2010 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 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-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 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-7@FreeBSD.ORG Wed Dec 22 14:44:22 2010 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 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-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 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-7@FreeBSD.ORG Wed Dec 22 14:45:43 2010 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 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-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 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-7@FreeBSD.ORG Wed Dec 22 14:47:45 2010 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 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-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 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" },