From owner-svn-src-projects@FreeBSD.ORG Sun Nov 16 15:31:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA589838; Sun, 16 Nov 2014 15:31:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C78C5617; Sun, 16 Nov 2014 15:31:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGFVoTS047937; Sun, 16 Nov 2014 15:31:50 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAGFVovY047935; Sun, 16 Nov 2014 15:31:50 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411161531.sAGFVovY047935@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 16 Nov 2014 15:31:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274586 - projects/routing/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Nov 2014 15:31:51 -0000 Author: melifaro Date: Sun Nov 16 15:31:49 2014 New Revision: 274586 URL: https://svnweb.freebsd.org/changeset/base/274586 Log: Remove unused rt_endzero define. Remove rt_mtx from public rtentry version. Modified: projects/routing/sys/net/route.h projects/routing/sys/net/route_internal.h Modified: projects/routing/sys/net/route.h ============================================================================== --- projects/routing/sys/net/route.h Sun Nov 16 14:56:31 2014 (r274585) +++ projects/routing/sys/net/route.h Sun Nov 16 15:31:49 2014 (r274586) @@ -137,8 +137,6 @@ struct rtentry { u_long rt_mtu; /* MTU for this path */ u_long rt_weight; /* absolute weight */ u_long rt_expire; /* lifetime for route, e.g. redirect */ -#define rt_endzero rt_mtx - struct mtx rt_mtx; /* mutex for routing entry */ }; #endif /* !_KERNEL || _WANT_RTENTRY */ Modified: projects/routing/sys/net/route_internal.h ============================================================================== --- projects/routing/sys/net/route_internal.h Sun Nov 16 14:56:31 2014 (r274585) +++ projects/routing/sys/net/route_internal.h Sun Nov 16 15:31:49 2014 (r274586) @@ -82,7 +82,6 @@ struct rtentry { u_long rt_mtu; /* MTU for this path */ u_long rt_weight; /* absolute weight */ u_long rt_expire; /* lifetime for route, e.g. redirect */ -#define rt_endzero rt_mtx struct mtx rt_mtx; /* mutex for routing entry */ }; From owner-svn-src-projects@FreeBSD.ORG Sun Nov 16 18:11:00 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EC5EFC2 for ; Sun, 16 Nov 2014 18:11:00 +0000 (UTC) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 090EC5DF for ; Sun, 16 Nov 2014 18:10:59 +0000 (UTC) Received: by mail-pa0-f42.google.com with SMTP id et14so5963166pad.1 for ; Sun, 16 Nov 2014 10:10:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:message-id:references:to; bh=QrpdbHzy8mPaI6Cln8MJEjaXAFTX+e1jhIr25QaS3ek=; b=GxC1yCQcxuIEgwxxAgB5mPAIQPuZJF/Q+P+ISjxMGqLUI8t9yA+A3QKcoSbUunb+c1 WgqyQd0mvqYxuN+hV8Quyfw4DsptrTzh4i5QtG80RJwM+caqW6/9jiSHpcOrGMQcV7NG pIU3or8kHcAx1wtbIPj8AAkMMOrkrX2PkOfEFSyYxvBZ1oYvskIh6KFqLLLjMKltV/gu u/jnQrn/IbhRIe/laE+xCpDDewZiWLW+jl1io7GVyGvFYd2GQ8k7xe4EI+cGBAYob1IZ GmRTKTAMVCbcw/erp0INDArs2z6EDACe8QGSJ5+a+Fd5XKh33u0hP8yPOBTj5NKGhgv+ 75BQ== X-Gm-Message-State: ALoCoQlTAnEOu+tj1NeNitDOvU/dEukFIM84eMki0q2X8Zr+UoEWEH0YYh8eXL/2pWgJn+itf8tX X-Received: by 10.70.19.206 with SMTP id h14mr24397074pde.49.1416161453633; Sun, 16 Nov 2014 10:10:53 -0800 (PST) Received: from lgwl-achen.corp.netflix.com ([69.53.236.236]) by mx.google.com with ESMTPSA id uq6sm20365637pbc.70.2014.11.16.10.10.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 16 Nov 2014 10:10:52 -0800 (PST) Sender: Warner Losh Content-Type: multipart/signed; boundary="Apple-Mail=_7944AC92-3E5D-4013-AA18-27EB8429D977"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r274513 - in projects/sendfile/sys: kern sys From: Warner Losh In-Reply-To: <1415991101.4781.110.camel@revolution.hippie.lan> Date: Sun, 16 Nov 2014 11:10:45 -0700 Message-Id: References: <201411141555.sAEFtvur007240@svn.freebsd.org> <20141114182504.GE1031@FreeBSD.org> <1415991101.4781.110.camel@revolution.hippie.lan> To: Ian Lepore X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-projects@freebsd.org, Gleb Smirnoff , Sergey Kandaurov , src-committers X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Nov 2014 18:11:00 -0000 --Apple-Mail=_7944AC92-3E5D-4013-AA18-27EB8429D977 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Nov 14, 2014, at 11:51 AM, Ian Lepore wrote: > On Fri, 2014-11-14 at 21:25 +0300, Gleb Smirnoff wrote: >> On Fri, Nov 14, 2014 at 10:23:51PM +0400, Sergey Kandaurov wrote: >> S> On 14 November 2014 18:55, Gleb Smirnoff = wrote: >> S> > Author: glebius >> S> > Date: Fri Nov 14 15:55:56 2014 >> S> > New Revision: 274513 >> S> > URL: https://svnweb.freebsd.org/changeset/base/274513 >> S> > >> S> [...] >> S> > Modified: projects/sendfile/sys/sys/sockbuf.h >> S> > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> S> > --- projects/sendfile/sys/sys/sockbuf.h Fri Nov 14 15:50:16 2014 = (r274512) >> S> > +++ projects/sendfile/sys/sys/sockbuf.h Fri Nov 14 15:55:56 2014 = (r274513) >> S> > @@ -128,6 +128,7 @@ struct sockbuf { >> S> > #define M_NOTREADY M_PROTO1 /* m_data not = populated yet */ >> S> > #define M_BLOCKED M_PROTO2 /* M_NOTREADY in = front of m */ >> S> > #define M_NOTAVAIL (M_NOTREADY | M_BLOCKED) >> S> > +#define M_SBCUTTED M_PROTO3 /* mbuf was = sbcutted out */ >> S>=20 >> S> Seriously? There's no such word in (modern) English :). >>=20 >> I also had such feeling, but translate.google.com convinced me wrong = :) >>=20 >=20 > Cutted is not proper modern English. It is listed by some = dictionaries > as dialectical and nonstandard. I've been speaking English for a bit > less than 55 years and I've never once heard anyone say cutted, or = seen > it in writing. According to the Oxford English Dictionary, cutted, cuttid and cuttit = are all past tense forms used in middle english in the 15th and 16th century = with the sense of =93dividing into two or more parts=94. 1490 Caxton tr. Foure Sonnes of Aymon (1885) i. 56 He cutted hym = asonder. and in the sense of making a work shorter: 1584 King James VI & I Ess. Prentise Poesie sig. Kiij, Maist kyndis = of versis quhilks are not cuttit or broken. But nothing newer than that is listed in OED, nor does Goggle turn up = anything else. Ian (and everybody else on this list) lived about 400-500 years = too late to encounter it :) Warner --Apple-Mail=_7944AC92-3E5D-4013-AA18-27EB8429D977 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJUaOilAAoJEGwc0Sh9sBEAZ3AP/3RAAFlfv2pO1LPvd+oTWgX9 IgK691BFI3pdPZaEjdoQlkbA7zBoT3vxTuDwQjSSwvOZL/xdkO3bMN4lKGT5WMi5 vJy3u0BOZ6SPhZ42mBwg2EhIRA9VzjK46Jr99O/sEgS/Qw1TI5ZuHNvEw9/5hdET +Ipm5k2ueAwJWppskmLXfHbFuw8jDTQPGQdDhHKTc+aR62NUT/M42HaWyQpbT0Y4 5dXRjwU6KoF9T5tVfnSim0vcgutmeDRWUHZd5xXzTFl4DXnJN4pn+vW8/6dAuQAJ eJhfIswK1+7gSEGv22CT+yL77v4lsu8DtAw24QI+oIb4XKkFxmadoz/ZMjwehV7O U3rXiJ4bOTBYDi8r3Fvg1OBOlkrL2wFVGmkVwDGjuWPh70gLO2DZCoJLNox/Se8C C58IN7JQCkLBxuSMlp6n8oL/R0YRUUbh6eyY2HFLJr+KuDr1JHj1UeGHU7chGySQ JWTItvSYZpAXVMLi1qltFqwFzQCnm0Iftjki2fI3nr9tv86WzLcPFEaAHyPIt+gr oZLuHC+69DJx1DRT0NlDc5KouRU2fufXEmDSVVzS7DqIstPOZw7I2/c5CYJWpJma XBInZltRzr97VP9rt/f21b35EY7kI9mB285ikk0XCkqYXQYCSW+Fjvg8Dt52cCT6 FnGcDV7X7E0QMjVAL3So =do1W -----END PGP SIGNATURE----- --Apple-Mail=_7944AC92-3E5D-4013-AA18-27EB8429D977-- From owner-svn-src-projects@FreeBSD.ORG Sun Nov 16 18:44:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35A96712; Sun, 16 Nov 2014 18:44:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21FA397E; Sun, 16 Nov 2014 18:44:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGIikNi036459; Sun, 16 Nov 2014 18:44:46 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAGIikKq036455; Sun, 16 Nov 2014 18:44:46 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411161844.sAGIikKq036455@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 16 Nov 2014 18:44:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274590 - projects/routing/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Nov 2014 18:44:47 -0000 Author: melifaro Date: Sun Nov 16 18:44:46 2014 New Revision: 274590 URL: https://svnweb.freebsd.org/changeset/base/274590 Log: Finish r274335: * put RT_LOCK_DESTROY() back * remove unused RT_UNLOCK_COND macro Modified: projects/routing/sys/net/route.c projects/routing/sys/net/route_internal.h Modified: projects/routing/sys/net/route.c ============================================================================== --- projects/routing/sys/net/route.c Sun Nov 16 18:15:23 2014 (r274589) +++ projects/routing/sys/net/route.c Sun Nov 16 18:44:46 2014 (r274590) @@ -496,6 +496,7 @@ rtfree(struct rtentry *rt) /* * and the rtentry itself of course */ + RT_LOCK_DESTROY(rt); uma_zfree(V_rtzone, rt); return; } Modified: projects/routing/sys/net/route_internal.h ============================================================================== --- projects/routing/sys/net/route_internal.h Sun Nov 16 18:15:23 2014 (r274589) +++ projects/routing/sys/net/route_internal.h Sun Nov 16 18:44:46 2014 (r274590) @@ -91,10 +91,6 @@ struct rtentry { #define RT_UNLOCK(_rt) mtx_unlock(&(_rt)->rt_mtx) #define RT_LOCK_DESTROY(_rt) mtx_destroy(&(_rt)->rt_mtx) #define RT_LOCK_ASSERT(_rt) mtx_assert(&(_rt)->rt_mtx, MA_OWNED) -#define RT_UNLOCK_COND(_rt) do { \ - if (mtx_owned(&(_rt)->rt_mtx)) \ - mtx_unlock(&(_rt)->rt_mtx); \ -} while (0) #define RT_ADDREF(_rt) do { \ RT_LOCK_ASSERT(_rt); \ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 16 20:12:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD592A8B; Sun, 16 Nov 2014 20:12:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B76DD25A; Sun, 16 Nov 2014 20:12:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGKCp1W079145; Sun, 16 Nov 2014 20:12:51 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAGKCofT079139; Sun, 16 Nov 2014 20:12:50 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411162012.sAGKCofT079139@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 16 Nov 2014 20:12:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274594 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Nov 2014 20:12:51 -0000 Author: melifaro Date: Sun Nov 16 20:12:49 2014 New Revision: 274594 URL: https://svnweb.freebsd.org/changeset/base/274594 Log: Rework LLE code locking: * struct llentry is now basically split into 2 pieces: all fields within 64 bytes (amd64) are now protected by both ifdata lock AND lle lock, e.g. you require both locks to be held exclusively for modification. All data necessary for fast path operations is kept here. Some fields were added: - r_l3addr - makes lookup key liev within first 64 bytes. - r_flags - flags, containing pre-compiled decision whether given lle contains usable data or not. Current the only flag is RLLE_VALID. - r_len - prepend data len, currently unused - r_kick - used to provide feedback to control plane (see below). All other fields are protected by lle lock. * Add simple state machine for ARP to handle "about to expire" case: Current model (for the fast path) is the following: - rlock afdata - find / rlock rte - runlock afdata - see if "expire time" is approaching (time_uptime + la->la_preempt > la->la_expire) - if true, call arprequest() and decrease la_preempt - store MAC and runlock rte New model (data plane): - rlock afdata - find rte - check if it can be used using r_* fields only - if true, store MAC - if r_kick field != 0 set it to 0. - runlock afdata New mode (control plane): - schedule arptimer to be called in (V_arpt_keep - V_arp_maxtries) seconds instead of V_arpt_keep. - on first timer invocation change state from ARP_LLINFO_REACHABLE to ARP_LLINFO_VERIFY, sets r_kick to 1 and shedules next call in V_arpt_rexmit (default to 1 sec). - on subsequent timer invocations in ARP_LLINFO_VERIFY state, checks for r_kick value: reschedule if not changed, and send arprequest() if set to zero (e.g. entry was used). * Convert IPv4 path to use new single-lock approach. IPv6 bits to follow. * Slow down in_arpinput(): now valid reply will (in most cases) require acquiring afdata WLOCK twice. This is requirement for storing changed lle data. This change will be slightly optimized in future. * Provide explicit hash link/unlink functions for both ipv4/ipv6 code. This will probably be moved to generic lle code once we have per-AF hashing callback inside lltable. * Perform lle unlink on deletion immediately instead of delaying it to the timer routine. * Make r244183 more explicit: use new LLE_CALLOUTREF flag to indicate the presence of lle reference used for safe callout calls. Modified: projects/routing/sys/net/if_llatbl.c projects/routing/sys/net/if_llatbl.h projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/nd6.c Modified: projects/routing/sys/net/if_llatbl.c ============================================================================== --- projects/routing/sys/net/if_llatbl.c Sun Nov 16 20:10:37 2014 (r274593) +++ projects/routing/sys/net/if_llatbl.c Sun Nov 16 20:12:49 2014 (r274594) @@ -106,11 +106,13 @@ llentry_free(struct llentry *lle) size_t pkts_dropped; struct mbuf *next; - IF_AFDATA_WLOCK_ASSERT(lle->lle_tbl->llt_ifp); LLE_WLOCK_ASSERT(lle); - LIST_REMOVE(lle, lle_next); - lle->la_flags &= ~(LLE_VALID | LLE_LINKED); + if ((lle->la_flags & LLE_LINKED) != 0) { + IF_AFDATA_WLOCK_ASSERT(lle->lle_tbl->llt_ifp); + LIST_REMOVE(lle, lle_next); + lle->la_flags &= ~(LLE_VALID | LLE_LINKED); + } pkts_dropped = 0; while ((lle->la_numheld > 0) && (lle->la_hold != NULL)) { @@ -178,8 +180,10 @@ lltable_free(struct lltable *llt) for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { LLE_WLOCK(lle); - if (callout_stop(&lle->la_timer)) + if (callout_stop(&lle->la_timer)) { LLE_REMREF(lle); + lle->la_flags &= ~LLE_CALLOUTREF; + } llentry_free(lle); } } Modified: projects/routing/sys/net/if_llatbl.h ============================================================================== --- projects/routing/sys/net/if_llatbl.h Sun Nov 16 20:10:37 2014 (r274593) +++ projects/routing/sys/net/if_llatbl.h Sun Nov 16 20:12:49 2014 (r274594) @@ -48,13 +48,24 @@ extern struct rwlock lltable_rwlock; #define LLTABLE_WUNLOCK() rw_wunlock(&lltable_rwlock) #define LLTABLE_LOCK_ASSERT() rw_assert(&lltable_rwlock, RA_LOCKED) -/* - * Code referencing llentry must at least hold - * a shared lock - */ struct llentry { + /* FIELDS PROTECTED BY IFDATA LOCK */ LIST_ENTRY(llentry) lle_next; - struct rwlock lle_lock; + union { + struct in_addr addr4; + struct in6_addr addr6; + } r_l3addr; + union { + uint64_t mac_aligned; + uint16_t mac16[3]; + uint8_t mac8[20]; /* IB needs 20 bytes. */ + char ll_prepend[20]; /* L2 data to prepend */ + } ll_addr; + uint16_t r_flags; /* runtime flags */ + uint16_t r_len; /* length of prepend data */ + uint64_t r_kick; /* for unused lle detection */ + + /* FIELDS PROTECTED BY LLE rwlock */ struct lltable *lle_tbl; struct llentries *lle_head; void (*lle_free)(struct lltable *, struct llentry *); @@ -69,12 +80,7 @@ struct llentry { uint16_t ln_router; time_t ln_ntick; int lle_refcnt; - - union { - uint64_t mac_aligned; - uint16_t mac16[3]; - uint8_t mac8[20]; /* IB needs 20 bytes. */ - } ll_addr; + struct rwlock lle_lock; /* XXX af-private? */ union { @@ -94,8 +100,6 @@ struct llentry { #define LLE_LOCK_DESTROY(lle) rw_destroy(&(lle)->lle_lock) #define LLE_WLOCK_ASSERT(lle) rw_assert(&(lle)->lle_lock, RA_WLOCKED) -#define LLE_IS_VALID(lle) (((lle) != NULL) && ((lle) != (void *)-1)) - #define LLE_ADDREF(lle) do { \ LLE_WLOCK_ASSERT(lle); \ KASSERT((lle)->lle_refcnt >= 0, \ @@ -170,6 +174,11 @@ struct lltable { MALLOC_DECLARE(M_LLTABLE); /* + * LLE flags used by fast path code + */ +#define RLLE_VALID 0x0001 /* ll_addr can be used */ + +/* * Various LLE flags */ #define LLE_DELETED 0x0001 /* entry must be deleted */ @@ -178,8 +187,10 @@ MALLOC_DECLARE(M_LLTABLE); #define LLE_VALID 0x0008 /* ll_addr is valid */ #define LLE_PUB 0x0020 /* publish entry ??? */ #define LLE_LINKED 0x0040 /* linked to lookup structure */ +#define LLE_CALLOUTREF 0x0080 /* callout set */ /* LLE request flags */ -#define LLE_EXCLUSIVE 0x2000 /* return lle xlocked */ +#define LLE_UNLOCKED 0x0100 /* return lle unlocked */ +#define LLE_EXCLUSIVE 0x0200 /* return lle wlocked */ #define LLATBL_HASH(key, mask) \ (((((((key >> 8) ^ key) >> 8) ^ key) >> 8) ^ key) & mask) Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Sun Nov 16 20:10:37 2014 (r274593) +++ projects/routing/sys/netinet/if_ether.c Sun Nov 16 20:12:49 2014 (r274594) @@ -80,6 +80,12 @@ __FBSDID("$FreeBSD$"); #define SIN(s) ((const struct sockaddr_in *)(s)) #define SDL(s) ((struct sockaddr_dl *)s) +/* simple arp state machine */ +#define ARP_LLINFO_INCOMPLETE 0 /* no lle data */ +#define ARP_LLINFO_REACHABLE 1 /* lle is valid */ +#define ARP_LLINFO_VERIFY 2 /* lle valid, re-check needed */ +#define ARP_LLINFO_DELETED 3 /* entry is deleted */ + SYSCTL_DECL(_net_link_ether); static SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, ""); static SYSCTL_NODE(_net_link_ether, PF_ARP, arp, CTLFLAG_RW, 0, ""); @@ -91,6 +97,7 @@ static VNET_DEFINE(int, arp_maxtries) = static VNET_DEFINE(int, arp_proxyall) = 0; static VNET_DEFINE(int, arpt_down) = 20; /* keep incomplete entries for * 20 seconds */ +static VNET_DEFINE(int, arpt_rexmit) = 1; /* retransmit arp entries, sec */ VNET_PCPUSTAT_DEFINE(struct arpstat, arpstat); /* ARP statistics, see if_arp.h */ VNET_PCPUSTAT_SYSINIT(arpstat); @@ -102,6 +109,7 @@ static VNET_DEFINE(int, arp_maxhold) = 1 #define V_arpt_keep VNET(arpt_keep) #define V_arpt_down VNET(arpt_down) +#define V_arpt_rexmit VNET(arpt_rexmit) #define V_arp_maxtries VNET(arp_maxtries) #define V_arp_proxyall VNET(arp_proxyall) #define V_arp_maxhold VNET(arp_maxhold) @@ -168,15 +176,61 @@ arptimer(void *arg) { struct llentry *lle = (struct llentry *)arg; struct ifnet *ifp; + size_t pkts_dropped; + uint16_t la_flags; + int state; if (lle->la_flags & LLE_STATIC) { LLE_WUNLOCK(lle); return; } + la_flags = lle->la_flags; + state = (la_flags & LLE_DELETED) ? ARP_LLINFO_DELETED : lle->ln_state; ifp = lle->lle_tbl->llt_ifp; CURVNET_SET(ifp->if_vnet); + switch (state) { + case ARP_LLINFO_REACHABLE: + + /* + * Expiration time is approaching. + * Let's try to refresh entry if it is still + * in use. + * + * Set r_kick to get feedback from + * fast path. Change state and re-schedule + * ourselves. + */ + lle->r_kick = 1; + lle->ln_state = ARP_LLINFO_VERIFY; + callout_schedule(&lle->la_timer, hz * V_arpt_rexmit); + LLE_WUNLOCK(lle); + return; + case ARP_LLINFO_VERIFY: + if (lle->r_kick == 0 && lle->la_preempt > 0) { + /* Entry was used, issue refresh request */ + struct sockaddr_in *dst; + dst = (struct sockaddr_in *)L3_ADDR(lle); + arprequest(ifp, NULL, &dst->sin_addr, NULL); + lle->la_preempt--; + lle->r_kick = 1; + callout_schedule(&lle->la_timer, hz * V_arpt_rexmit); + LLE_WUNLOCK(lle); + return; + } + /* Nothing happened. Reschedule if not too late */ + if (lle->la_expire > time_uptime) { + callout_schedule(&lle->la_timer, hz * V_arpt_rexmit); + LLE_WUNLOCK(lle); + return; + } + break; + case ARP_LLINFO_INCOMPLETE: + case ARP_LLINFO_DELETED: + break; + } + if ((lle->la_flags & LLE_DELETED) == 0) { int evt; @@ -194,15 +248,17 @@ arptimer(void *arg) IF_AFDATA_LOCK(ifp); LLE_WLOCK(lle); - /* Guard against race with other llentry_free(). */ - if (lle->la_flags & LLE_LINKED) { - size_t pkts_dropped; - + /* + * Note other thread could have removed given entry + * stopping callout and removing LLE reference. + */ + if ((lle->la_flags & LLE_CALLOUTREF) != 0) { LLE_REMREF(lle); - pkts_dropped = llentry_free(lle); - ARPSTAT_ADD(dropped, pkts_dropped); - } else - LLE_FREE_LOCKED(lle); + lle->la_flags &= ~LLE_CALLOUTREF; + } + + pkts_dropped = llentry_free(lle); + ARPSTAT_ADD(dropped, pkts_dropped); IF_AFDATA_UNLOCK(ifp); @@ -295,9 +351,9 @@ int arpresolve_fast(struct ifnet *ifp, struct in_addr dst, u_int mflags, u_char *dst_addr) { - int do_arp, error; struct llentry *la; struct sockaddr_in sin; + const struct sockaddr *sa_dst; if (mflags & M_BCAST) { memcpy(dst_addr, ifp->if_broadcastaddr, ifp->if_addrlen); @@ -308,17 +364,27 @@ arpresolve_fast(struct ifnet *ifp, struc return (0); } - do_arp = 0; - error = EAGAIN; - memset(&sin, 0, sizeof(sin)); sin.sin_addr = dst; sin.sin_family = AF_INET; sin.sin_len = sizeof(sin); + sa_dst = (const struct sockaddr *)&sin; IF_AFDATA_RLOCK(ifp); - la = lla_lookup(LLTABLE(ifp), 0, (const struct sockaddr *)&sin); + la = lla_lookup(LLTABLE(ifp), LLE_UNLOCKED, sa_dst); + if (la != NULL && (la->r_flags & RLLE_VALID) != 0) { + /* Entry found, let's copy lle info */ + bcopy(&la->ll_addr, dst_addr, ifp->if_addrlen); + if (la->r_kick != 0) + la->r_kick = 0; /* Notify that entry was used */ + IF_AFDATA_RUNLOCK(ifp); + return (0); + } + IF_AFDATA_RUNLOCK(ifp); + return (EAGAIN); + +#if 0 /* * XXX: We need to convert all these checks to single one */ @@ -347,8 +413,8 @@ arpresolve_fast(struct ifnet *ifp, struc */ if (do_arp != 0) arprequest(ifp, NULL, &dst, NULL); - return (error); +#endif } @@ -372,7 +438,6 @@ arpresolve(struct ifnet *ifp, struct rte { struct llentry *la = NULL; int is_gw; - uint16_t la_flags; *lle = NULL; if (m != NULL) { @@ -390,38 +455,20 @@ arpresolve(struct ifnet *ifp, struct rte } IF_AFDATA_RLOCK(ifp); - la = lla_lookup(LLTABLE(ifp), 0, dst); - IF_AFDATA_RUNLOCK(ifp); - la_flags = la != NULL ? la->la_flags : 0; - - /* Return to slow path if entry is not found or invalid/expired */ - if (la == NULL || (la_flags & LLE_VALID) == 0 || - ((la_flags & LLE_STATIC) == 0 && la->la_expire <= time_uptime)) { - is_gw = (rt0 != NULL && (rt0->rt_flags & RTF_GATEWAY)) ? 1 : 0; - if (la != NULL) - LLE_RUNLOCK(la); - return (arpresolve_slow(ifp, is_gw, m, dst, desten, lle)); - } - - - /* Entry found, let's copy lle info */ - bcopy(&la->ll_addr, desten, ifp->if_addrlen); - - /* - * If entry has an expiry time and it is approaching, - * see if we need to send an ARP request within this - * arpt_down interval. - */ - if (!(la->la_flags & LLE_STATIC) && - time_uptime + la->la_preempt > la->la_expire) { - arprequest(ifp, NULL, &SIN(dst)->sin_addr, NULL); - la->la_preempt--; + la = lla_lookup(LLTABLE(ifp), LLE_UNLOCKED, dst); + if (la != NULL && (la->r_flags & RLLE_VALID) != 0) { + /* Entry found, let's copy lle info */ + bcopy(&la->ll_addr, desten, ifp->if_addrlen); + if (la->r_kick != 0) + la->r_kick = 0; /* Notify that entry was used */ + IF_AFDATA_RUNLOCK(ifp); + *lle = la; + return (0); } + IF_AFDATA_RUNLOCK(ifp); - /* XXX: Possible use-after-free */ - *lle = la; - LLE_RUNLOCK(la); - return (0); + is_gw = (rt0 != NULL && (rt0->rt_flags & RTF_GATEWAY)) ? 1 : 0; + return (arpresolve_slow(ifp, is_gw, m, dst, desten, lle)); } static int @@ -431,7 +478,7 @@ arpresolve_slow(struct ifnet *ifp, int i struct llentry *la = 0; struct mbuf *curr = NULL; struct mbuf *next = NULL; - int create, error, renew; + int create, error; create = 0; *lle = NULL; @@ -481,7 +528,6 @@ arpresolve_slow(struct ifnet *ifp, int i goto done; } - renew = (la->la_asked == 0 || la->la_expire != time_uptime); /* * There is an arptab entry, but no ethernet address * response yet. Add the mbuf to the list, dropping @@ -518,7 +564,7 @@ arpresolve_slow(struct ifnet *ifp, int i else error = (is_gw != 0) ? EHOSTUNREACH : EHOSTDOWN; - if (renew) { + if (la->la_asked == 0 || la->la_expire != time_uptime) { int canceled; LLE_ADDREF(la); @@ -527,6 +573,8 @@ arpresolve_slow(struct ifnet *ifp, int i arptimer, la); if (canceled) LLE_REMREF(la); + else + la->la_flags |= LLE_CALLOUTREF; la->la_asked++; LLE_WUNLOCK(la); arprequest(ifp, NULL, &SIN(dst)->sin_addr, NULL); @@ -644,7 +692,8 @@ in_arpinput(struct mbuf *m) int op, flags; int req_len; int bridged = 0, is_bridge = 0; - int carped, create; + int canceled, carped, create; + int wtime; struct nhop4_extended nh_ext; struct sockaddr_in sin; sin.sin_len = sizeof(struct sockaddr_in); @@ -849,20 +898,43 @@ match: ifp->if_addrlen); goto drop; } - (void)memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen); - la->la_flags |= LLE_VALID; + /* Check if something has changed */ + if (memcmp(&la->ll_addr, ar_sha(ah), ifp->if_addrlen) != 0 || + (la->la_flags & LLE_VALID) == 0 || + la->la_expire != time_uptime + V_arpt_keep) { + /* use afdata WLOCK to update fields */ + LLE_ADDREF(la); + LLE_WUNLOCK(la); + IF_AFDATA_WLOCK(ifp); + LLE_WLOCK(la); + + /* Update data */ + memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen); + la->la_flags |= LLE_VALID; + la->r_flags |= RLLE_VALID; + if ((la->la_flags & LLE_STATIC) == 0) + la->la_expire = time_uptime + V_arpt_keep; + + IF_AFDATA_WUNLOCK(ifp); + LLE_REMREF(la); + } + + la->ln_state = ARP_LLINFO_REACHABLE; EVENTHANDLER_INVOKE(lle_event, la, LLENTRY_RESOLVED); if (!(la->la_flags & LLE_STATIC)) { - int canceled; + wtime = V_arpt_keep - V_arp_maxtries; + if (wtime < 0) + wtime = V_arpt_keep; LLE_ADDREF(la); - la->la_expire = time_uptime + V_arpt_keep; canceled = callout_reset(&la->la_timer, - hz * V_arpt_keep, arptimer, la); + hz * wtime, arptimer, la); if (canceled) LLE_REMREF(la); + else + la->la_flags |= LLE_CALLOUTREF; } la->la_asked = 0; la->la_preempt = V_arp_maxtries; Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sun Nov 16 20:10:37 2014 (r274593) +++ projects/routing/sys/netinet/in.c Sun Nov 16 20:12:49 2014 (r274594) @@ -76,6 +76,9 @@ static int in_difaddr_ioctl(caddr_t, str static void in_socktrim(struct sockaddr_in *); static void in_purgemaddrs(struct ifnet *); +static void in_lltable_link(struct lltable *llt, struct llentry *lle); +static void in_lltable_unlink(struct llentry *lle); + static VNET_DEFINE(int, nosameprefix); #define V_nosameprefix VNET(nosameprefix) SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET | CTLFLAG_RW, @@ -950,17 +953,21 @@ static struct llentry * in_lltable_new(const struct sockaddr *l3addr, u_int flags) { struct in_llentry *lle; + const struct sockaddr_in *l3addr_sin; lle = malloc(sizeof(struct in_llentry), M_LLTABLE, M_NOWAIT | M_ZERO); if (lle == NULL) /* NB: caller generates msg */ return NULL; + l3addr_sin = (const struct sockaddr_in *)l3addr; + lle->base.r_l3addr.addr4 = l3addr_sin->sin_addr; + lle->l3_addr4 = *l3addr_sin; + /* * For IPv4 this will trigger "arpresolve" to generate * an ARP request. */ lle->base.la_expire = time_uptime; /* mark expired */ - lle->l3_addr4 = *(const struct sockaddr_in *)l3addr; lle->base.lle_refcnt = 1; lle->base.lle_free = in_lltable_free; LLE_LOCK_INIT(&lle->base); @@ -994,8 +1001,10 @@ in_lltable_prefix_free(struct lltable *l pfx, msk) && ((flags & LLE_STATIC) || !(lle->la_flags & LLE_STATIC))) { LLE_WLOCK(lle); - if (callout_stop(&lle->la_timer)) + if (callout_stop(&lle->la_timer)) { LLE_REMREF(lle); + lle->la_flags &= ~LLE_CALLOUTREF; + } pkts_dropped = llentry_free(lle); ARPSTAT_ADD(dropped, pkts_dropped); } @@ -1051,16 +1060,12 @@ in_lltable_find_dst(struct lltable *llt, { struct llentry *lle; struct llentries *lleh; - struct sockaddr_in *sa2; u_int hashkey; hashkey = dst.s_addr; lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; LIST_FOREACH(lle, lleh, lle_next) { - sa2 = satosin(L3_ADDR(lle)); /* XXX: Change to proper L3 */ - if (lle->la_flags & LLE_DELETED) - continue; - if (sa2->sin_addr.s_addr == dst.s_addr) + if (lle->r_l3addr.addr4.s_addr == dst.s_addr) break; } @@ -1091,6 +1096,7 @@ in_lltable_delete(struct lltable *llt, u LLE_WLOCK(lle); lle->la_flags |= LLE_DELETED; EVENTHANDLER_INVOKE(lle_event, lle, LLENTRY_DELETED); + in_lltable_unlink(lle); #ifdef DIAGNOSTIC log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif @@ -1109,8 +1115,6 @@ in_lltable_create(struct lltable *llt, u const struct sockaddr_in *sin = (const struct sockaddr_in *)l3addr; struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - struct llentries *lleh; - u_int hashkey; IF_AFDATA_WLOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET, @@ -1145,16 +1149,38 @@ in_lltable_create(struct lltable *llt, u lle->la_flags |= (LLE_VALID | LLE_STATIC); } - hashkey = sin->sin_addr.s_addr; + in_lltable_link(llt, lle); + LLE_WLOCK(lle); + + return (lle); +} + +static void +in_lltable_link(struct lltable *llt, struct llentry *lle) +{ + struct in_addr dst; + struct llentries *lleh; + u_int hashkey; + + dst = lle->r_l3addr.addr4; + hashkey = dst.s_addr; lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; lle->lle_tbl = llt; lle->lle_head = lleh; lle->la_flags |= LLE_LINKED; LIST_INSERT_HEAD(lleh, lle, lle_next); - LLE_WLOCK(lle); - return (lle); +} + +static void +in_lltable_unlink(struct llentry *lle) +{ + + LIST_REMOVE(lle, lle_next); + lle->la_flags &= ~(LLE_VALID | LLE_LINKED); + lle->lle_tbl = NULL; + lle->lle_head = NULL; } /* @@ -1164,32 +1190,23 @@ in_lltable_create(struct lltable *llt, u static struct llentry * in_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) { - const struct sockaddr_in *sin = (const struct sockaddr_in *)l3addr; struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - struct llentries *lleh; - u_int hashkey; + struct in_addr dst; IF_AFDATA_LOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); - hashkey = sin->sin_addr.s_addr; - lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; - LIST_FOREACH(lle, lleh, lle_next) { - struct sockaddr_in *sa2 = satosin(L3_ADDR(lle)); - if (lle->la_flags & LLE_DELETED) - continue; - if (sa2->sin_addr.s_addr == sin->sin_addr.s_addr) - break; - } + dst = ((const struct sockaddr_in *)l3addr)->sin_addr; + lle = in_lltable_find_dst(llt, dst); if (lle == NULL) return (NULL); if (flags & LLE_EXCLUSIVE) LLE_WLOCK(lle); - else + else if ((flags & LLE_UNLOCKED) == 0) LLE_RLOCK(lle); return (lle); @@ -1216,9 +1233,6 @@ in_lltable_dump(struct lltable *llt, str LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { struct sockaddr_dl *sdl; - /* skip deleted entries */ - if ((lle->la_flags & LLE_DELETED) == LLE_DELETED) - continue; /* Skip if jailed and not a valid IP of the prison. */ if (prison_if(wr->td->td_ucred, L3_ADDR(lle)) != 0) continue; Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Sun Nov 16 20:10:37 2014 (r274593) +++ projects/routing/sys/netinet6/in6.c Sun Nov 16 20:12:49 2014 (r274594) @@ -151,6 +151,9 @@ static int in6_update_ifa_internal(struc static int in6_broadcast_ifa(struct ifnet *, struct in6_aliasreq *, struct in6_ifaddr *, int); +static void in6_lltable_link(struct lltable *llt, struct llentry *lle); +static void in6_lltable_unlink(struct llentry *lle); + #define ifa2ia6(ifa) ((struct in6_ifaddr *)(ifa)) #define ia62ifa(ia6) (&((ia6)->ia_ifa)) @@ -2117,12 +2120,15 @@ static struct llentry * in6_lltable_new(const struct sockaddr *l3addr, u_int flags) { struct in6_llentry *lle; + const struct sockaddr_in6 *l3addr_sin6; lle = malloc(sizeof(struct in6_llentry), M_LLTABLE, M_NOWAIT | M_ZERO); if (lle == NULL) /* NB: caller generates msg */ return NULL; - lle->l3_addr6 = *(const struct sockaddr_in6 *)l3addr; + l3addr_sin6 = (const struct sockaddr_in6 *)l3addr; + lle->l3_addr6 = *l3addr_sin6; + lle->base.r_l3addr.addr6 = l3addr_sin6->sin6_addr; lle->base.lle_refcnt = 1; lle->base.lle_free = in6_lltable_free; LLE_LOCK_INIT(&lle->base); @@ -2154,8 +2160,10 @@ in6_lltable_prefix_free(struct lltable * ((flags & LLE_STATIC) || !(lle->la_flags & LLE_STATIC))) { LLE_WLOCK(lle); - if (callout_stop(&lle->la_timer)) + if (callout_stop(&lle->la_timer)) { LLE_REMREF(lle); + lle->la_flags &= ~LLE_CALLOUTREF; + } llentry_free(lle); } } @@ -2210,10 +2218,7 @@ in6_lltable_find_dst(struct lltable *llt hashkey = dst->s6_addr32[3]; lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; LIST_FOREACH(lle, lleh, lle_next) { - struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)L3_ADDR(lle); - if (lle->la_flags & LLE_DELETED) - continue; - if (bcmp(&sa6->sin6_addr, dst, sizeof(struct in6_addr)) == 0) + if (IN6_ARE_ADDR_EQUAL(&lle->r_l3addr.addr6, dst) != 0) break; } @@ -2240,6 +2245,7 @@ in6_lltable_delete(struct lltable *llt, if (!(lle->la_flags & LLE_IFADDR) || (flags & LLE_IFADDR)) { LLE_WLOCK(lle); lle->la_flags |= LLE_DELETED; + in6_lltable_unlink(lle); #ifdef DIAGNOSTIC log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif @@ -2259,8 +2265,6 @@ in6_lltable_create(struct lltable *llt, const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - struct llentries *lleh; - u_int hashkey; IF_AFDATA_WLOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET6, @@ -2293,18 +2297,41 @@ in6_lltable_create(struct lltable *llt, lle->la_flags |= (LLE_VALID | LLE_STATIC); } - hashkey = sin6->sin6_addr.s6_addr32[3]; + in6_lltable_link(llt, lle); + LLE_WLOCK(lle); + + return (lle); +} + +static void +in6_lltable_link(struct lltable *llt, struct llentry *lle) +{ + struct in6_addr dst; + struct llentries *lleh; + u_int hashkey; + + dst = lle->r_l3addr.addr6;; + hashkey = dst.s6_addr32[3]; lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; lle->lle_tbl = llt; lle->lle_head = lleh; lle->la_flags |= LLE_LINKED; LIST_INSERT_HEAD(lleh, lle, lle_next); - LLE_WLOCK(lle); - return (lle); } +static void +in6_lltable_unlink(struct llentry *lle) +{ + + LIST_REMOVE(lle, lle_next); + lle->la_flags &= ~(LLE_VALID | LLE_LINKED); + lle->lle_tbl = NULL; + lle->lle_head = NULL; +} + + static struct llentry * in6_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) @@ -2358,8 +2385,8 @@ in6_lltable_dump(struct lltable *llt, st LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { struct sockaddr_dl *sdl; - /* skip deleted or invalid entries */ - if ((lle->la_flags & (LLE_DELETED|LLE_VALID)) != LLE_VALID) + /* skip invalid entries */ + if ((lle->la_flags & LLE_VALID) == 0) continue; /* Skip if jailed and not a valid IP of the prison. */ if (prison_if(wr->td->td_ucred, L3_ADDR(lle)) != 0) Modified: projects/routing/sys/netinet6/nd6.c ============================================================================== --- projects/routing/sys/netinet6/nd6.c Sun Nov 16 20:10:37 2014 (r274593) +++ projects/routing/sys/netinet6/nd6.c Sun Nov 16 20:12:49 2014 (r274594) @@ -447,6 +447,8 @@ nd6_llinfo_settimer_locked(struct llentr } if (canceled) LLE_REMREF(ln); + else + ln->la_flags |= LLE_CALLOUTREF; } void @@ -1138,12 +1140,16 @@ nd6_free(struct llentry *ln, int gc) IF_AFDATA_LOCK(ifp); LLE_WLOCK(ln); - /* Guard against race with other llentry_free(). */ - if (ln->la_flags & LLE_LINKED) { + /* + * Note other thread could have removed given entry + * stopping callout and removing LLE reference. + */ + if ((ln->la_flags & LLE_CALLOUTREF) != 0) { LLE_REMREF(ln); - llentry_free(ln); - } else - LLE_FREE_LOCKED(ln); + ln->la_flags &= ~LLE_CALLOUTREF; + } + + llentry_free(ln); IF_AFDATA_UNLOCK(ifp); From owner-svn-src-projects@FreeBSD.ORG Tue Nov 18 14:00:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 790742A6; Tue, 18 Nov 2014 14:00:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 664AB960; Tue, 18 Nov 2014 14:00:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAIE01nw061679; Tue, 18 Nov 2014 14:00:01 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAIE01hw061676; Tue, 18 Nov 2014 14:00:01 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411181400.sAIE01hw061676@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 18 Nov 2014 14:00:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274654 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Nov 2014 14:00:01 -0000 Author: glebius Date: Tue Nov 18 14:00:00 2014 New Revision: 274654 URL: https://svnweb.freebsd.org/changeset/base/274654 Log: Remove blank lines. Submitted by: kib Modified: projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Tue Nov 18 13:38:09 2014 (r274653) +++ projects/sendfile/sys/vm/vnode_pager.c Tue Nov 18 14:00:00 2014 (r274654) @@ -1060,11 +1060,8 @@ vnode_pager_generic_getpages_done_async( int error; error = vnode_pager_generic_getpages_done(sc); - vm_page_xunbusy(sc->m[sc->reqpage]); - sc->iodone(sc->arg, error); - free(sc, M_TEMP); } From owner-svn-src-projects@FreeBSD.ORG Tue Nov 18 14:56:17 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D9BC40D; Tue, 18 Nov 2014 14:56:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8ADE482; Tue, 18 Nov 2014 14:56:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAIEuHkQ089640; Tue, 18 Nov 2014 14:56:17 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAIEuHc1089639; Tue, 18 Nov 2014 14:56:17 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411181456.sAIEuHc1089639@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 18 Nov 2014 14:56:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274657 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Nov 2014 14:56:17 -0000 Author: glebius Date: Tue Nov 18 14:56:16 2014 New Revision: 274657 URL: https://svnweb.freebsd.org/changeset/base/274657 Log: - Rename getpages_softc to getpages_data. - Remove local variables in vnode_pager_generic_getpages_done(). Reviewed by: kib Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Tue Nov 18 14:12:19 2014 (r274656) +++ projects/sendfile/sys/vm/vnode_pager.c Tue Nov 18 14:56:16 2014 (r274657) @@ -82,15 +82,15 @@ __FBSDID("$FreeBSD$"); * to vnode_pager_generic_getpages_done() either to * vnode_pager_generic_getpages_done_async(). */ -struct getpages_softc { +struct getpages_data { vm_page_t *m; struct buf *bp; vm_object_t object; vm_offset_t kva; off_t foff; + boolean_t unmapped; int size; int count; - int unmapped; int reqpage; void (*iodone)(void *, int); void *arg; @@ -110,7 +110,7 @@ static void vnode_pager_putpages(vm_obje static boolean_t vnode_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); static vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t, struct ucred *cred); -static int vnode_pager_generic_getpages_done(struct getpages_softc *); +static int vnode_pager_generic_getpages_done(struct getpages_data *); static void vnode_pager_generic_getpages_done_async(struct buf *); struct pagerops vnodepagerops = { @@ -1009,45 +1009,45 @@ vnode_pager_generic_getpages(struct vnod bp->b_iooffset = dbtob(bp->b_blkno); if (iodone) { /* async */ - struct getpages_softc *sc; + struct getpages_data *d; - sc = malloc(sizeof(*sc), M_TEMP, M_WAITOK); + d = malloc(sizeof(*d), M_TEMP, M_WAITOK); - sc->m = m; - sc->bp = bp; - sc->object = object; - sc->foff = foff; - sc->size = size; - sc->count = count; - sc->unmapped = unmapped; - sc->reqpage = reqpage; - sc->kva = kva; + d->m = m; + d->bp = bp; + d->object = object; + d->foff = foff; + d->size = size; + d->count = count; + d->unmapped = unmapped; + d->reqpage = reqpage; + d->kva = kva; - sc->iodone = iodone; - sc->arg = arg; + d->iodone = iodone; + d->arg = arg; bp->b_iodone = vnode_pager_generic_getpages_done_async; - bp->b_caller1 = sc; + bp->b_caller1 = d; BUF_KERNPROC(bp); bstrategy(bp); /* Good bye! */ } else { - struct getpages_softc sc; + struct getpages_data d; - sc.m = m; - sc.bp = bp; - sc.object = object; - sc.foff = foff; - sc.size = size; - sc.count = count; - sc.unmapped = unmapped; - sc.reqpage = reqpage; - sc.kva = kva; + d.m = m; + d.bp = bp; + d.object = object; + d.foff = foff; + d.size = size; + d.count = count; + d.unmapped = unmapped; + d.reqpage = reqpage; + d.kva = kva; bp->b_iodone = bdone; bstrategy(bp); bwait(bp, PVM, "vnread"); - error = vnode_pager_generic_getpages_done(&sc); + error = vnode_pager_generic_getpages_done(&d); } return (error ? VM_PAGER_ERROR : VM_PAGER_OK); @@ -1056,71 +1056,59 @@ vnode_pager_generic_getpages(struct vnod static void vnode_pager_generic_getpages_done_async(struct buf *bp) { - struct getpages_softc *sc = bp->b_caller1; + struct getpages_data *d = bp->b_caller1; int error; - error = vnode_pager_generic_getpages_done(sc); - vm_page_xunbusy(sc->m[sc->reqpage]); - sc->iodone(sc->arg, error); - free(sc, M_TEMP); + error = vnode_pager_generic_getpages_done(d); + vm_page_xunbusy(d->m[d->reqpage]); + d->iodone(d->arg, error); + free(d, M_TEMP); } static int -vnode_pager_generic_getpages_done(struct getpages_softc *sc) +vnode_pager_generic_getpages_done(struct getpages_data *d) { - vm_object_t object; - vm_offset_t kva; - vm_page_t *m; - struct buf *bp; - off_t foff, tfoff, nextoff; - int i, size, count, unmapped, reqpage; - int error = 0; - - m = sc->m; - bp = sc->bp; - object = sc->object; - foff = sc->foff; - size = sc->size; - count = sc->count; - unmapped = sc->unmapped; - reqpage = sc->reqpage; - kva = sc->kva; + off_t tfoff, nextoff; + int i, error; - if ((bp->b_ioflags & BIO_ERROR) != 0) + if ((d->bp->b_ioflags & BIO_ERROR) != 0) error = EIO; + else + error = 0; - if (error == 0 && size != count * PAGE_SIZE) { - if ((bp->b_flags & B_UNMAPPED) != 0) { - bp->b_flags &= ~B_UNMAPPED; - pmap_qenter(kva, m, count); + if (error == 0 && d->size != d->count * PAGE_SIZE) { + if ((d->bp->b_flags & B_UNMAPPED) != 0) { + d->bp->b_flags &= ~B_UNMAPPED; + pmap_qenter(d->kva, d->m, d->count); } - bzero((caddr_t)kva + size, PAGE_SIZE * count - size); + bzero((caddr_t)d->kva + d->size, + PAGE_SIZE * d->count - d->size); } - if ((bp->b_flags & B_UNMAPPED) == 0) - pmap_qremove(kva, count); - if (unmapped) { - bp->b_data = (caddr_t)kva; - bp->b_kvabase = (caddr_t)kva; - bp->b_flags &= ~B_UNMAPPED; - for (i = 0; i < count; i++) - bp->b_pages[i] = NULL; + if ((d->bp->b_flags & B_UNMAPPED) == 0) + pmap_qremove(d->kva, d->count); + if (d->unmapped) { + d->bp->b_data = (caddr_t)d->kva; + d->bp->b_kvabase = (caddr_t)d->kva; + d->bp->b_flags &= ~B_UNMAPPED; + for (i = 0; i < d->count; i++) + d->bp->b_pages[i] = NULL; } /* * free the buffer header back to the swap buffer pool */ - bp->b_vp = NULL; - pbrelbo(bp); - relpbuf(bp, &vnode_pbuf_freecnt); + d->bp->b_vp = NULL; + pbrelbo(d->bp); + relpbuf(d->bp, &vnode_pbuf_freecnt); - VM_OBJECT_WLOCK(object); - for (i = 0, tfoff = foff; i < count; i++, tfoff = nextoff) { + VM_OBJECT_WLOCK(d->object); + for (i = 0, tfoff = d->foff; i < d->count; i++, tfoff = nextoff) { vm_page_t mt; nextoff = tfoff + PAGE_SIZE; - mt = m[i]; + mt = d->m[i]; - if (nextoff <= object->un_pager.vnp.vnp_size) { + if (nextoff <= d->object->un_pager.vnp.vnp_size) { /* * Read filled up entire page. */ @@ -1140,17 +1128,17 @@ vnode_pager_generic_getpages_done(struct * read. */ vm_page_set_valid_range(mt, 0, - object->un_pager.vnp.vnp_size - tfoff); + d->object->un_pager.vnp.vnp_size - tfoff); KASSERT((mt->dirty & vm_page_bits(0, - object->un_pager.vnp.vnp_size - tfoff)) == 0, + d->object->un_pager.vnp.vnp_size - tfoff)) == 0, ("vnode_pager_generic_getpages: page %p is dirty", mt)); } - if (i != reqpage) + if (i != d->reqpage) vm_page_readahead_finish(mt); } - VM_OBJECT_WUNLOCK(object); + VM_OBJECT_WUNLOCK(d->object); if (error) { printf("vnode_pager_getpages: I/O read error\n"); } From owner-svn-src-projects@FreeBSD.ORG Tue Nov 18 15:02:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53C8E5AD; Tue, 18 Nov 2014 15:02:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 406DF165; Tue, 18 Nov 2014 15:02:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAIF2DpU093885; Tue, 18 Nov 2014 15:02:13 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAIF2CTR093882; Tue, 18 Nov 2014 15:02:12 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411181502.sAIF2CTR093882@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 18 Nov 2014 15:02:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274658 - in projects/sendfile/sys: kern sys ufs/ufs X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Nov 2014 15:02:13 -0000 Author: glebius Date: Tue Nov 18 15:02:11 2014 New Revision: 274658 URL: https://svnweb.freebsd.org/changeset/base/274658 Log: - Remove vop_stdgetpages_async() from UFS, since it inherits from FFS. - Remove vop_stdgetpages_async() and renamed vop_stdgetpages_async_emulate() to vop_stdgetpages_async(). Submitted by: kib Modified: projects/sendfile/sys/kern/vfs_default.c projects/sendfile/sys/sys/vnode.h projects/sendfile/sys/ufs/ufs/ufs_vnops.c Modified: projects/sendfile/sys/kern/vfs_default.c ============================================================================== --- projects/sendfile/sys/kern/vfs_default.c Tue Nov 18 14:56:16 2014 (r274657) +++ projects/sendfile/sys/kern/vfs_default.c Tue Nov 18 15:02:11 2014 (r274658) @@ -83,7 +83,7 @@ static int vop_stdset_text(struct vop_se static int vop_stdunset_text(struct vop_unset_text_args *ap); static int vop_stdget_writecount(struct vop_get_writecount_args *ap); static int vop_stdadd_writecount(struct vop_add_writecount_args *ap); -static int vop_stdgetpages_async_emulate(struct vop_getpages_async_args *ap); +static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -112,7 +112,7 @@ struct vop_vector default_vnodeops = { .vop_close = VOP_NULL, .vop_fsync = VOP_NULL, .vop_getpages = vop_stdgetpages, - .vop_getpages_async = vop_stdgetpages_async_emulate, + .vop_getpages_async = vop_stdgetpages_async, .vop_getwritemount = vop_stdgetwritemount, .vop_inactive = VOP_NULL, .vop_ioctl = VOP_ENOTTY, @@ -730,17 +730,8 @@ vop_stdgetpages(ap) ap->a_count, ap->a_reqpage, NULL, NULL); } -/* XXX Needs good comment and a manpage (VOP_GETPAGES_ASYNC(9). */ -int -vop_stdgetpages_async(struct vop_getpages_async_args *ap) -{ - - return vnode_pager_generic_getpages(ap->a_vp, ap->a_m, - ap->a_count, ap->a_reqpage, ap->a_vop_getpages_iodone, ap->a_arg); -} - static int -vop_stdgetpages_async_emulate(struct vop_getpages_async_args *ap) +vop_stdgetpages_async(struct vop_getpages_async_args *ap) { int error; Modified: projects/sendfile/sys/sys/vnode.h ============================================================================== --- projects/sendfile/sys/sys/vnode.h Tue Nov 18 14:56:16 2014 (r274657) +++ projects/sendfile/sys/sys/vnode.h Tue Nov 18 15:02:11 2014 (r274658) @@ -730,7 +730,6 @@ int vop_stdbmap(struct vop_bmap_args *); int vop_stdfsync(struct vop_fsync_args *); int vop_stdgetwritemount(struct vop_getwritemount_args *); int vop_stdgetpages(struct vop_getpages_args *); -int vop_stdgetpages_async(struct vop_getpages_async_args *); int vop_stdinactive(struct vop_inactive_args *); int vop_stdislocked(struct vop_islocked_args *); int vop_stdkqfilter(struct vop_kqfilter_args *); Modified: projects/sendfile/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- projects/sendfile/sys/ufs/ufs/ufs_vnops.c Tue Nov 18 14:56:16 2014 (r274657) +++ projects/sendfile/sys/ufs/ufs/ufs_vnops.c Tue Nov 18 15:02:11 2014 (r274658) @@ -2745,7 +2745,6 @@ struct vop_vector ufs_vnodeops = { .vop_close = ufs_close, .vop_create = ufs_create, .vop_getattr = ufs_getattr, - .vop_getpages_async = vop_stdgetpages_async, .vop_inactive = ufs_inactive, .vop_ioctl = ufs_ioctl, .vop_link = ufs_link, From owner-svn-src-projects@FreeBSD.ORG Tue Nov 18 15:38:42 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B7CEEFE; Tue, 18 Nov 2014 15:38:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C7A27A9; Tue, 18 Nov 2014 15:38:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAIFcge1008578; Tue, 18 Nov 2014 15:38:42 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAIFcees008568; Tue, 18 Nov 2014 15:38:40 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411181538.sAIFcees008568@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 18 Nov 2014 15:38:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274659 - in projects/sendfile/sys: kern vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Nov 2014 15:38:42 -0000 Author: glebius Date: Tue Nov 18 15:38:40 2014 New Revision: 274659 URL: https://svnweb.freebsd.org/changeset/base/274659 Log: Pass array of pages and count to VOP_GETPAGES() iodone functions. Suggested by: kib Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_syscalls.c projects/sendfile/sys/kern/vfs_default.c projects/sendfile/sys/kern/vnode_if.src projects/sendfile/sys/vm/vm_pager.h projects/sendfile/sys/vm/vnode_pager.c projects/sendfile/sys/vm/vnode_pager.h Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Tue Nov 18 15:02:11 2014 (r274658) +++ projects/sendfile/sys/kern/uipc_syscalls.c Tue Nov 18 15:38:40 2014 (r274659) @@ -2065,7 +2065,7 @@ struct sf_io { }; static void -sf_iodone(void *arg, int error) +sf_iodone(void *arg, vm_page_t *pg, int reqpage, int error) { struct sf_io *sfio = arg; struct socket *so; @@ -2593,7 +2593,7 @@ retry_space: fhold(sock_fp); error = (*so->so_proto->pr_usrreqs->pru_send) (so, PRUS_NOTREADY, m, NULL, NULL, td); - sf_iodone(sfio, 0); + sf_iodone(sfio, NULL, 0, 0); } CURVNET_RESTORE(); Modified: projects/sendfile/sys/kern/vfs_default.c ============================================================================== --- projects/sendfile/sys/kern/vfs_default.c Tue Nov 18 15:02:11 2014 (r274658) +++ projects/sendfile/sys/kern/vfs_default.c Tue Nov 18 15:38:40 2014 (r274659) @@ -737,7 +737,7 @@ vop_stdgetpages_async(struct vop_getpage error = VOP_GETPAGES(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage); vm_page_xunbusy(ap->a_m[ap->a_reqpage]); - ap->a_vop_getpages_iodone(ap->a_arg, error); + ap->a_vop_getpages_iodone(ap->a_arg, ap->a_m, ap->a_reqpage, error); return (error); } Modified: projects/sendfile/sys/kern/vnode_if.src ============================================================================== --- projects/sendfile/sys/kern/vnode_if.src Tue Nov 18 15:02:11 2014 (r274658) +++ projects/sendfile/sys/kern/vnode_if.src Tue Nov 18 15:38:40 2014 (r274659) @@ -484,7 +484,7 @@ vop_getpages_async { IN int count; IN int reqpage; IN vm_ooffset_t offset; - IN void (*vop_getpages_iodone)(void *, int); + IN void (*vop_getpages_iodone)(void *, vm_page_t *, int, int); IN void *arg; }; Modified: projects/sendfile/sys/vm/vm_pager.h ============================================================================== --- projects/sendfile/sys/vm/vm_pager.h Tue Nov 18 15:02:11 2014 (r274658) +++ projects/sendfile/sys/vm/vm_pager.h Tue Nov 18 15:38:40 2014 (r274659) @@ -52,7 +52,7 @@ typedef vm_object_t pgo_alloc_t(void *, typedef void pgo_dealloc_t(vm_object_t); typedef int pgo_getpages_t(vm_object_t, vm_page_t *, int, int); typedef int pgo_getpages_async_t(vm_object_t, vm_page_t *, int, int, - void(*)(void *, int), void *); + void(*)(void *, vm_page_t *, int, int), void *); typedef void pgo_putpages_t(vm_object_t, vm_page_t *, int, int, int *); typedef boolean_t pgo_haspage_t(vm_object_t, vm_pindex_t, int *, int *); typedef void pgo_pageunswapped_t(vm_page_t); @@ -107,7 +107,7 @@ void vm_pager_bufferinit(void); void vm_pager_deallocate(vm_object_t); static __inline int vm_pager_get_pages(vm_object_t, vm_page_t *, int, int); static inline int vm_pager_get_pages_async(vm_object_t, vm_page_t *, int, - int, void(*)(void *, int), void *); + int, void(*)(void *, vm_page_t *, int, int), void *); static __inline boolean_t vm_pager_has_page(vm_object_t, vm_pindex_t, int *, int *); void vm_pager_init(void); vm_object_t vm_pager_object_lookup(struct pagerlst *, void *); @@ -140,7 +140,7 @@ vm_pager_get_pages( static inline int vm_pager_get_pages_async(vm_object_t object, vm_page_t *m, int count, - int reqpage, void (*iodone)(void *, int), void *arg) + int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) { int r; @@ -150,7 +150,7 @@ vm_pager_get_pages_async(vm_object_t obj /* Emulate async operation. */ r = vm_pager_get_pages(object, m, count, reqpage); VM_OBJECT_WUNLOCK(object); - (iodone)(arg, r); + (iodone)(arg, m, count, r); VM_OBJECT_WLOCK(object); } else r = (*pagertab[object->type]->pgo_getpages_async)(object, m, Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Tue Nov 18 15:02:11 2014 (r274658) +++ projects/sendfile/sys/vm/vnode_pager.c Tue Nov 18 15:38:40 2014 (r274659) @@ -92,7 +92,7 @@ struct getpages_data { int size; int count; int reqpage; - void (*iodone)(void *, int); + void (*iodone)(void *, vm_page_t *, int, int); void *arg; }; @@ -102,10 +102,10 @@ static int vnode_pager_input_smlfs(vm_ob static int vnode_pager_input_old(vm_object_t object, vm_page_t m); static void vnode_pager_dealloc(vm_object_t); static int vnode_pager_local_getpages0(struct vnode *, vm_page_t *, int, int, - void (*)(void *, int), void *); + void (*)(void *, vm_page_t *, int, int), void *); static int vnode_pager_getpages(vm_object_t, vm_page_t *, int, int); static int vnode_pager_getpages_async(vm_object_t, vm_page_t *, int, int, - void(*)(void *, int), void *); + void(*)(void *, vm_page_t *, int, int), void *); static void vnode_pager_putpages(vm_object_t, vm_page_t *, int, int, int *); static boolean_t vnode_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); static vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t, @@ -692,7 +692,7 @@ vnode_pager_getpages(vm_object_t object, static int vnode_pager_getpages_async(vm_object_t object, vm_page_t *m, int count, - int reqpage, void (*iodone)(void *, int), void *arg) + int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) { int rtval; struct vnode *vp; @@ -730,7 +730,7 @@ vnode_pager_local_getpages_async(struct static int vnode_pager_local_getpages0(struct vnode *vp, vm_page_t *m, int bytecount, - int reqpage, void (*iodone)(void *, int), void *arg) + int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) { vm_page_t mreq; @@ -752,7 +752,7 @@ vnode_pager_local_getpages0(struct vnode vm_pager_free_nonreq(mreq->object, m, reqpage, round_page(bytecount) / PAGE_SIZE); if (iodone != NULL) - iodone(arg, 0); + iodone(arg, m, reqpage, 0); return (VM_PAGER_OK); } @@ -766,7 +766,7 @@ vnode_pager_local_getpages0(struct vnode */ int vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount, - int reqpage, void (*iodone)(void *, int), void *arg) + int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) { vm_object_t object; vm_offset_t kva; @@ -1061,7 +1061,7 @@ vnode_pager_generic_getpages_done_async( error = vnode_pager_generic_getpages_done(d); vm_page_xunbusy(d->m[d->reqpage]); - d->iodone(d->arg, error); + d->iodone(d->arg, d->m, d->reqpage, error); free(d, M_TEMP); } Modified: projects/sendfile/sys/vm/vnode_pager.h ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.h Tue Nov 18 15:02:11 2014 (r274658) +++ projects/sendfile/sys/vm/vnode_pager.h Tue Nov 18 15:38:40 2014 (r274659) @@ -41,7 +41,8 @@ #ifdef _KERNEL int vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, - int count, int reqpage, void (*iodone)(void *, int), void *arg); + int count, int reqpage, void (*iodone)(void *, vm_page_t *, int, int), + void *arg); int vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *m, int count, boolean_t sync, int *rtvals); From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 00:44:21 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D33EAB8A; Wed, 19 Nov 2014 00:44:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0A79CDC; Wed, 19 Nov 2014 00:44:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ0iLlj068407; Wed, 19 Nov 2014 00:44:21 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ0iLMt068406; Wed, 19 Nov 2014 00:44:21 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411190044.sAJ0iLMt068406@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 19 Nov 2014 00:44:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274682 - projects/bmake/gnu/lib/csu X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 00:44:21 -0000 Author: sjg Date: Wed Nov 19 00:44:21 2014 New Revision: 274682 URL: https://svnweb.freebsd.org/changeset/base/274682 Log: fixed dep Modified: projects/bmake/gnu/lib/csu/Makefile.depend Modified: projects/bmake/gnu/lib/csu/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/csu/Makefile.depend Tue Nov 18 22:35:19 2014 (r274681) +++ projects/bmake/gnu/lib/csu/Makefile.depend Wed Nov 19 00:44:21 2014 (r274682) @@ -3,7 +3,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - bin/cat.host \ include \ include/xlocale \ From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 01:08:11 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2D8417B; Wed, 19 Nov 2014 01:08:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 98493EC8; Wed, 19 Nov 2014 01:08:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ18BMa078230; Wed, 19 Nov 2014 01:08:11 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ188ic078210; Wed, 19 Nov 2014 01:08:08 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411190108.sAJ188ic078210@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 19 Nov 2014 01:08:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274683 - in projects/bmake: . bin/csh bin/date/tests bin/dd bin/df bin/ed bin/pkill/tests bin/ps bin/rmail bin/sh bin/sh/tests bin/sh/tests/builtins bin/sh/tests/errors bin/sh/tests/ex... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 01:08:11 -0000 Author: sjg Date: Wed Nov 19 01:07:58 2014 New Revision: 274683 URL: https://svnweb.freebsd.org/changeset/base/274683 Log: Merge from head@274682 Added: projects/bmake/bin/date/tests/format_string_test.sh - copied unchanged from r274682, head/bin/date/tests/format_string_test.sh projects/bmake/bin/sh/tests/builtins/eval7.0 - copied unchanged from r274682, head/bin/sh/tests/builtins/eval7.0 projects/bmake/bin/sh/tests/builtins/eval8.7 - copied unchanged from r274682, head/bin/sh/tests/builtins/eval8.7 projects/bmake/bin/sh/tests/builtins/getopts9.0 - copied unchanged from r274682, head/bin/sh/tests/builtins/getopts9.0 projects/bmake/bin/sh/tests/builtins/getopts9.0.stdout - copied unchanged from r274682, head/bin/sh/tests/builtins/getopts9.0.stdout projects/bmake/bin/sh/tests/builtins/lineno3.0 - copied unchanged from r274682, head/bin/sh/tests/builtins/lineno3.0 projects/bmake/bin/sh/tests/builtins/lineno3.0.stdout - copied unchanged from r274682, head/bin/sh/tests/builtins/lineno3.0.stdout projects/bmake/bin/sh/tests/expansion/arith14.0 - copied unchanged from r274682, head/bin/sh/tests/expansion/arith14.0 projects/bmake/bin/sh/tests/expansion/redir1.0 - copied unchanged from r274682, head/bin/sh/tests/expansion/redir1.0 projects/bmake/bin/sh/tests/functional_test.sh - copied unchanged from r274682, head/bin/sh/tests/functional_test.sh projects/bmake/bin/sh/tests/parameters/positional6.0 - copied unchanged from r274682, head/bin/sh/tests/parameters/positional6.0 projects/bmake/bin/sh/tests/parameters/positional7.0 - copied unchanged from r274682, head/bin/sh/tests/parameters/positional7.0 projects/bmake/bin/sh/tests/parser/heredoc12.0 - copied unchanged from r274682, head/bin/sh/tests/parser/heredoc12.0 projects/bmake/bin/sh/tests/parser/line-cont1.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont1.0 projects/bmake/bin/sh/tests/parser/line-cont10.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont10.0 projects/bmake/bin/sh/tests/parser/line-cont11.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont11.0 projects/bmake/bin/sh/tests/parser/line-cont2.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont2.0 projects/bmake/bin/sh/tests/parser/line-cont3.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont3.0 projects/bmake/bin/sh/tests/parser/line-cont4.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont4.0 projects/bmake/bin/sh/tests/parser/line-cont5.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont5.0 projects/bmake/bin/sh/tests/parser/line-cont6.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont6.0 projects/bmake/bin/sh/tests/parser/line-cont7.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont7.0 projects/bmake/bin/sh/tests/parser/line-cont8.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont8.0 projects/bmake/bin/sh/tests/parser/line-cont9.0 - copied unchanged from r274682, head/bin/sh/tests/parser/line-cont9.0 projects/bmake/bin/sleep/tests/ - copied from r274682, head/bin/sleep/tests/ projects/bmake/contrib/atf/atf-c++/atf-c++.3 - copied unchanged from r274682, head/contrib/atf/atf-c++/atf-c++.3 projects/bmake/contrib/atf/atf-c/atf-c.3 - copied unchanged from r274682, head/contrib/atf/atf-c/atf-c.3 projects/bmake/contrib/atf/atf-sh/atf-sh.3 - copied unchanged from r274682, head/contrib/atf/atf-sh/atf-sh.3 projects/bmake/contrib/atf/config.h - copied unchanged from r274682, head/contrib/atf/config.h projects/bmake/contrib/atf/doc/atf.7.in - copied unchanged from r274682, head/contrib/atf/doc/atf.7.in projects/bmake/contrib/byacc/test/btyacc/btyacc_demo2.error - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_demo2.error projects/bmake/contrib/byacc/test/btyacc/btyacc_demo2.output - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_demo2.output projects/bmake/contrib/byacc/test/btyacc/btyacc_demo2.tab.c - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c projects/bmake/contrib/byacc/test/btyacc/btyacc_demo2.tab.h - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy1.error - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy1.error projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy1.output - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy1.output projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy2.error - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy2.error projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy2.output - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy2.output projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy3.error - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy3.error projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy3.output - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy3.output projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c projects/bmake/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h - copied unchanged from r274682, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h projects/bmake/contrib/byacc/test/btyacc_destroy1.y - copied unchanged from r274682, head/contrib/byacc/test/btyacc_destroy1.y projects/bmake/contrib/byacc/test/btyacc_destroy2.y - copied unchanged from r274682, head/contrib/byacc/test/btyacc_destroy2.y projects/bmake/contrib/byacc/test/btyacc_destroy3.y - copied unchanged from r274682, head/contrib/byacc/test/btyacc_destroy3.y projects/bmake/contrib/hyperv/ - copied from r274682, head/contrib/hyperv/ projects/bmake/contrib/libxo/ - copied from r274682, head/contrib/libxo/ projects/bmake/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff - copied unchanged from r274682, head/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff projects/bmake/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff - copied unchanged from r274682, head/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff projects/bmake/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff - copied unchanged from r274682, head/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff projects/bmake/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff - copied unchanged from r274682, head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff projects/bmake/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff - copied unchanged from r274682, head/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff projects/bmake/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff - copied unchanged from r274682, head/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff projects/bmake/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff - copied unchanged from r274682, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff projects/bmake/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff - copied unchanged from r274682, head/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff projects/bmake/contrib/netbsd-tests/ - copied from r274682, head/contrib/netbsd-tests/ projects/bmake/contrib/ofed/libcxgb4/ - copied from r274682, head/contrib/ofed/libcxgb4/ projects/bmake/contrib/ofed/librdmacm/examples/build/ - copied from r274682, head/contrib/ofed/librdmacm/examples/build/ projects/bmake/contrib/ofed/usr.lib/libcxgb4/ - copied from r274682, head/contrib/ofed/usr.lib/libcxgb4/ projects/bmake/contrib/openpam/lib/libpam/openpam_strlset.c - copied unchanged from r274682, head/contrib/openpam/lib/libpam/openpam_strlset.c projects/bmake/contrib/openpam/lib/libpam/openpam_strlset.h - copied unchanged from r274682, head/contrib/openpam/lib/libpam/openpam_strlset.h projects/bmake/contrib/pjdfstest/ - copied from r274682, head/contrib/pjdfstest/ projects/bmake/contrib/subversion/subversion/include/private/svn_cert.h - copied unchanged from r274682, head/contrib/subversion/subversion/include/private/svn_cert.h projects/bmake/contrib/telnet/telnet/baud.h - copied unchanged from r274682, head/contrib/telnet/telnet/baud.h projects/bmake/contrib/tzdata/zone1970.tab - copied unchanged from r274682, head/contrib/tzdata/zone1970.tab projects/bmake/crypto/openssl/crypto/constant_time_locl.h - copied unchanged from r274682, head/crypto/openssl/crypto/constant_time_locl.h projects/bmake/crypto/openssl/crypto/constant_time_test.c - copied unchanged from r274682, head/crypto/openssl/crypto/constant_time_test.c projects/bmake/crypto/openssl/doc/apps/c_rehash.pod - copied unchanged from r274682, head/crypto/openssl/doc/apps/c_rehash.pod projects/bmake/crypto/openssl/doc/crypto/CMS_add1_signer.pod - copied unchanged from r274682, head/crypto/openssl/doc/crypto/CMS_add1_signer.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod - copied unchanged from r274682, head/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod projects/bmake/crypto/openssl/ssl/ssl_utst.c - copied unchanged from r274682, head/crypto/openssl/ssl/ssl_utst.c projects/bmake/etc/auto_master - copied unchanged from r274682, head/etc/auto_master projects/bmake/etc/autofs/ - copied from r274682, head/etc/autofs/ projects/bmake/etc/devd/hyperv.conf - copied unchanged from r274682, head/etc/devd/hyperv.conf projects/bmake/etc/devd/ulpt.conf - copied unchanged from r274682, head/etc/devd/ulpt.conf projects/bmake/etc/rc.d/automount - copied unchanged from r274682, head/etc/rc.d/automount projects/bmake/etc/rc.d/automountd - copied unchanged from r274682, head/etc/rc.d/automountd projects/bmake/etc/rc.d/autounmountd - copied unchanged from r274682, head/etc/rc.d/autounmountd projects/bmake/etc/rc.d/growfs - copied unchanged from r274682, head/etc/rc.d/growfs projects/bmake/etc/rc.d/ipropd_master - copied unchanged from r274682, head/etc/rc.d/ipropd_master projects/bmake/etc/rc.d/ipropd_slave - copied unchanged from r274682, head/etc/rc.d/ipropd_slave projects/bmake/etc/rc.d/kdc - copied unchanged from r274682, head/etc/rc.d/kdc projects/bmake/games/primes/spsp.c - copied unchanged from r274682, head/games/primes/spsp.c projects/bmake/gnu/usr.bin/diff/tests/ - copied from r274682, head/gnu/usr.bin/diff/tests/ projects/bmake/lib/libarchive/libarchive.pc - copied unchanged from r274682, head/lib/libarchive/libarchive.pc projects/bmake/lib/libc/Makefile.amd64 - copied unchanged from r274682, head/lib/libc/Makefile.amd64 projects/bmake/lib/libc/Makefile.i386 - copied unchanged from r274682, head/lib/libc/Makefile.i386 projects/bmake/lib/libc/arm/Symbol_vfp.map - copied unchanged from r274682, head/lib/libc/arm/Symbol_vfp.map projects/bmake/lib/libc/arm/aeabi/aeabi_asm_double.S - copied unchanged from r274682, head/lib/libc/arm/aeabi/aeabi_asm_double.S projects/bmake/lib/libc/arm/aeabi/aeabi_asm_float.S - copied unchanged from r274682, head/lib/libc/arm/aeabi/aeabi_asm_float.S projects/bmake/lib/libc/md/ - copied from r274682, head/lib/libc/md/ projects/bmake/lib/libc/tests/ - copied from r274682, head/lib/libc/tests/ projects/bmake/lib/libdpv/ - copied from r274682, head/lib/libdpv/ projects/bmake/lib/libevent/ - copied from r274682, head/lib/libevent/ projects/bmake/lib/libfigpar/ - copied from r274682, head/lib/libfigpar/ projects/bmake/lib/libmp/tests/ - copied from r274682, head/lib/libmp/tests/ projects/bmake/lib/libnetbsd/netinet/ - copied from r274682, head/lib/libnetbsd/netinet/ projects/bmake/lib/libnetbsd/sys/time.h - copied unchanged from r274682, head/lib/libnetbsd/sys/time.h projects/bmake/lib/libnv/tests/ - copied from r274682, head/lib/libnv/tests/ projects/bmake/lib/libohash/ - copied from r274682, head/lib/libohash/ projects/bmake/lib/libpam/libpam/tests/ - copied from r274682, head/lib/libpam/libpam/tests/ projects/bmake/lib/libpcap/pcap-netmap.c - copied unchanged from r274682, head/lib/libpcap/pcap-netmap.c projects/bmake/lib/libproc/tests/ - copied from r274682, head/lib/libproc/tests/ projects/bmake/lib/librt/Makefile.amd64 - copied unchanged from r274682, head/lib/librt/Makefile.amd64 projects/bmake/lib/librt/Makefile.i386 - copied unchanged from r274682, head/lib/librt/Makefile.i386 projects/bmake/lib/librt/tests/ - copied from r274682, head/lib/librt/tests/ projects/bmake/lib/libstand/pkgfs.c - copied unchanged from r274682, head/lib/libstand/pkgfs.c projects/bmake/lib/libthr/Makefile.amd64 - copied unchanged from r274682, head/lib/libthr/Makefile.amd64 projects/bmake/lib/libthr/Makefile.i386 - copied unchanged from r274682, head/lib/libthr/Makefile.i386 projects/bmake/lib/libthr/tests/ - copied from r274682, head/lib/libthr/tests/ projects/bmake/lib/libutil/tests/ - copied from r274682, head/lib/libutil/tests/ projects/bmake/lib/libxo/ - copied from r274682, head/lib/libxo/ projects/bmake/lib/msun/Makefile.amd64 - copied unchanged from r274682, head/lib/msun/Makefile.amd64 projects/bmake/lib/msun/Makefile.i386 - copied unchanged from r274682, head/lib/msun/Makefile.i386 projects/bmake/lib/msun/ld128/e_lgammal_r.c - copied unchanged from r274682, head/lib/msun/ld128/e_lgammal_r.c projects/bmake/lib/msun/ld80/e_lgammal_r.c - copied unchanged from r274682, head/lib/msun/ld80/e_lgammal_r.c projects/bmake/lib/msun/src/e_lgammal.c - copied unchanged from r274682, head/lib/msun/src/e_lgammal.c projects/bmake/lib/msun/tests/ - copied from r274682, head/lib/msun/tests/ projects/bmake/libexec/Makefile.amd64 - copied unchanged from r274682, head/libexec/Makefile.amd64 projects/bmake/libexec/Makefile.i386 - copied unchanged from r274682, head/libexec/Makefile.i386 projects/bmake/libexec/Makefile.pc98 - copied unchanged from r274682, head/libexec/Makefile.pc98 projects/bmake/libexec/hyperv/ - copied from r274682, head/libexec/hyperv/ projects/bmake/release/amd64/mk-azure.sh - copied unchanged from r274682, head/release/amd64/mk-azure.sh projects/bmake/release/amd64/mk-vmimage.sh - copied unchanged from r274682, head/release/amd64/mk-vmimage.sh projects/bmake/release/i386/mk-azure.sh - copied unchanged from r274682, head/release/i386/mk-azure.sh projects/bmake/release/i386/mk-vmimage.sh - copied unchanged from r274682, head/release/i386/mk-vmimage.sh projects/bmake/release/tools/azure.conf - copied unchanged from r274682, head/release/tools/azure.conf projects/bmake/sbin/devd/tests/ - copied from r274682, head/sbin/devd/tests/ projects/bmake/sbin/ifconfig/ifvxlan.c - copied unchanged from r274682, head/sbin/ifconfig/ifvxlan.c projects/bmake/sbin/ifconfig/sfp.c - copied unchanged from r274682, head/sbin/ifconfig/sfp.c projects/bmake/sbin/ipfw/tables.c - copied unchanged from r274682, head/sbin/ipfw/tables.c projects/bmake/secure/lib/libcrypto/man/CMS_add1_signer.3 - copied unchanged from r274682, head/secure/lib/libcrypto/man/CMS_add1_signer.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 - copied unchanged from r274682, head/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 projects/bmake/secure/usr.bin/openssl/man/c_rehash.1 - copied unchanged from r274682, head/secure/usr.bin/openssl/man/c_rehash.1 projects/bmake/share/doc/pjdfstest/ - copied from r274682, head/share/doc/pjdfstest/ projects/bmake/share/dtrace/disklatency - copied unchanged from r274682, head/share/dtrace/disklatency projects/bmake/share/dtrace/disklatencycmd - copied unchanged from r274682, head/share/dtrace/disklatencycmd projects/bmake/share/examples/hwpmc/Makefile - copied unchanged from r274682, head/share/examples/hwpmc/Makefile projects/bmake/share/examples/hwpmc/overhead.c - copied unchanged from r274682, head/share/examples/hwpmc/overhead.c projects/bmake/share/man/man4/ipheth.4 - copied unchanged from r274682, head/share/man/man4/ipheth.4 projects/bmake/share/man/man4/iscsi.4 - copied unchanged from r274682, head/share/man/man4/iscsi.4 projects/bmake/share/man/man4/man4.arm/cgem.4 - copied unchanged from r274682, head/share/man/man4/man4.arm/cgem.4 projects/bmake/share/man/man4/me.4 - copied unchanged from r274682, head/share/man/man4/me.4 projects/bmake/share/man/man4/smsc.4 - copied unchanged from r274682, head/share/man/man4/smsc.4 projects/bmake/share/man/man4/uled.4 - copied unchanged from r274682, head/share/man/man4/uled.4 projects/bmake/share/man/man4/virtio_console.4 - copied unchanged from r274682, head/share/man/man4/virtio_console.4 projects/bmake/share/man/man4/vxlan.4 - copied unchanged from r274682, head/share/man/man4/vxlan.4 projects/bmake/share/man/man5/autofs.5 - copied unchanged from r274682, head/share/man/man5/autofs.5 projects/bmake/share/man/man7/growfs.7 - copied unchanged from r274682, head/share/man/man7/growfs.7 projects/bmake/share/man/man8/uefi.8 - copied unchanged from r274682, head/share/man/man8/uefi.8 projects/bmake/share/man/man9/casuword.9 - copied unchanged from r274682, head/share/man/man9/casuword.9 projects/bmake/share/mk/netbsd-tests.test.mk - copied unchanged from r274682, head/share/mk/netbsd-tests.test.mk projects/bmake/share/mk/src.libnames.mk - copied unchanged from r274682, head/share/mk/src.libnames.mk projects/bmake/share/vt/keymaps/INDEX.keymaps - copied unchanged from r274682, head/share/vt/keymaps/INDEX.keymaps projects/bmake/share/vt/keymaps/am.kbd - copied unchanged from r274682, head/share/vt/keymaps/am.kbd projects/bmake/share/vt/keymaps/be.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/be.acc.kbd projects/bmake/share/vt/keymaps/be.kbd - copied unchanged from r274682, head/share/vt/keymaps/be.kbd projects/bmake/share/vt/keymaps/bg.bds.kbd - copied unchanged from r274682, head/share/vt/keymaps/bg.bds.kbd projects/bmake/share/vt/keymaps/bg.phonetic.kbd - copied unchanged from r274682, head/share/vt/keymaps/bg.phonetic.kbd projects/bmake/share/vt/keymaps/br.kbd - copied unchanged from r274682, head/share/vt/keymaps/br.kbd projects/bmake/share/vt/keymaps/br.noacc.kbd - copied unchanged from r274682, head/share/vt/keymaps/br.noacc.kbd projects/bmake/share/vt/keymaps/by.kbd - copied unchanged from r274682, head/share/vt/keymaps/by.kbd projects/bmake/share/vt/keymaps/ca-fr.kbd - copied unchanged from r274682, head/share/vt/keymaps/ca-fr.kbd projects/bmake/share/vt/keymaps/ca.kbd - copied unchanged from r274682, head/share/vt/keymaps/ca.kbd projects/bmake/share/vt/keymaps/centraleuropean.kbd - copied unchanged from r274682, head/share/vt/keymaps/centraleuropean.kbd projects/bmake/share/vt/keymaps/centraleuropean.qwerty.kbd - copied unchanged from r274682, head/share/vt/keymaps/centraleuropean.qwerty.kbd projects/bmake/share/vt/keymaps/ch-fr.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/ch-fr.acc.kbd projects/bmake/share/vt/keymaps/ch-fr.kbd - copied unchanged from r274682, head/share/vt/keymaps/ch-fr.kbd projects/bmake/share/vt/keymaps/ch.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/ch.acc.kbd projects/bmake/share/vt/keymaps/ch.kbd - copied unchanged from r274682, head/share/vt/keymaps/ch.kbd projects/bmake/share/vt/keymaps/ch.macbook.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/ch.macbook.acc.kbd projects/bmake/share/vt/keymaps/colemak.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/colemak.acc.kbd projects/bmake/share/vt/keymaps/cz.kbd - copied unchanged from r274682, head/share/vt/keymaps/cz.kbd projects/bmake/share/vt/keymaps/de.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/de.acc.kbd projects/bmake/share/vt/keymaps/de.kbd - copied unchanged from r274682, head/share/vt/keymaps/de.kbd projects/bmake/share/vt/keymaps/de.noacc.kbd - copied unchanged from r274682, head/share/vt/keymaps/de.noacc.kbd projects/bmake/share/vt/keymaps/dk.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/dk.acc.kbd projects/bmake/share/vt/keymaps/dk.kbd - copied unchanged from r274682, head/share/vt/keymaps/dk.kbd projects/bmake/share/vt/keymaps/dk.macbook.kbd - copied unchanged from r274682, head/share/vt/keymaps/dk.macbook.kbd projects/bmake/share/vt/keymaps/ee.kbd - copied unchanged from r274682, head/share/vt/keymaps/ee.kbd projects/bmake/share/vt/keymaps/es.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/es.acc.kbd projects/bmake/share/vt/keymaps/es.dvorak.kbd - copied unchanged from r274682, head/share/vt/keymaps/es.dvorak.kbd projects/bmake/share/vt/keymaps/es.kbd - copied unchanged from r274682, head/share/vt/keymaps/es.kbd projects/bmake/share/vt/keymaps/fi.kbd - copied unchanged from r274682, head/share/vt/keymaps/fi.kbd projects/bmake/share/vt/keymaps/fr.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/fr.acc.kbd projects/bmake/share/vt/keymaps/fr.dvorak.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/fr.dvorak.acc.kbd projects/bmake/share/vt/keymaps/fr.dvorak.kbd - copied unchanged from r274682, head/share/vt/keymaps/fr.dvorak.kbd projects/bmake/share/vt/keymaps/fr.kbd - copied unchanged from r274682, head/share/vt/keymaps/fr.kbd projects/bmake/share/vt/keymaps/fr.macbook.kbd - copied unchanged from r274682, head/share/vt/keymaps/fr.macbook.kbd projects/bmake/share/vt/keymaps/gr.101.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/gr.101.acc.kbd projects/bmake/share/vt/keymaps/gr.elot.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/gr.elot.acc.kbd projects/bmake/share/vt/keymaps/gr.kbd - copied unchanged from r274682, head/share/vt/keymaps/gr.kbd projects/bmake/share/vt/keymaps/hr.kbd - copied unchanged from r274682, head/share/vt/keymaps/hr.kbd projects/bmake/share/vt/keymaps/hu.101.kbd - copied unchanged from r274682, head/share/vt/keymaps/hu.101.kbd projects/bmake/share/vt/keymaps/hu.102.kbd - copied unchanged from r274682, head/share/vt/keymaps/hu.102.kbd projects/bmake/share/vt/keymaps/il.kbd - copied unchanged from r274682, head/share/vt/keymaps/il.kbd projects/bmake/share/vt/keymaps/is.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/is.acc.kbd projects/bmake/share/vt/keymaps/is.kbd - copied unchanged from r274682, head/share/vt/keymaps/is.kbd projects/bmake/share/vt/keymaps/it.kbd - copied unchanged from r274682, head/share/vt/keymaps/it.kbd projects/bmake/share/vt/keymaps/jp.capsctrl.kbd - copied unchanged from r274682, head/share/vt/keymaps/jp.capsctrl.kbd projects/bmake/share/vt/keymaps/jp.kbd - copied unchanged from r274682, head/share/vt/keymaps/jp.kbd projects/bmake/share/vt/keymaps/jp.pc98.iso.kbd - copied unchanged from r274682, head/share/vt/keymaps/jp.pc98.iso.kbd projects/bmake/share/vt/keymaps/jp.pc98.kbd - copied unchanged from r274682, head/share/vt/keymaps/jp.pc98.kbd projects/bmake/share/vt/keymaps/kz.io.kbd - copied unchanged from r274682, head/share/vt/keymaps/kz.io.kbd projects/bmake/share/vt/keymaps/kz.kst.kbd - copied unchanged from r274682, head/share/vt/keymaps/kz.kst.kbd projects/bmake/share/vt/keymaps/latinamerican.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/latinamerican.acc.kbd projects/bmake/share/vt/keymaps/latinamerican.kbd - copied unchanged from r274682, head/share/vt/keymaps/latinamerican.kbd projects/bmake/share/vt/keymaps/lt.kbd - copied unchanged from r274682, head/share/vt/keymaps/lt.kbd projects/bmake/share/vt/keymaps/nl.kbd - copied unchanged from r274682, head/share/vt/keymaps/nl.kbd projects/bmake/share/vt/keymaps/no.dvorak.kbd - copied unchanged from r274682, head/share/vt/keymaps/no.dvorak.kbd projects/bmake/share/vt/keymaps/no.kbd - copied unchanged from r274682, head/share/vt/keymaps/no.kbd projects/bmake/share/vt/keymaps/nordic.asus-eee.kbd - copied unchanged from r274682, head/share/vt/keymaps/nordic.asus-eee.kbd projects/bmake/share/vt/keymaps/pl.dvorak.kbd - copied unchanged from r274682, head/share/vt/keymaps/pl.dvorak.kbd projects/bmake/share/vt/keymaps/pt.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/pt.acc.kbd projects/bmake/share/vt/keymaps/pt.kbd - copied unchanged from r274682, head/share/vt/keymaps/pt.kbd projects/bmake/share/vt/keymaps/ru.kbd - copied unchanged from r274682, head/share/vt/keymaps/ru.kbd projects/bmake/share/vt/keymaps/ru.shift.kbd - copied unchanged from r274682, head/share/vt/keymaps/ru.shift.kbd projects/bmake/share/vt/keymaps/ru.win.kbd - copied unchanged from r274682, head/share/vt/keymaps/ru.win.kbd projects/bmake/share/vt/keymaps/se.kbd - copied unchanged from r274682, head/share/vt/keymaps/se.kbd projects/bmake/share/vt/keymaps/si.kbd - copied unchanged from r274682, head/share/vt/keymaps/si.kbd projects/bmake/share/vt/keymaps/sk.kbd - copied unchanged from r274682, head/share/vt/keymaps/sk.kbd projects/bmake/share/vt/keymaps/tr.kbd - copied unchanged from r274682, head/share/vt/keymaps/tr.kbd projects/bmake/share/vt/keymaps/uk.capsctrl.kbd - copied unchanged from r274682, head/share/vt/keymaps/uk.capsctrl.kbd projects/bmake/share/vt/keymaps/uk.dvorak.kbd - copied unchanged from r274682, head/share/vt/keymaps/uk.dvorak.kbd projects/bmake/share/vt/keymaps/uk.kbd - copied unchanged from r274682, head/share/vt/keymaps/uk.kbd projects/bmake/share/vt/keymaps/us.acc.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.acc.kbd projects/bmake/share/vt/keymaps/us.ctrl.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.ctrl.kbd projects/bmake/share/vt/keymaps/us.dvorak.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.dvorak.kbd projects/bmake/share/vt/keymaps/us.dvorakl.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.dvorakl.kbd projects/bmake/share/vt/keymaps/us.dvorakp.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.dvorakp.kbd projects/bmake/share/vt/keymaps/us.dvorakr.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.dvorakr.kbd projects/bmake/share/vt/keymaps/us.dvorakx.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.dvorakx.kbd projects/bmake/share/vt/keymaps/us.emacs.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.emacs.kbd projects/bmake/share/vt/keymaps/us.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.kbd projects/bmake/share/vt/keymaps/us.unix.kbd - copied unchanged from r274682, head/share/vt/keymaps/us.unix.kbd - copied unchanged from r274682, head/sys/amd64/vmm/amd/npt.c - copied unchanged from r274682, head/sys/amd64/vmm/amd/npt.h - copied unchanged from r274682, head/sys/amd64/vmm/amd/svm.c - copied unchanged from r274682, head/sys/amd64/vmm/amd/svm.h - copied unchanged from r274682, head/sys/amd64/vmm/amd/svm_genassym.c - copied unchanged from r274682, head/sys/amd64/vmm/amd/svm_msr.c - copied unchanged from r274682, head/sys/amd64/vmm/amd/svm_msr.h - copied unchanged from r274682, head/sys/amd64/vmm/amd/svm_softc.h - copied unchanged from r274682, head/sys/amd64/vmm/amd/svm_support.S - copied unchanged from r274682, head/sys/amd64/vmm/amd/vmcb.c - copied unchanged from r274682, head/sys/amd64/vmm/amd/vmcb.h projects/bmake/sys/amd64/vmm/io/vpmtmr.c - copied unchanged from r274682, head/sys/amd64/vmm/io/vpmtmr.c projects/bmake/sys/amd64/vmm/io/vpmtmr.h - copied unchanged from r274682, head/sys/amd64/vmm/io/vpmtmr.h projects/bmake/sys/arm/altera/ - copied from r274682, head/sys/arm/altera/ projects/bmake/sys/arm/arm/elf_note.S - copied unchanged from r274682, head/sys/arm/arm/elf_note.S projects/bmake/sys/arm/arm/syscall.c - copied unchanged from r274682, head/sys/arm/arm/syscall.c projects/bmake/sys/arm/at91/at91_common.c - copied unchanged from r274682, head/sys/arm/at91/at91_common.c projects/bmake/sys/arm/at91/at91_pinctrl.c - copied unchanged from r274682, head/sys/arm/at91/at91_pinctrl.c projects/bmake/sys/arm/conf/CHROMEBOOK-PEACH-PIT - copied unchanged from r274682, head/sys/arm/conf/CHROMEBOOK-PEACH-PIT projects/bmake/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints - copied unchanged from r274682, head/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints projects/bmake/sys/arm/conf/IMX53 - copied unchanged from r274682, head/sys/arm/conf/IMX53 projects/bmake/sys/arm/conf/SOCKIT - copied unchanged from r274682, head/sys/arm/conf/SOCKIT projects/bmake/sys/arm/conf/SOCKIT-BERI - copied unchanged from r274682, head/sys/arm/conf/SOCKIT-BERI projects/bmake/sys/arm/freescale/imx/imx_iomux.c - copied unchanged from r274682, head/sys/arm/freescale/imx/imx_iomux.c projects/bmake/sys/arm/freescale/imx/imx_iomuxvar.h - copied unchanged from r274682, head/sys/arm/freescale/imx/imx_iomuxvar.h projects/bmake/sys/arm/include/acle-compat.h - copied unchanged from r274682, head/sys/arm/include/acle-compat.h projects/bmake/sys/arm/include/sysreg.h - copied unchanged from r274682, head/sys/arm/include/sysreg.h projects/bmake/sys/arm/samsung/exynos/chrome_ec_spi.c - copied unchanged from r274682, head/sys/arm/samsung/exynos/chrome_ec_spi.c projects/bmake/sys/arm/samsung/exynos/exynos5_pmu.c - copied unchanged from r274682, head/sys/arm/samsung/exynos/exynos5_pmu.c projects/bmake/sys/arm/samsung/exynos/exynos5_pmu.h - copied unchanged from r274682, head/sys/arm/samsung/exynos/exynos5_pmu.h projects/bmake/sys/arm/samsung/exynos/exynos5_spi.c - copied unchanged from r274682, head/sys/arm/samsung/exynos/exynos5_spi.c projects/bmake/sys/arm/samsung/exynos/exynos5_usb_phy.c - copied unchanged from r274682, head/sys/arm/samsung/exynos/exynos5_usb_phy.c projects/bmake/sys/arm/samsung/exynos/exynos5_xhci.c - copied unchanged from r274682, head/sys/arm/samsung/exynos/exynos5_xhci.c projects/bmake/sys/arm/samsung/s3c2xx0/ - copied from r274682, head/sys/arm/samsung/s3c2xx0/ projects/bmake/sys/arm/ti/am335x/am335x_gpio.c - copied unchanged from r274682, head/sys/arm/ti/am335x/am335x_gpio.c projects/bmake/sys/arm/ti/am335x/am335x_scm_padconf.h - copied unchanged from r274682, head/sys/arm/ti/am335x/am335x_scm_padconf.h projects/bmake/sys/arm/ti/omap4/omap4_gpio.c - copied unchanged from r274682, head/sys/arm/ti/omap4/omap4_gpio.c projects/bmake/sys/arm/ti/omap4/omap4_scm_padconf.h - copied unchanged from r274682, head/sys/arm/ti/omap4/omap4_scm_padconf.h projects/bmake/sys/arm/ti/ti_gpio.h - copied unchanged from r274682, head/sys/arm/ti/ti_gpio.h projects/bmake/sys/arm/ti/ti_gpio_if.m - copied unchanged from r274682, head/sys/arm/ti/ti_gpio_if.m projects/bmake/sys/arm/ti/ti_wdt.c - copied unchanged from r274682, head/sys/arm/ti/ti_wdt.c projects/bmake/sys/arm/ti/ti_wdt.h - copied unchanged from r274682, head/sys/arm/ti/ti_wdt.h projects/bmake/sys/boot/common/install.c - copied unchanged from r274682, head/sys/boot/common/install.c projects/bmake/sys/boot/common/zfsloader.8 - copied unchanged from r274682, head/sys/boot/common/zfsloader.8 projects/bmake/sys/boot/efi/include/eficonsctl.h - copied unchanged from r274682, head/sys/boot/efi/include/eficonsctl.h projects/bmake/sys/boot/fdt/dts/arm/exynos5250-snow.dts - copied unchanged from r274682, head/sys/boot/fdt/dts/arm/exynos5250-snow.dts projects/bmake/sys/boot/fdt/dts/arm/exynos5250-spring.dts - copied unchanged from r274682, head/sys/boot/fdt/dts/arm/exynos5250-spring.dts projects/bmake/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts - copied unchanged from r274682, head/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts projects/bmake/sys/boot/fdt/dts/arm/sam9260ek.dts - copied unchanged from r274682, head/sys/boot/fdt/dts/arm/sam9260ek.dts projects/bmake/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts - copied unchanged from r274682, head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts projects/bmake/sys/boot/fdt/dts/arm/socfpga-sockit.dts - copied unchanged from r274682, head/sys/boot/fdt/dts/arm/socfpga-sockit.dts projects/bmake/sys/boot/fdt/dts/arm/socfpga.dtsi - copied unchanged from r274682, head/sys/boot/fdt/dts/arm/socfpga.dtsi projects/bmake/sys/boot/fdt/fdt_platform.h - copied unchanged from r274682, head/sys/boot/fdt/fdt_platform.h projects/bmake/sys/boot/forth/pcibios.4th - copied unchanged from r274682, head/sys/boot/forth/pcibios.4th projects/bmake/sys/boot/i386/gptzfsboot/gptzfsboot.8 - copied unchanged from r274682, head/sys/boot/i386/gptzfsboot/gptzfsboot.8 projects/bmake/sys/boot/i386/zfsboot/zfsboot.8 - copied unchanged from r274682, head/sys/boot/i386/zfsboot/zfsboot.8 projects/bmake/sys/boot/kshim/ - copied from r274682, head/sys/boot/kshim/ projects/bmake/sys/boot/uboot/fdt/ - copied from r274682, head/sys/boot/uboot/fdt/ projects/bmake/sys/boot/usb/tools/Makefile - copied unchanged from r274682, head/sys/boot/usb/tools/Makefile projects/bmake/sys/boot/usb/usbcore.mk - copied unchanged from r274682, head/sys/boot/usb/usbcore.mk projects/bmake/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c - copied unchanged from r274682, head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c projects/bmake/sys/cddl/contrib/opensolaris/common/util/ - copied from r274682, head/sys/cddl/contrib/opensolaris/common/util/ projects/bmake/sys/cddl/dev/fbt/fbt.h - copied unchanged from r274682, head/sys/cddl/dev/fbt/fbt.h projects/bmake/sys/cddl/dev/fbt/powerpc/ - copied from r274682, head/sys/cddl/dev/fbt/powerpc/ projects/bmake/sys/cddl/dev/fbt/x86/ - copied from r274682, head/sys/cddl/dev/fbt/x86/ projects/bmake/sys/compat/linux/linux_timer.c - copied unchanged from r274682, head/sys/compat/linux/linux_timer.c projects/bmake/sys/compat/linux/linux_timer.h - copied unchanged from r274682, head/sys/compat/linux/linux_timer.h projects/bmake/sys/compat/svr4/README - copied unchanged from r274682, head/sys/compat/svr4/README projects/bmake/sys/compat/svr4/TO-DO - copied unchanged from r274682, head/sys/compat/svr4/TO-DO projects/bmake/sys/contrib/dev/acpica/common/acgetline.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/common/acgetline.c projects/bmake/sys/contrib/dev/acpica/common/ahids.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/common/ahids.c projects/bmake/sys/contrib/dev/acpica/common/ahuuids.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/common/ahuuids.c projects/bmake/sys/contrib/dev/acpica/common/cmfsize.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/common/cmfsize.c projects/bmake/sys/contrib/dev/acpica/compiler/aslascii.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/aslascii.c projects/bmake/sys/contrib/dev/acpica/compiler/aslmapenter.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/bmake/sys/contrib/dev/acpica/compiler/aslmapoutput.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/bmake/sys/contrib/dev/acpica/compiler/aslmaputils.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/aslmaputils.c projects/bmake/sys/contrib/dev/acpica/compiler/aslmessages.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/aslmessages.c projects/bmake/sys/contrib/dev/acpica/compiler/aslparser.y - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/aslparser.y projects/bmake/sys/contrib/dev/acpica/compiler/aslrules.y - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/aslrules.y projects/bmake/sys/contrib/dev/acpica/compiler/aslsupport.y - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/aslsupport.y projects/bmake/sys/contrib/dev/acpica/compiler/asltokens.y - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/asltokens.y projects/bmake/sys/contrib/dev/acpica/compiler/asltypes.y - copied unchanged from r274682, head/sys/contrib/dev/acpica/compiler/asltypes.y projects/bmake/sys/contrib/dev/acpica/components/debugger/dbtest.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbdata.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/components/tables/tbdata.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utfileio.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/bmake/sys/contrib/dev/acpica/components/utilities/uthex.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/components/utilities/uthex.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utprint.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/components/utilities/utprint.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utuuid.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/bmake/sys/contrib/dev/acpica/include/platform/acenvex.h - copied unchanged from r274682, head/sys/contrib/dev/acpica/include/platform/acenvex.h projects/bmake/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c - copied unchanged from r274682, head/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c projects/bmake/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu - copied unchanged from r274682, head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu projects/bmake/sys/dev/ahci/ahci_pci.c - copied unchanged from r274682, head/sys/dev/ahci/ahci_pci.c projects/bmake/sys/dev/alpm/ - copied from r274682, head/sys/dev/alpm/ projects/bmake/sys/dev/altera/pio/ - copied from r274682, head/sys/dev/altera/pio/ projects/bmake/sys/dev/amdpm/ - copied from r274682, head/sys/dev/amdpm/ projects/bmake/sys/dev/amdsmb/ - copied from r274682, head/sys/dev/amdsmb/ projects/bmake/sys/dev/ath/if_ath_pci_devlist.h - copied unchanged from r274682, head/sys/dev/ath/if_ath_pci_devlist.h projects/bmake/sys/dev/beri/ - copied from r274682, head/sys/dev/beri/ projects/bmake/sys/dev/drm2/i915/i915_gem_context.c - copied unchanged from r274682, head/sys/dev/drm2/i915/i915_gem_context.c projects/bmake/sys/dev/dwc/ - copied from r274682, head/sys/dev/dwc/ projects/bmake/sys/dev/fb/creator_vt.c - copied unchanged from r274682, head/sys/dev/fb/creator_vt.c projects/bmake/sys/dev/fdc/fdc_cbus.c - copied unchanged from r274682, head/sys/dev/fdc/fdc_cbus.c projects/bmake/sys/dev/fdt/fdt_clock.c - copied unchanged from r274682, head/sys/dev/fdt/fdt_clock.c projects/bmake/sys/dev/fdt/fdt_clock.h - copied unchanged from r274682, head/sys/dev/fdt/fdt_clock.h projects/bmake/sys/dev/fdt/fdt_clock_if.m - copied unchanged from r274682, head/sys/dev/fdt/fdt_clock_if.m projects/bmake/sys/dev/fdt/fdt_pinctrl.c - copied unchanged from r274682, head/sys/dev/fdt/fdt_pinctrl.c projects/bmake/sys/dev/fdt/fdt_pinctrl.h - copied unchanged from r274682, head/sys/dev/fdt/fdt_pinctrl.h projects/bmake/sys/dev/fdt/fdt_pinctrl_if.m - copied unchanged from r274682, head/sys/dev/fdt/fdt_pinctrl_if.m projects/bmake/sys/dev/hyperv/utilities/hv_kvp.c - copied unchanged from r274682, head/sys/dev/hyperv/utilities/hv_kvp.c projects/bmake/sys/dev/hyperv/utilities/unicode.h - copied unchanged from r274682, head/sys/dev/hyperv/utilities/unicode.h projects/bmake/sys/dev/iicbus/adm1030.c - copied unchanged from r274682, head/sys/dev/iicbus/adm1030.c projects/bmake/sys/dev/intpm/ - copied from r274682, head/sys/dev/intpm/ projects/bmake/sys/dev/ixl/ - copied from r274682, head/sys/dev/ixl/ projects/bmake/sys/dev/mii/micphy.c - copied unchanged from r274682, head/sys/dev/mii/micphy.c projects/bmake/sys/dev/mmc/host/ - copied from r274682, head/sys/dev/mmc/host/ projects/bmake/sys/dev/mrsas/mrsas_linux.c - copied unchanged from r274682, head/sys/dev/mrsas/mrsas_linux.c projects/bmake/sys/dev/ncr/ - copied from r274682, head/sys/dev/ncr/ projects/bmake/sys/dev/netmap/if_vtnet_netmap.h - copied unchanged from r274682, head/sys/dev/netmap/if_vtnet_netmap.h projects/bmake/sys/dev/netmap/netmap_monitor.c - copied unchanged from r274682, head/sys/dev/netmap/netmap_monitor.c projects/bmake/sys/dev/nfsmb/ - copied from r274682, head/sys/dev/nfsmb/ projects/bmake/sys/dev/random/build.sh - copied unchanged from r274682, head/sys/dev/random/build.sh projects/bmake/sys/dev/random/fortuna.c - copied unchanged from r274682, head/sys/dev/random/fortuna.c projects/bmake/sys/dev/random/fortuna.h - copied unchanged from r274682, head/sys/dev/random/fortuna.h projects/bmake/sys/dev/random/uint128.h - copied unchanged from r274682, head/sys/dev/random/uint128.h projects/bmake/sys/dev/random/unit_test.c - copied unchanged from r274682, head/sys/dev/random/unit_test.c projects/bmake/sys/dev/random/unit_test.h - copied unchanged from r274682, head/sys/dev/random/unit_test.h projects/bmake/sys/dev/rl/ - copied from r274682, head/sys/dev/rl/ projects/bmake/sys/dev/smc/if_smc_fdt.c - copied unchanged from r274682, head/sys/dev/smc/if_smc_fdt.c projects/bmake/sys/dev/uart/uart_dev_msm.c - copied unchanged from r274682, head/sys/dev/uart/uart_dev_msm.c projects/bmake/sys/dev/uart/uart_dev_msm.h - copied unchanged from r274682, head/sys/dev/uart/uart_dev_msm.h projects/bmake/sys/dev/usb/misc/uled.c - copied unchanged from r274682, head/sys/dev/usb/misc/uled.c projects/bmake/sys/dev/usb/template/usb_template_phone.c - copied unchanged from r274682, head/sys/dev/usb/template/usb_template_phone.c projects/bmake/sys/dev/usb/uled_ioctl.h - copied unchanged from r274682, head/sys/dev/usb/uled_ioctl.h projects/bmake/sys/dev/viapm/ - copied from r274682, head/sys/dev/viapm/ projects/bmake/sys/dev/virtio/console/ - copied from r274682, head/sys/dev/virtio/console/ projects/bmake/sys/dev/virtio/mmio/ - copied from r274682, head/sys/dev/virtio/mmio/ projects/bmake/sys/dev/xen/evtchn/ - copied from r274682, head/sys/dev/xen/evtchn/ projects/bmake/sys/dev/xen/privcmd/ - copied from r274682, head/sys/dev/xen/privcmd/ projects/bmake/sys/dev/xen/xenstore/ - copied from r274682, head/sys/dev/xen/xenstore/ projects/bmake/sys/fs/autofs/ - copied from r274682, head/sys/fs/autofs/ projects/bmake/sys/gnu/dts/include/dt-bindings/clk/ti-dra7-atl.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clk/ti-dra7-atl.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/at91.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/at91.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/bcm21664.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/bcm21664.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/bcm281xx.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/bcm281xx.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/berlin2.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/berlin2.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/clps711x-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/clps711x-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/exynos-audss-clk.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/exynos-audss-clk.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/exynos5260-clk.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/exynos5260-clk.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/exynos5410.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/exynos5410.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/hip04-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/hip04-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/hix5hd2-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/hix5hd2-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/imx1-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/imx1-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/imx21-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/imx21-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/imx27-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/imx27-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/r8a7779-clock.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/r8a7779-clock.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/s3c2410.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/s3c2410.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/s3c2412.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/s3c2412.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/s5pv210-audss.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/s5pv210-audss.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/s5pv210.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/s5pv210.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/stih415-clks.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/stih415-clks.h projects/bmake/sys/gnu/dts/include/dt-bindings/clock/stih416-clks.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/clock/stih416-clks.h projects/bmake/sys/gnu/dts/include/dt-bindings/dma/nbpfaxi.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/dma/nbpfaxi.h projects/bmake/sys/gnu/dts/include/dt-bindings/mfd/palmas.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/mfd/palmas.h projects/bmake/sys/gnu/dts/include/dt-bindings/phy/ - copied from r274682, head/sys/gnu/dts/include/dt-bindings/phy/ projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h projects/bmake/sys/gnu/dts/include/dt-bindings/reset-controller/ - copied from r274682, head/sys/gnu/dts/include/dt-bindings/reset-controller/ projects/bmake/sys/gnu/dts/include/dt-bindings/reset/altr,rst-mgr.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/reset/altr,rst-mgr.h projects/bmake/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-apq8084.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-apq8084.h projects/bmake/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq806x.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq806x.h projects/bmake/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-apq8084.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-apq8084.h projects/bmake/sys/gnu/dts/include/dt-bindings/soc/ - copied from r274682, head/sys/gnu/dts/include/dt-bindings/soc/ projects/bmake/sys/gnu/dts/include/dt-bindings/sound/tlv320aic31xx-micbias.h - copied unchanged from r274682, head/sys/gnu/dts/include/dt-bindings/sound/tlv320aic31xx-micbias.h projects/bmake/sys/gnu/dts/include/dt-bindings/spmi/ - copied from r274682, head/sys/gnu/dts/include/dt-bindings/spmi/ projects/bmake/sys/kern/subr_sfbuf.c - copied unchanged from r274682, head/sys/kern/subr_sfbuf.c projects/bmake/sys/libkern/explicit_bzero.c - copied unchanged from r274682, head/sys/libkern/explicit_bzero.c projects/bmake/sys/libkern/memmem.c - copied unchanged from r274682, head/sys/libkern/memmem.c projects/bmake/sys/libkern/murmur3_32.c - copied unchanged from r274682, head/sys/libkern/murmur3_32.c projects/bmake/sys/libkern/strndup.c - copied unchanged from r274682, head/sys/libkern/strndup.c projects/bmake/sys/mips/conf/TP-MR3020 - copied unchanged from r274682, head/sys/mips/conf/TP-MR3020 projects/bmake/sys/mips/conf/TP-MR3020.hints - copied unchanged from r274682, head/sys/mips/conf/TP-MR3020.hints projects/bmake/sys/modules/autofs/ - copied from r274682, head/sys/modules/autofs/ projects/bmake/sys/modules/if_me/ - copied from r274682, head/sys/modules/if_me/ projects/bmake/sys/modules/if_vxlan/ - copied from r274682, head/sys/modules/if_vxlan/ projects/bmake/sys/modules/iwnfw/iwn100/ - copied from r274682, head/sys/modules/iwnfw/iwn100/ projects/bmake/sys/modules/ixl/ - copied from r274682, head/sys/modules/ixl/ projects/bmake/sys/modules/ixlv/ - copied from r274682, head/sys/modules/ixlv/ projects/bmake/sys/modules/mrsas/mrsas_linux/ - copied from r274682, head/sys/modules/mrsas/mrsas_linux/ projects/bmake/sys/modules/ncr/ - copied from r274682, head/sys/modules/ncr/ projects/bmake/sys/modules/padlock_rng/ - copied from r274682, head/sys/modules/padlock_rng/ projects/bmake/sys/modules/rdrand_rng/ - copied from r274682, head/sys/modules/rdrand_rng/ projects/bmake/sys/modules/si/ - copied from r274682, head/sys/modules/si/ projects/bmake/sys/modules/usb/uled/ - copied from r274682, head/sys/modules/usb/uled/ projects/bmake/sys/modules/virtio/console/ - copied from r274682, head/sys/modules/virtio/console/ projects/bmake/sys/modules/wds/ - copied from r274682, head/sys/modules/wds/ projects/bmake/sys/modules/wl/ - copied from r274682, head/sys/modules/wl/ projects/bmake/sys/net/if_me.c - copied unchanged from r274682, head/sys/net/if_me.c projects/bmake/sys/net/if_vxlan.c - copied unchanged from r274682, head/sys/net/if_vxlan.c projects/bmake/sys/net/if_vxlan.h - copied unchanged from r274682, head/sys/net/if_vxlan.h projects/bmake/sys/net/paravirt.h - copied unchanged from r274682, head/sys/net/paravirt.h projects/bmake/sys/net/sff8436.h - copied unchanged from r274682, head/sys/net/sff8436.h projects/bmake/sys/netinet/sctp_syscalls.c - copied unchanged from r274682, head/sys/netinet/sctp_syscalls.c projects/bmake/sys/netinet6/ip6_gre.c - copied unchanged from r274682, head/sys/netinet6/ip6_gre.c projects/bmake/sys/netpfil/ipfw/ip_fw_iface.c - copied unchanged from r274682, head/sys/netpfil/ipfw/ip_fw_iface.c projects/bmake/sys/netpfil/ipfw/ip_fw_table.h - copied unchanged from r274682, head/sys/netpfil/ipfw/ip_fw_table.h projects/bmake/sys/netpfil/ipfw/ip_fw_table_algo.c - copied unchanged from r274682, head/sys/netpfil/ipfw/ip_fw_table_algo.c projects/bmake/sys/netpfil/ipfw/ip_fw_table_value.c - copied unchanged from r274682, head/sys/netpfil/ipfw/ip_fw_table_value.c projects/bmake/sys/ofed/drivers/net/mlx4/mlx4_stats.h - copied unchanged from r274682, head/sys/ofed/drivers/net/mlx4/mlx4_stats.h projects/bmake/sys/ofed/drivers/net/mlx4/utils.c - copied unchanged from r274682, head/sys/ofed/drivers/net/mlx4/utils.c projects/bmake/sys/ofed/drivers/net/mlx4/utils.h - copied unchanged from r274682, head/sys/ofed/drivers/net/mlx4/utils.h projects/bmake/sys/ofed/include/linux/cache.h - copied unchanged from r274682, head/sys/ofed/include/linux/cache.h projects/bmake/sys/ofed/include/linux/etherdevice.h - copied unchanged from r274682, head/sys/ofed/include/linux/etherdevice.h projects/bmake/sys/ofed/include/linux/kmod.h - copied unchanged from r274682, head/sys/ofed/include/linux/kmod.h projects/bmake/sys/ofed/include/linux/ktime.h - copied unchanged from r274682, head/sys/ofed/include/linux/ktime.h projects/bmake/sys/ofed/include/linux/math64.h - copied unchanged from r274682, head/sys/ofed/include/linux/math64.h projects/bmake/sys/ofed/include/net/if_inet6.h - copied unchanged from r274682, head/sys/ofed/include/net/if_inet6.h projects/bmake/sys/sys/seq.h - copied unchanged from r274682, head/sys/sys/seq.h projects/bmake/sys/x86/include/vmware.h - copied unchanged from r274682, head/sys/x86/include/vmware.h projects/bmake/sys/x86/x86/identcpu.c - copied unchanged from r274682, head/sys/x86/x86/identcpu.c projects/bmake/sys/x86/xen/xen_msi.c - copied unchanged from r274682, head/sys/x86/xen/xen_msi.c projects/bmake/sys/x86/xen/xen_pci.c - copied unchanged from r274682, head/sys/x86/xen/xen_pci.c projects/bmake/sys/xen/error.h - copied unchanged from r274682, head/sys/xen/error.h projects/bmake/sys/xen/privcmd.h - copied unchanged from r274682, head/sys/xen/privcmd.h projects/bmake/sys/xen/xen_msi.h - copied unchanged from r274682, head/sys/xen/xen_msi.h projects/bmake/tests/sys/pjdfstest/ - copied from r274682, head/tests/sys/pjdfstest/ projects/bmake/tools/build/check-links.sh - copied unchanged from r274682, head/tools/build/check-links.sh projects/bmake/tools/build/options/WITHOUT_CUSE - copied unchanged from r274682, head/tools/build/options/WITHOUT_CUSE projects/bmake/tools/build/options/WITHOUT_HYPERV - copied unchanged from r274682, head/tools/build/options/WITHOUT_HYPERV projects/bmake/tools/build/options/WITHOUT_INCLUDES - copied unchanged from r274682, head/tools/build/options/WITHOUT_INCLUDES projects/bmake/tools/build/options/WITHOUT_TESTS_SUPPORT - copied unchanged from r274682, head/tools/build/options/WITHOUT_TESTS_SUPPORT projects/bmake/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES - copied unchanged from r274682, head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES projects/bmake/tools/tools/bootparttest/stub.c - copied unchanged from r274682, head/tools/tools/bootparttest/stub.c projects/bmake/tools/tools/perforce/ - copied from r274682, head/tools/tools/perforce/ projects/bmake/tools/tools/tscdrift/ - copied from r274682, head/tools/tools/tscdrift/ projects/bmake/tools/tools/vt/keymaps/ - copied from r274682, head/tools/tools/vt/keymaps/ projects/bmake/usr.bin/basename/tests/ - copied from r274682, head/usr.bin/basename/tests/ projects/bmake/usr.bin/cmp/tests/ - copied from r274682, head/usr.bin/cmp/tests/ projects/bmake/usr.bin/cut/tests/ - copied from r274682, head/usr.bin/cut/tests/ projects/bmake/usr.bin/dirname/tests/ - copied from r274682, head/usr.bin/dirname/tests/ projects/bmake/usr.bin/dpv/ - copied from r274682, head/usr.bin/dpv/ projects/bmake/usr.bin/grep/tests/ - copied from r274682, head/usr.bin/grep/tests/ projects/bmake/usr.bin/gzip/tests/ - copied from r274682, head/usr.bin/gzip/tests/ projects/bmake/usr.bin/mkimg/qcow.c - copied unchanged from r274682, head/usr.bin/mkimg/qcow.c projects/bmake/usr.bin/mkimg/tests/ - copied from r274682, head/usr.bin/mkimg/tests/ projects/bmake/usr.bin/timeout/tests/ - copied from r274682, head/usr.bin/timeout/tests/ projects/bmake/usr.bin/xo/ - copied from r274682, head/usr.bin/xo/ projects/bmake/usr.sbin/autofs/ - copied from r274682, head/usr.sbin/autofs/ projects/bmake/usr.sbin/ctld/chap.c - copied unchanged from r274682, head/usr.sbin/ctld/chap.c projects/bmake/usr.sbin/ctld/isns.c - copied unchanged from r274682, head/usr.sbin/ctld/isns.c projects/bmake/usr.sbin/ctld/isns.h - copied unchanged from r274682, head/usr.sbin/ctld/isns.h projects/bmake/usr.sbin/hyperv/ - copied from r274682, head/usr.sbin/hyperv/ projects/bmake/usr.sbin/iscsid/chap.c - copied unchanged from r274682, head/usr.sbin/iscsid/chap.c projects/bmake/usr.sbin/nmtree/tests/ - copied from r274682, head/usr.sbin/nmtree/tests/ projects/bmake/usr.sbin/pw/tests/ - copied from r274682, head/usr.sbin/pw/tests/ Directory Properties: projects/bmake/sys/amd64/vmm/amd/npt.c (props changed) projects/bmake/sys/amd64/vmm/amd/npt.h (props changed) projects/bmake/sys/amd64/vmm/amd/svm.c (props changed) projects/bmake/sys/amd64/vmm/amd/svm.h (props changed) projects/bmake/sys/amd64/vmm/amd/svm_genassym.c (props changed) projects/bmake/sys/amd64/vmm/amd/svm_msr.c (props changed) projects/bmake/sys/amd64/vmm/amd/svm_msr.h (props changed) projects/bmake/sys/amd64/vmm/amd/svm_softc.h (props changed) projects/bmake/sys/amd64/vmm/amd/svm_support.S (props changed) projects/bmake/sys/amd64/vmm/amd/vmcb.c (props changed) projects/bmake/sys/amd64/vmm/amd/vmcb.h (props changed) Replaced: - copied from r274682, head/sys/gnu/dts/arm/ projects/bmake/sys/sparc64/include/sf_buf.h - copied unchanged from r274682, head/sys/sparc64/include/sf_buf.h Directory Properties: projects/bmake/sys/gnu/dts/arm/ (props changed) Deleted: projects/bmake/bin/date/tests/legacy_test.sh projects/bmake/bin/sh/tests/legacy_test.sh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c projects/bmake/contrib/atf/atf-c++/config.cpp projects/bmake/contrib/atf/atf-c++/config.hpp projects/bmake/contrib/atf/atf-c++/config_test.cpp projects/bmake/contrib/atf/atf-c++/detail/sanity_test.cpp projects/bmake/contrib/atf/atf-c/config.c projects/bmake/contrib/atf/atf-c/config.h projects/bmake/contrib/atf/atf-c/config_test.c projects/bmake/contrib/atf/bconfig.h projects/bmake/contrib/openpam/m4/ projects/bmake/contrib/xz/po/ projects/bmake/crypto/openssl/crypto/pkcs7/bio_ber.c projects/bmake/crypto/openssl/crypto/pkcs7/dec.c projects/bmake/crypto/openssl/crypto/pkcs7/des.pem projects/bmake/crypto/openssl/crypto/pkcs7/doc projects/bmake/crypto/openssl/crypto/pkcs7/enc.c projects/bmake/crypto/openssl/crypto/pkcs7/es1.pem projects/bmake/crypto/openssl/crypto/pkcs7/example.c projects/bmake/crypto/openssl/crypto/pkcs7/example.h projects/bmake/crypto/openssl/crypto/pkcs7/info.pem projects/bmake/crypto/openssl/crypto/pkcs7/infokey.pem projects/bmake/crypto/openssl/crypto/pkcs7/p7/ projects/bmake/crypto/openssl/crypto/pkcs7/server.pem projects/bmake/crypto/openssl/crypto/pkcs7/sign.c projects/bmake/crypto/openssl/crypto/pkcs7/t/ projects/bmake/crypto/openssl/crypto/pkcs7/verify.c projects/bmake/crypto/openssl/doc/crypto/CMS_sign_add1_signer.pod projects/bmake/etc/rc.d/faith projects/bmake/etc/rc.d/initrandom projects/bmake/etc/rc.d/kerberos projects/bmake/etc/rc.d/postrandom projects/bmake/lib/libc/arm/Symbol_oabi.map projects/bmake/lib/libproc/test/ projects/bmake/secure/lib/libcrypto/man/CMS_sign_add1_signer.3 projects/bmake/share/examples/autofs/ projects/bmake/share/man/man4/faith.4 projects/bmake/share/man/man8/hv_kvp_daemon.8 projects/bmake/share/man/man9/pmap_change_wiring.9 projects/bmake/sys/amd64/amd64/identcpu.c projects/bmake/sys/amd64/vmm/vmm_msr.c projects/bmake/sys/amd64/vmm/vmm_msr.h projects/bmake/sys/arm/freescale/imx/imx51_iomux.c projects/bmake/sys/arm/freescale/imx/imx51_iomuxreg.h projects/bmake/sys/arm/freescale/imx/imx51_iomuxvar.h projects/bmake/sys/arm/s3c2xx0/ projects/bmake/sys/arm/ti/am335x/files.beaglebone projects/bmake/sys/arm/ti/am335x/std.beaglebone projects/bmake/sys/arm/ti/omap3/ projects/bmake/sys/arm/ti/ti_mmchs.c projects/bmake/sys/arm/ti/ti_mmchs.h projects/bmake/sys/arm/versatile/if_smc_fdt.c projects/bmake/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts projects/bmake/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts projects/bmake/sys/boot/usb/bsd_busspace.c projects/bmake/sys/boot/usb/bsd_global.h projects/bmake/sys/boot/usb/bsd_kernel.c projects/bmake/sys/boot/usb/bsd_kernel.h projects/bmake/sys/boot/usb/tools/sysinit.h projects/bmake/sys/cddl/dev/fbt/fbt_powerpc.c projects/bmake/sys/contrib/dev/acpica/compiler/aslcompiler.y projects/bmake/sys/dev/dpt/dpt_isa.c projects/bmake/sys/dev/i40e/ projects/bmake/sys/dev/random/harvest.c projects/bmake/sys/dev/random/rwfile.c projects/bmake/sys/dev/random/rwfile.h projects/bmake/sys/i386/i386/identcpu.c projects/bmake/sys/modules/acpi/acpi/ projects/bmake/sys/modules/i40e/ projects/bmake/sys/modules/if_faith/ projects/bmake/sys/modules/svr4/README projects/bmake/sys/modules/svr4/TO-DO projects/bmake/sys/net/if_faith.c projects/bmake/sys/netinet/ip_gre.h projects/bmake/sys/ofed/drivers/net/mlx4/en_frag.c projects/bmake/sys/ofed/drivers/net/mlx4/en_params.c projects/bmake/sys/ofed/drivers/net/mlx4/xrcd.c projects/bmake/sys/ofed/include/asm/current.h projects/bmake/sys/ofed/include/asm/page.h projects/bmake/sys/ofed/include/asm/semaphore.h projects/bmake/sys/ofed/include/asm/system.h projects/bmake/sys/ofed/include/linux/atomic.h projects/bmake/sys/ofed/include/linux/bitmap.h projects/bmake/sys/ofed/include/linux/ctype.h projects/bmake/sys/ofed/include/linux/ethtool.h projects/bmake/sys/ofed/include/linux/inet.h projects/bmake/sys/ofed/include/linux/init.h projects/bmake/sys/ofed/include/linux/mount.h projects/bmake/sys/ofed/include/linux/rtnetlink.h projects/bmake/sys/ofed/include/linux/stddef.h projects/bmake/sys/ofed/include/net/addrconf.h projects/bmake/sys/ofed/include/net/arp.h projects/bmake/sys/ofed/include/net/ip6_route.h projects/bmake/sys/ofed/include/net/neighbour.h projects/bmake/sys/pc98/cbus/fdc.c projects/bmake/sys/pc98/cbus/fdc_cbus.c projects/bmake/sys/pc98/cbus/fdcreg.h projects/bmake/sys/pc98/cbus/fdcvar.h projects/bmake/sys/pc98/pc98/machdep.c projects/bmake/sys/pci/ projects/bmake/sys/powerpc/include/sf_buf.h projects/bmake/sys/powerpc/powermac/windtunnel.c projects/bmake/sys/sys/sf_base.h projects/bmake/sys/sys/sf_sync.h projects/bmake/sys/xen/evtchn/evtchn_dev.c projects/bmake/sys/xen/xenstore/xenstore.c projects/bmake/sys/xen/xenstore/xenstore_dev.c projects/bmake/tests/lib/ projects/bmake/tools/build/options/WITHOUT_ARM_EABI projects/bmake/tools/build/options/WITH_PIE projects/bmake/tools/regression/lib/libc/gen/test-arc4random.c projects/bmake/tools/regression/lib/libc/gen/test-fpclassify.c projects/bmake/tools/regression/lib/libc/stdio/test-fmemopen.c projects/bmake/tools/regression/lib/libmp/ projects/bmake/tools/regression/lib/libnv/ projects/bmake/tools/regression/lib/libutil/ projects/bmake/tools/regression/pjdfstest/ projects/bmake/tools/tools/bootparttest/malloc.c projects/bmake/usr.bin/m4/lib/ projects/bmake/usr.sbin/bhyve/pmtmr.c projects/bmake/usr.sbin/ftp-proxy/Makefile.inc projects/bmake/usr.sbin/pkg/elf_tables.h Modified: projects/bmake/.arcconfig projects/bmake/MAINTAINERS (contents, props changed) projects/bmake/Makefile projects/bmake/Makefile.inc1 projects/bmake/ObsoleteFiles.inc projects/bmake/UPDATING projects/bmake/bin/csh/Makefile projects/bmake/bin/date/tests/Makefile projects/bmake/bin/dd/dd.1 projects/bmake/bin/df/Makefile projects/bmake/bin/df/df.1 projects/bmake/bin/df/df.c projects/bmake/bin/ed/cbc.c projects/bmake/bin/pkill/tests/Makefile projects/bmake/bin/pkill/tests/pgrep-j_test.sh projects/bmake/bin/pkill/tests/pkill-j_test.sh projects/bmake/bin/ps/keyword.c projects/bmake/bin/ps/ps.1 projects/bmake/bin/rmail/Makefile projects/bmake/bin/sh/arith_yacc.c projects/bmake/bin/sh/eval.c projects/bmake/bin/sh/expand.c projects/bmake/bin/sh/histedit.c projects/bmake/bin/sh/input.c projects/bmake/bin/sh/input.h projects/bmake/bin/sh/jobs.c projects/bmake/bin/sh/mystring.c projects/bmake/bin/sh/options.c projects/bmake/bin/sh/options.h projects/bmake/bin/sh/parser.c projects/bmake/bin/sh/redir.c projects/bmake/bin/sh/sh.1 projects/bmake/bin/sh/tests/Makefile projects/bmake/bin/sh/tests/builtins/Makefile projects/bmake/bin/sh/tests/errors/Makefile projects/bmake/bin/sh/tests/errors/bad-parm-exp2.2 projects/bmake/bin/sh/tests/errors/bad-parm-exp2.2.stderr projects/bmake/bin/sh/tests/errors/bad-parm-exp3.2 projects/bmake/bin/sh/tests/errors/bad-parm-exp3.2.stderr projects/bmake/bin/sh/tests/errors/bad-parm-exp4.2 projects/bmake/bin/sh/tests/errors/bad-parm-exp4.2.stderr projects/bmake/bin/sh/tests/errors/bad-parm-exp5.2 projects/bmake/bin/sh/tests/errors/bad-parm-exp5.2.stderr projects/bmake/bin/sh/tests/errors/bad-parm-exp6.2 projects/bmake/bin/sh/tests/errors/bad-parm-exp6.2.stderr projects/bmake/bin/sh/tests/execution/Makefile projects/bmake/bin/sh/tests/expansion/Makefile projects/bmake/bin/sh/tests/parameters/Makefile projects/bmake/bin/sh/tests/parser/Makefile projects/bmake/bin/sh/tests/set-e/Makefile projects/bmake/bin/sh/trap.c projects/bmake/bin/sleep/Makefile projects/bmake/cddl/Makefile.inc projects/bmake/cddl/contrib/dtracetoolkit/Apps/shellsnoop projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh projects/bmake/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh projects/bmake/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 projects/bmake/cddl/contrib/opensolaris/cmd/lockstat/sym.c projects/bmake/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/bmake/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/bmake/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/bmake/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/bmake/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/bmake/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c projects/bmake/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c projects/bmake/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/bmake/cddl/contrib/opensolaris/common/avl/avl.c projects/bmake/cddl/contrib/opensolaris/head/libintl.h projects/bmake/cddl/contrib/opensolaris/head/nlist.h projects/bmake/cddl/contrib/opensolaris/head/synch.h projects/bmake/cddl/contrib/opensolaris/head/thread.h projects/bmake/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h projects/bmake/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c projects/bmake/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/bmake/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/bmake/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/bmake/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/bmake/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c projects/bmake/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/bmake/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c projects/bmake/cddl/lib/libdtrace/libproc_compat.h projects/bmake/cddl/lib/libdtrace/tcp.d projects/bmake/cddl/lib/libzfs/Makefile projects/bmake/cddl/lib/libzpool/Makefile projects/bmake/cddl/usr.sbin/Makefile projects/bmake/contrib/apr-util/CHANGES projects/bmake/contrib/apr-util/NOTICE projects/bmake/contrib/apr-util/apr-util.spec projects/bmake/contrib/apr-util/configure projects/bmake/contrib/apr-util/crypto/apr_crypto.c projects/bmake/contrib/apr-util/crypto/apr_passwd.c projects/bmake/contrib/apr-util/dbd/apr_dbd_mysql.c projects/bmake/contrib/apr-util/dbd/apr_dbd_odbc.c projects/bmake/contrib/apr-util/dbm/NWGNUmakefile projects/bmake/contrib/apr-util/include/apu_version.h projects/bmake/contrib/apr-util/test/Makefile.win projects/bmake/contrib/atf/FREEBSD-Xlist projects/bmake/contrib/atf/FREEBSD-upgrade projects/bmake/contrib/atf/NEWS projects/bmake/contrib/atf/atf-c++.hpp projects/bmake/contrib/atf/atf-c++/Kyuafile projects/bmake/contrib/atf/atf-c++/atf-c++-api.3 projects/bmake/contrib/atf/atf-c++/atf_c++_test.cpp projects/bmake/contrib/atf/atf-c++/build.cpp projects/bmake/contrib/atf/atf-c++/build.hpp projects/bmake/contrib/atf/atf-c++/build_test.cpp projects/bmake/contrib/atf/atf-c++/check.cpp projects/bmake/contrib/atf/atf-c++/check.hpp projects/bmake/contrib/atf/atf-c++/check_test.cpp projects/bmake/contrib/atf/atf-c++/detail/Kyuafile projects/bmake/contrib/atf/atf-c++/detail/application.cpp projects/bmake/contrib/atf/atf-c++/detail/application.hpp projects/bmake/contrib/atf/atf-c++/detail/application_test.cpp projects/bmake/contrib/atf/atf-c++/detail/auto_array.hpp projects/bmake/contrib/atf/atf-c++/detail/auto_array_test.cpp projects/bmake/contrib/atf/atf-c++/detail/env.cpp projects/bmake/contrib/atf/atf-c++/detail/env.hpp projects/bmake/contrib/atf/atf-c++/detail/env_test.cpp projects/bmake/contrib/atf/atf-c++/detail/exceptions.cpp projects/bmake/contrib/atf/atf-c++/detail/exceptions.hpp projects/bmake/contrib/atf/atf-c++/detail/exceptions_test.cpp projects/bmake/contrib/atf/atf-c++/detail/fs.cpp projects/bmake/contrib/atf/atf-c++/detail/fs.hpp projects/bmake/contrib/atf/atf-c++/detail/fs_test.cpp projects/bmake/contrib/atf/atf-c++/detail/process.cpp projects/bmake/contrib/atf/atf-c++/detail/process.hpp projects/bmake/contrib/atf/atf-c++/detail/process_test.cpp projects/bmake/contrib/atf/atf-c++/detail/sanity.hpp projects/bmake/contrib/atf/atf-c++/detail/test_helpers.cpp projects/bmake/contrib/atf/atf-c++/detail/test_helpers.hpp projects/bmake/contrib/atf/atf-c++/detail/text.cpp projects/bmake/contrib/atf/atf-c++/detail/text.hpp projects/bmake/contrib/atf/atf-c++/detail/text_test.cpp projects/bmake/contrib/atf/atf-c++/detail/version_helper.cpp projects/bmake/contrib/atf/atf-c++/macros.hpp projects/bmake/contrib/atf/atf-c++/macros_hpp_test.cpp projects/bmake/contrib/atf/atf-c++/macros_test.cpp projects/bmake/contrib/atf/atf-c++/pkg_config_test.sh projects/bmake/contrib/atf/atf-c++/tests.cpp projects/bmake/contrib/atf/atf-c++/tests.hpp projects/bmake/contrib/atf/atf-c++/tests_test.cpp projects/bmake/contrib/atf/atf-c++/unused_test.cpp projects/bmake/contrib/atf/atf-c++/utils.cpp projects/bmake/contrib/atf/atf-c++/utils.hpp projects/bmake/contrib/atf/atf-c++/utils_test.cpp projects/bmake/contrib/atf/atf-c.h projects/bmake/contrib/atf/atf-c/Kyuafile projects/bmake/contrib/atf/atf-c/atf-c-api.3 projects/bmake/contrib/atf/atf-c/atf_c_test.c projects/bmake/contrib/atf/atf-c/build.c projects/bmake/contrib/atf/atf-c/build.h projects/bmake/contrib/atf/atf-c/build_test.c projects/bmake/contrib/atf/atf-c/check.c projects/bmake/contrib/atf/atf-c/check.h projects/bmake/contrib/atf/atf-c/check_test.c projects/bmake/contrib/atf/atf-c/defs.h.in projects/bmake/contrib/atf/atf-c/detail/dynstr.c projects/bmake/contrib/atf/atf-c/detail/dynstr.h projects/bmake/contrib/atf/atf-c/detail/dynstr_test.c projects/bmake/contrib/atf/atf-c/detail/env.c projects/bmake/contrib/atf/atf-c/detail/env.h projects/bmake/contrib/atf/atf-c/detail/env_test.c projects/bmake/contrib/atf/atf-c/detail/fs.c projects/bmake/contrib/atf/atf-c/detail/fs.h projects/bmake/contrib/atf/atf-c/detail/fs_test.c projects/bmake/contrib/atf/atf-c/detail/list.c projects/bmake/contrib/atf/atf-c/detail/list.h projects/bmake/contrib/atf/atf-c/detail/list_test.c projects/bmake/contrib/atf/atf-c/detail/map.c projects/bmake/contrib/atf/atf-c/detail/map.h projects/bmake/contrib/atf/atf-c/detail/map_test.c projects/bmake/contrib/atf/atf-c/detail/process.c projects/bmake/contrib/atf/atf-c/detail/process.h projects/bmake/contrib/atf/atf-c/detail/process_helpers.c projects/bmake/contrib/atf/atf-c/detail/process_test.c projects/bmake/contrib/atf/atf-c/detail/sanity.c projects/bmake/contrib/atf/atf-c/detail/sanity.h projects/bmake/contrib/atf/atf-c/detail/sanity_test.c projects/bmake/contrib/atf/atf-c/detail/test_helpers.c projects/bmake/contrib/atf/atf-c/detail/test_helpers.h projects/bmake/contrib/atf/atf-c/detail/text.c projects/bmake/contrib/atf/atf-c/detail/text.h projects/bmake/contrib/atf/atf-c/detail/text_test.c projects/bmake/contrib/atf/atf-c/detail/tp_main.c projects/bmake/contrib/atf/atf-c/detail/user.c projects/bmake/contrib/atf/atf-c/detail/user.h projects/bmake/contrib/atf/atf-c/detail/user_test.c projects/bmake/contrib/atf/atf-c/detail/version_helper.c projects/bmake/contrib/atf/atf-c/error.c projects/bmake/contrib/atf/atf-c/error.h projects/bmake/contrib/atf/atf-c/error_fwd.h projects/bmake/contrib/atf/atf-c/error_test.c projects/bmake/contrib/atf/atf-c/h_build.h projects/bmake/contrib/atf/atf-c/macros.h projects/bmake/contrib/atf/atf-c/macros_h_test.c projects/bmake/contrib/atf/atf-c/macros_test.c projects/bmake/contrib/atf/atf-c/pkg_config_test.sh projects/bmake/contrib/atf/atf-c/tc.c projects/bmake/contrib/atf/atf-c/tc.h projects/bmake/contrib/atf/atf-c/tc_test.c projects/bmake/contrib/atf/atf-c/tp.c projects/bmake/contrib/atf/atf-c/tp.h projects/bmake/contrib/atf/atf-c/tp_test.c projects/bmake/contrib/atf/atf-c/unused_test.c projects/bmake/contrib/atf/atf-c/utils.c projects/bmake/contrib/atf/atf-c/utils.h projects/bmake/contrib/atf/atf-c/utils_test.c projects/bmake/contrib/atf/atf-sh/atf-check.1 projects/bmake/contrib/atf/atf-sh/atf-check.cpp projects/bmake/contrib/atf/atf-sh/atf-check_test.sh projects/bmake/contrib/atf/atf-sh/atf-sh-api.3 projects/bmake/contrib/atf/atf-sh/atf-sh.1 projects/bmake/contrib/atf/atf-sh/atf-sh.cpp projects/bmake/contrib/atf/atf-sh/atf_check_test.sh projects/bmake/contrib/atf/atf-sh/config_test.sh projects/bmake/contrib/atf/atf-sh/integration_test.sh projects/bmake/contrib/atf/atf-sh/libatf-sh.subr projects/bmake/contrib/atf/atf-sh/misc_helpers.sh projects/bmake/contrib/atf/atf-sh/normalize_test.sh projects/bmake/contrib/atf/atf-sh/tc_test.sh projects/bmake/contrib/atf/atf-sh/tp_test.sh projects/bmake/contrib/atf/doc/atf-test-case.4 projects/bmake/contrib/atf/doc/atf-test-program.1 projects/bmake/contrib/atf/test-programs/c_helpers.c projects/bmake/contrib/atf/test-programs/common.sh projects/bmake/contrib/atf/test-programs/config_test.sh projects/bmake/contrib/atf/test-programs/cpp_helpers.cpp projects/bmake/contrib/atf/test-programs/expect_test.sh projects/bmake/contrib/atf/test-programs/meta_data_test.sh projects/bmake/contrib/atf/test-programs/result_test.sh projects/bmake/contrib/atf/test-programs/sh_helpers.sh projects/bmake/contrib/atf/test-programs/srcdir_test.sh projects/bmake/contrib/binutils/bfd/config.bfd projects/bmake/contrib/binutils/bfd/elf32-arm.c projects/bmake/contrib/binutils/bfd/elf32-ppc.c projects/bmake/contrib/binutils/bfd/elf64-ppc.c projects/bmake/contrib/binutils/gas/config/tc-arm.c projects/bmake/contrib/binutils/gas/config/tc-ppc.c projects/bmake/contrib/binutils/include/elf/arm.h projects/bmake/contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh projects/bmake/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh projects/bmake/contrib/binutils/ld/emultempl/elf32.em projects/bmake/contrib/bsnmp/snmp_target/target_snmp.c projects/bmake/contrib/byacc/CHANGES projects/bmake/contrib/byacc/MANIFEST projects/bmake/contrib/byacc/VERSION projects/bmake/contrib/byacc/aclocal.m4 projects/bmake/contrib/byacc/btyaccpar.c projects/bmake/contrib/byacc/closure.c projects/bmake/contrib/byacc/config.sub projects/bmake/contrib/byacc/configure projects/bmake/contrib/byacc/configure.in projects/bmake/contrib/byacc/defs.h projects/bmake/contrib/byacc/lalr.c projects/bmake/contrib/byacc/main.c projects/bmake/contrib/byacc/output.c projects/bmake/contrib/byacc/package/byacc.spec projects/bmake/contrib/byacc/package/debian/changelog projects/bmake/contrib/byacc/package/debian/source/format projects/bmake/contrib/byacc/package/mingw-byacc.spec projects/bmake/contrib/byacc/package/pkgsrc/Makefile projects/bmake/contrib/byacc/reader.c projects/bmake/contrib/byacc/test/btyacc/btyacc_calc1.tab.c projects/bmake/contrib/byacc/test/btyacc/btyacc_demo.tab.c projects/bmake/contrib/byacc/test/btyacc/calc.tab.c projects/bmake/contrib/byacc/test/btyacc/calc1.tab.c projects/bmake/contrib/byacc/test/btyacc/calc2.tab.c projects/bmake/contrib/byacc/test/btyacc/calc3.tab.c projects/bmake/contrib/byacc/test/btyacc/code_calc.code.c projects/bmake/contrib/byacc/test/btyacc/code_calc.tab.c projects/bmake/contrib/byacc/test/btyacc/code_error.code.c projects/bmake/contrib/byacc/test/btyacc/code_error.tab.c projects/bmake/contrib/byacc/test/btyacc/empty.tab.c projects/bmake/contrib/byacc/test/btyacc/err_inherit1.tab.c projects/bmake/contrib/byacc/test/btyacc/err_inherit2.tab.c projects/bmake/contrib/byacc/test/btyacc/err_inherit3.tab.c projects/bmake/contrib/byacc/test/btyacc/err_inherit4.tab.c projects/bmake/contrib/byacc/test/btyacc/err_inherit5.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax1.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax10.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax11.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax12.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax13.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax14.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax15.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax16.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax17.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax18.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax19.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax2.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax20.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax21.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax22.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax23.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax24.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax25.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax26.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax27.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax3.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax4.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax5.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax6.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax7.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax7a.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax7b.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax8.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax8a.tab.c projects/bmake/contrib/byacc/test/btyacc/err_syntax9.tab.c projects/bmake/contrib/byacc/test/btyacc/error.tab.c projects/bmake/contrib/byacc/test/btyacc/grammar.tab.c projects/bmake/contrib/byacc/test/btyacc/inherit0.tab.c projects/bmake/contrib/byacc/test/btyacc/inherit1.tab.c projects/bmake/contrib/byacc/test/btyacc/inherit2.tab.c projects/bmake/contrib/byacc/test/btyacc/ok_syntax1.tab.c projects/bmake/contrib/byacc/test/btyacc/pure_calc.tab.c projects/bmake/contrib/byacc/test/btyacc/pure_error.tab.c projects/bmake/contrib/byacc/test/btyacc/quote_calc-s.tab.c projects/bmake/contrib/byacc/test/btyacc/quote_calc.tab.c projects/bmake/contrib/byacc/test/btyacc/quote_calc2-s.tab.c projects/bmake/contrib/byacc/test/btyacc/quote_calc2.tab.c projects/bmake/contrib/byacc/test/btyacc/quote_calc3-s.tab.c projects/bmake/contrib/byacc/test/btyacc/quote_calc3.tab.c projects/bmake/contrib/byacc/test/btyacc/quote_calc4-s.tab.c projects/bmake/contrib/byacc/test/btyacc/quote_calc4.tab.c projects/bmake/contrib/byacc/test/btyacc/rename_debug.c projects/bmake/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c projects/bmake/contrib/byacc/test/yacc/calc.tab.c projects/bmake/contrib/byacc/test/yacc/calc1.tab.c projects/bmake/contrib/byacc/test/yacc/calc2.tab.c projects/bmake/contrib/byacc/test/yacc/calc3.tab.c projects/bmake/contrib/byacc/test/yacc/code_calc.code.c projects/bmake/contrib/byacc/test/yacc/code_calc.tab.c projects/bmake/contrib/byacc/test/yacc/code_error.code.c projects/bmake/contrib/byacc/test/yacc/code_error.tab.c projects/bmake/contrib/byacc/test/yacc/empty.tab.c projects/bmake/contrib/byacc/test/yacc/err_syntax10.tab.c projects/bmake/contrib/byacc/test/yacc/err_syntax11.tab.c projects/bmake/contrib/byacc/test/yacc/err_syntax12.tab.c projects/bmake/contrib/byacc/test/yacc/err_syntax18.tab.c projects/bmake/contrib/byacc/test/yacc/err_syntax20.tab.c projects/bmake/contrib/byacc/test/yacc/error.tab.c projects/bmake/contrib/byacc/test/yacc/grammar.tab.c projects/bmake/contrib/byacc/test/yacc/ok_syntax1.tab.c projects/bmake/contrib/byacc/test/yacc/pure_calc.tab.c projects/bmake/contrib/byacc/test/yacc/pure_error.tab.c projects/bmake/contrib/byacc/test/yacc/quote_calc-s.tab.c projects/bmake/contrib/byacc/test/yacc/quote_calc.tab.c projects/bmake/contrib/byacc/test/yacc/quote_calc2-s.tab.c projects/bmake/contrib/byacc/test/yacc/quote_calc2.tab.c projects/bmake/contrib/byacc/test/yacc/quote_calc3-s.tab.c projects/bmake/contrib/byacc/test/yacc/quote_calc3.tab.c projects/bmake/contrib/byacc/test/yacc/quote_calc4-s.tab.c projects/bmake/contrib/byacc/test/yacc/quote_calc4.tab.c projects/bmake/contrib/byacc/test/yacc/rename_debug.c projects/bmake/contrib/byacc/test/yacc/varsyntax_calc1.tab.c projects/bmake/contrib/byacc/yacc.1 projects/bmake/contrib/elftoolchain/libelf/libelf_align.c projects/bmake/contrib/elftoolchain/libelf/libelf_convert.m4 projects/bmake/contrib/file/magic/Magdir/filesystems projects/bmake/contrib/gcc/config/i386/emmintrin.h projects/bmake/contrib/ipfilter/lib/gethost.c projects/bmake/contrib/ipfilter/lib/printnat.c projects/bmake/contrib/ipfilter/tools/ipf_y.y projects/bmake/contrib/ipfilter/tools/ipnat_y.y projects/bmake/contrib/libarchive/tar/util.c projects/bmake/contrib/libc++/include/__config projects/bmake/contrib/libc++/include/list projects/bmake/contrib/libc++/include/type_traits projects/bmake/contrib/libc++/src/new.cpp projects/bmake/contrib/libc-vis/vis.c projects/bmake/contrib/libcxxrt/auxhelper.cc projects/bmake/contrib/libcxxrt/stdexcept.cc projects/bmake/contrib/libcxxrt/stdexcept.h projects/bmake/contrib/libpcap/inet.c projects/bmake/contrib/libpcap/pcap.c projects/bmake/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h projects/bmake/contrib/llvm/include/llvm/Support/ELF.h projects/bmake/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/bmake/contrib/llvm/lib/MC/MCParser/AsmParser.cpp projects/bmake/contrib/llvm/lib/Object/ELF.cpp projects/bmake/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td projects/bmake/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPC.h projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp projects/bmake/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h projects/bmake/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/bmake/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp projects/bmake/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp projects/bmake/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/bmake/contrib/mtree/create.c projects/bmake/contrib/mtree/extern.h projects/bmake/contrib/mtree/getid.c projects/bmake/contrib/mtree/mtree.c projects/bmake/contrib/mtree/spec.c projects/bmake/contrib/netcat/netcat.c projects/bmake/contrib/ofed/libibverbs/examples/asyncwatch.c projects/bmake/contrib/ofed/libibverbs/examples/device_list.c projects/bmake/contrib/ofed/libibverbs/examples/devinfo.c projects/bmake/contrib/ofed/libmlx4/src/mlx4-abi.h projects/bmake/contrib/ofed/librdmacm/examples/rping.c projects/bmake/contrib/ofed/usr.lib/Makefile projects/bmake/contrib/ofed/usr.lib/Makefile.inc projects/bmake/contrib/one-true-awk/awk.1 projects/bmake/contrib/one-true-awk/main.c projects/bmake/contrib/one-true-awk/run.c projects/bmake/contrib/openbsm/bin/auditdistd/sender.c projects/bmake/contrib/openbsm/bin/auditdistd/subr.c projects/bmake/contrib/openpam/CREDITS (contents, props changed) projects/bmake/contrib/openpam/HISTORY (contents, props changed) projects/bmake/contrib/openpam/INSTALL (contents, props changed) projects/bmake/contrib/openpam/LICENSE (contents, props changed) projects/bmake/contrib/openpam/Makefile.am (contents, props changed) projects/bmake/contrib/openpam/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/README (contents, props changed) projects/bmake/contrib/openpam/RELNOTES (contents, props changed) projects/bmake/contrib/openpam/TODO projects/bmake/contrib/openpam/aclocal.m4 (contents, props changed) projects/bmake/contrib/openpam/autogen.sh (contents, props changed) projects/bmake/contrib/openpam/bin/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/bin/openpam_dump_policy/Makefile.in projects/bmake/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c projects/bmake/contrib/openpam/bin/pamtest/Makefile.in projects/bmake/contrib/openpam/bin/pamtest/pamtest.1 projects/bmake/contrib/openpam/bin/su/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/bin/su/su.1 projects/bmake/contrib/openpam/config.h.in (contents, props changed) projects/bmake/contrib/openpam/configure (contents, props changed) projects/bmake/contrib/openpam/configure.ac (contents, props changed) projects/bmake/contrib/openpam/doc/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/doc/man/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_borrow_cred.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_free_data.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_free_envlist.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_get_feature.3 projects/bmake/contrib/openpam/doc/man/openpam_get_option.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_log.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_nullconv.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_readline.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_readlinev.3 projects/bmake/contrib/openpam/doc/man/openpam_readword.3 projects/bmake/contrib/openpam/doc/man/openpam_restore_cred.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_set_feature.3 projects/bmake/contrib/openpam/doc/man/openpam_set_option.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/openpam_straddch.3 projects/bmake/contrib/openpam/doc/man/openpam_subst.3 projects/bmake/contrib/openpam/doc/man/openpam_ttyconv.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam.conf.5 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_acct_mgmt.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_authenticate.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_chauthtok.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_close_session.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_conv.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_end.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_error.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_get_authtok.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_get_data.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_get_item.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_get_user.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_getenv.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_getenvlist.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_info.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_open_session.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_prompt.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_putenv.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_set_data.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_set_item.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_setcred.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_setenv.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_sm_authenticate.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_sm_chauthtok.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_sm_close_session.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_sm_open_session.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_sm_setcred.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_start.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_strerror.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_verror.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_vinfo.3 (contents, props changed) projects/bmake/contrib/openpam/doc/man/pam_vprompt.3 (contents, props changed) projects/bmake/contrib/openpam/include/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/include/security/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/include/security/openpam_version.h (contents, props changed) projects/bmake/contrib/openpam/lib/Makefile.am projects/bmake/contrib/openpam/lib/Makefile.in projects/bmake/contrib/openpam/lib/libpam/Makefile.am projects/bmake/contrib/openpam/lib/libpam/Makefile.in projects/bmake/contrib/openpam/lib/libpam/openpam_configure.c projects/bmake/contrib/openpam/lib/libpam/openpam_ctype.h projects/bmake/contrib/openpam/lib/libpam/openpam_dispatch.c projects/bmake/contrib/openpam/lib/libpam/openpam_readword.c projects/bmake/contrib/openpam/lib/libpam/openpam_ttyconv.c projects/bmake/contrib/openpam/lib/libpam/pam_get_authtok.c projects/bmake/contrib/openpam/ltmain.sh (contents, props changed) projects/bmake/contrib/openpam/mkpkgng.in projects/bmake/contrib/openpam/modules/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/modules/pam_deny/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/modules/pam_permit/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/modules/pam_unix/Makefile.in (contents, props changed) projects/bmake/contrib/openpam/pamgdb.in projects/bmake/contrib/openpam/t/Makefile.am projects/bmake/contrib/openpam/t/Makefile.in projects/bmake/contrib/openpam/t/t_openpam_ctype.c projects/bmake/contrib/openpam/t/t_openpam_readlinev.c projects/bmake/contrib/openpam/t/t_openpam_readword.c projects/bmake/contrib/opie/libopie/challenge.c projects/bmake/contrib/opie/opie.h projects/bmake/contrib/opie/opiekey.c projects/bmake/contrib/serf/CHANGES projects/bmake/contrib/serf/buckets/ssl_buckets.c projects/bmake/contrib/serf/serf.h projects/bmake/contrib/smbfs/lib/smb/ctx.c projects/bmake/contrib/smbfs/mount_smbfs/mount_smbfs.c projects/bmake/contrib/sqlite3/INSTALL projects/bmake/contrib/sqlite3/Makefile.in projects/bmake/contrib/sqlite3/aclocal.m4 projects/bmake/contrib/sqlite3/config.guess projects/bmake/contrib/sqlite3/config.sub projects/bmake/contrib/sqlite3/configure projects/bmake/contrib/sqlite3/configure.ac projects/bmake/contrib/sqlite3/depcomp projects/bmake/contrib/sqlite3/install-sh projects/bmake/contrib/sqlite3/ltmain.sh projects/bmake/contrib/sqlite3/missing projects/bmake/contrib/sqlite3/shell.c projects/bmake/contrib/sqlite3/sqlite3.1 projects/bmake/contrib/sqlite3/sqlite3.c projects/bmake/contrib/sqlite3/sqlite3.h projects/bmake/contrib/sqlite3/sqlite3ext.h projects/bmake/contrib/subversion/CHANGES projects/bmake/contrib/subversion/build-outputs.mk projects/bmake/contrib/subversion/build.conf projects/bmake/contrib/subversion/configure projects/bmake/contrib/subversion/configure.ac projects/bmake/contrib/subversion/get-deps.sh projects/bmake/contrib/subversion/subversion/include/svn_version.h projects/bmake/contrib/subversion/subversion/libsvn_client/delete.c projects/bmake/contrib/subversion/subversion/libsvn_client/externals.c projects/bmake/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c projects/bmake/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h projects/bmake/contrib/subversion/subversion/libsvn_ra_serf/commit.c projects/bmake/contrib/subversion/subversion/libsvn_ra_serf/options.c projects/bmake/contrib/subversion/subversion/libsvn_ra_serf/util.c projects/bmake/contrib/subversion/subversion/libsvn_subr/config_auth.c projects/bmake/contrib/subversion/subversion/libsvn_subr/dirent_uri.c projects/bmake/contrib/subversion/subversion/libsvn_subr/internal_statements.h projects/bmake/contrib/subversion/subversion/libsvn_subr/opt.c projects/bmake/contrib/subversion/subversion/libsvn_wc/wc-checks.h projects/bmake/contrib/subversion/subversion/libsvn_wc/wc-metadata.h projects/bmake/contrib/subversion/subversion/libsvn_wc/wc-queries.h projects/bmake/contrib/subversion/subversion/libsvn_wc/wc_db.c projects/bmake/contrib/subversion/subversion/svn/util.c projects/bmake/contrib/tcp_wrappers/inetcf.h projects/bmake/contrib/tcp_wrappers/mystdarg.h projects/bmake/contrib/tcp_wrappers/tcpd.h projects/bmake/contrib/tcp_wrappers/tli-sequent.h projects/bmake/contrib/tcpdump/tcpdump.c projects/bmake/contrib/telnet/arpa/telnet.h projects/bmake/contrib/telnet/telnet/commands.c projects/bmake/contrib/telnet/telnet/externs.h projects/bmake/contrib/telnet/telnet/main.c projects/bmake/contrib/telnet/telnet/sys_bsd.c projects/bmake/contrib/telnet/telnet/telnet.1 projects/bmake/contrib/telnet/telnet/telnet.c projects/bmake/contrib/telnet/telnet/types.h projects/bmake/contrib/telnet/telnetd/sys_term.c projects/bmake/contrib/tnftp/src/fetch.c projects/bmake/contrib/tzdata/africa projects/bmake/contrib/tzdata/antarctica projects/bmake/contrib/tzdata/asia projects/bmake/contrib/tzdata/australasia projects/bmake/contrib/tzdata/backward projects/bmake/contrib/tzdata/etcetera projects/bmake/contrib/tzdata/europe projects/bmake/contrib/tzdata/factory projects/bmake/contrib/tzdata/leap-seconds.list projects/bmake/contrib/tzdata/northamerica projects/bmake/contrib/tzdata/pacificnew projects/bmake/contrib/tzdata/southamerica projects/bmake/contrib/tzdata/systemv projects/bmake/contrib/tzdata/yearistype.sh projects/bmake/contrib/tzdata/zone.tab projects/bmake/contrib/xz/ChangeLog projects/bmake/contrib/xz/FREEBSD-Xlist projects/bmake/contrib/xz/THANKS projects/bmake/contrib/xz/TODO projects/bmake/contrib/xz/src/liblzma/api/lzma/block.h projects/bmake/contrib/xz/src/liblzma/api/lzma/version.h projects/bmake/contrib/xz/src/liblzma/check/crc32_fast.c projects/bmake/contrib/xz/src/liblzma/check/sha256.c projects/bmake/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c projects/bmake/contrib/xz/src/xz/coder.c projects/bmake/contrib/xz/src/xz/signals.c projects/bmake/contrib/xz/src/xz/suffix.c projects/bmake/crypto/heimdal/tools/krb5-config.in projects/bmake/crypto/openssl/CHANGES projects/bmake/crypto/openssl/Configure projects/bmake/crypto/openssl/FAQ projects/bmake/crypto/openssl/Makefile projects/bmake/crypto/openssl/NEWS projects/bmake/crypto/openssl/README projects/bmake/crypto/openssl/apps/apps.c projects/bmake/crypto/openssl/apps/ca.c projects/bmake/crypto/openssl/apps/ciphers.c projects/bmake/crypto/openssl/apps/crl2p7.c projects/bmake/crypto/openssl/apps/enc.c projects/bmake/crypto/openssl/apps/ocsp.c projects/bmake/crypto/openssl/apps/progs.h projects/bmake/crypto/openssl/apps/progs.pl projects/bmake/crypto/openssl/apps/s_client.c projects/bmake/crypto/openssl/apps/s_server.c projects/bmake/crypto/openssl/crypto/Makefile projects/bmake/crypto/openssl/crypto/aes/asm/aesni-x86_64.pl projects/bmake/crypto/openssl/crypto/asn1/a_object.c projects/bmake/crypto/openssl/crypto/asn1/a_strex.c projects/bmake/crypto/openssl/crypto/asn1/a_utctm.c projects/bmake/crypto/openssl/crypto/asn1/ameth_lib.c projects/bmake/crypto/openssl/crypto/asn1/asn1_lib.c projects/bmake/crypto/openssl/crypto/asn1/asn_mime.c projects/bmake/crypto/openssl/crypto/asn1/asn_pack.c projects/bmake/crypto/openssl/crypto/asn1/bio_asn1.c projects/bmake/crypto/openssl/crypto/asn1/charmap.pl projects/bmake/crypto/openssl/crypto/asn1/evp_asn1.c projects/bmake/crypto/openssl/crypto/asn1/t_x509.c projects/bmake/crypto/openssl/crypto/asn1/tasn_enc.c projects/bmake/crypto/openssl/crypto/asn1/x_crl.c projects/bmake/crypto/openssl/crypto/bio/bio_lib.c projects/bmake/crypto/openssl/crypto/bn/asm/x86_64-gcc.c projects/bmake/crypto/openssl/crypto/bn/bn_exp.c projects/bmake/crypto/openssl/crypto/bn/bn_lib.c projects/bmake/crypto/openssl/crypto/bn/bn_nist.c projects/bmake/crypto/openssl/crypto/bn/bn_sqr.c projects/bmake/crypto/openssl/crypto/bn/exptest.c projects/bmake/crypto/openssl/crypto/cms/cms_pwri.c projects/bmake/crypto/openssl/crypto/conf/conf_def.c projects/bmake/crypto/openssl/crypto/dsa/dsa_ameth.c projects/bmake/crypto/openssl/crypto/ebcdic.h projects/bmake/crypto/openssl/crypto/ec/ec.h projects/bmake/crypto/openssl/crypto/ec/ec2_smpl.c projects/bmake/crypto/openssl/crypto/ec/ec_ameth.c projects/bmake/crypto/openssl/crypto/ec/ec_asn1.c projects/bmake/crypto/openssl/crypto/ec/ec_lib.c projects/bmake/crypto/openssl/crypto/ec/ecp_mont.c projects/bmake/crypto/openssl/crypto/ec/ecp_nist.c projects/bmake/crypto/openssl/crypto/ec/ecp_smpl.c projects/bmake/crypto/openssl/crypto/ec/ectest.c projects/bmake/crypto/openssl/crypto/evp/Makefile projects/bmake/crypto/openssl/crypto/evp/e_aes.c projects/bmake/crypto/openssl/crypto/evp/evp_enc.c projects/bmake/crypto/openssl/crypto/evp/evp_pbe.c projects/bmake/crypto/openssl/crypto/idea/ideatest.c projects/bmake/crypto/openssl/crypto/md5/asm/md5-x86_64.pl projects/bmake/crypto/openssl/crypto/modes/modes.h projects/bmake/crypto/openssl/crypto/objects/obj_dat.c projects/bmake/crypto/openssl/crypto/objects/obj_dat.h projects/bmake/crypto/openssl/crypto/objects/obj_dat.pl projects/bmake/crypto/openssl/crypto/ocsp/ocsp_ht.c projects/bmake/crypto/openssl/crypto/ocsp/ocsp_lib.c projects/bmake/crypto/openssl/crypto/ocsp/ocsp_vfy.c projects/bmake/crypto/openssl/crypto/opensslconf.h projects/bmake/crypto/openssl/crypto/opensslv.h projects/bmake/crypto/openssl/crypto/ossl_typ.h projects/bmake/crypto/openssl/crypto/pem/pvkfmt.c projects/bmake/crypto/openssl/crypto/pkcs7/Makefile projects/bmake/crypto/openssl/crypto/pkcs7/pkcs7.h projects/bmake/crypto/openssl/crypto/pqueue/pqueue.h projects/bmake/crypto/openssl/crypto/rand/md_rand.c projects/bmake/crypto/openssl/crypto/rand/rand_lcl.h projects/bmake/crypto/openssl/crypto/rand/rand_lib.c projects/bmake/crypto/openssl/crypto/rand/randfile.c projects/bmake/crypto/openssl/crypto/rsa/Makefile projects/bmake/crypto/openssl/crypto/rsa/rsa.h projects/bmake/crypto/openssl/crypto/rsa/rsa_eay.c projects/bmake/crypto/openssl/crypto/rsa/rsa_err.c projects/bmake/crypto/openssl/crypto/rsa/rsa_oaep.c projects/bmake/crypto/openssl/crypto/rsa/rsa_pk1.c projects/bmake/crypto/openssl/crypto/rsa/rsa_sign.c projects/bmake/crypto/openssl/crypto/srp/srp_lib.c projects/bmake/crypto/openssl/crypto/stack/safestack.h projects/bmake/crypto/openssl/crypto/ui/ui_lib.c projects/bmake/crypto/openssl/doc/apps/asn1parse.pod projects/bmake/crypto/openssl/doc/apps/ca.pod projects/bmake/crypto/openssl/doc/apps/ciphers.pod projects/bmake/crypto/openssl/doc/apps/cms.pod projects/bmake/crypto/openssl/doc/apps/crl.pod projects/bmake/crypto/openssl/doc/apps/dgst.pod projects/bmake/crypto/openssl/doc/apps/dhparam.pod projects/bmake/crypto/openssl/doc/apps/dsa.pod projects/bmake/crypto/openssl/doc/apps/ecparam.pod projects/bmake/crypto/openssl/doc/apps/gendsa.pod projects/bmake/crypto/openssl/doc/apps/genrsa.pod projects/bmake/crypto/openssl/doc/apps/rsa.pod projects/bmake/crypto/openssl/doc/apps/s_client.pod projects/bmake/crypto/openssl/doc/apps/s_server.pod projects/bmake/crypto/openssl/doc/apps/verify.pod projects/bmake/crypto/openssl/doc/apps/x509.pod projects/bmake/crypto/openssl/doc/apps/x509v3_config.pod projects/bmake/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod projects/bmake/crypto/openssl/doc/crypto/BIO_f_base64.pod projects/bmake/crypto/openssl/doc/crypto/BIO_push.pod projects/bmake/crypto/openssl/doc/crypto/BIO_s_accept.pod projects/bmake/crypto/openssl/doc/crypto/ERR_get_error.pod projects/bmake/crypto/openssl/doc/crypto/EVP_DigestInit.pod projects/bmake/crypto/openssl/doc/crypto/EVP_DigestVerifyInit.pod projects/bmake/crypto/openssl/doc/crypto/EVP_EncryptInit.pod projects/bmake/crypto/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod projects/bmake/crypto/openssl/doc/crypto/EVP_PKEY_sign.pod projects/bmake/crypto/openssl/doc/crypto/EVP_SignInit.pod projects/bmake/crypto/openssl/doc/crypto/RSA_set_method.pod projects/bmake/crypto/openssl/doc/crypto/RSA_sign.pod projects/bmake/crypto/openssl/doc/crypto/des.pod projects/bmake/crypto/openssl/doc/crypto/err.pod projects/bmake/crypto/openssl/doc/crypto/pem.pod projects/bmake/crypto/openssl/doc/crypto/ui.pod projects/bmake/crypto/openssl/doc/fingerprints.txt projects/bmake/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_add_session.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_new.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_set_cipher_list.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod projects/bmake/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod projects/bmake/crypto/openssl/doc/ssl/SSL_get_version.pod projects/bmake/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod projects/bmake/crypto/openssl/e_os.h projects/bmake/crypto/openssl/ssl/Makefile projects/bmake/crypto/openssl/ssl/d1_both.c projects/bmake/crypto/openssl/ssl/d1_clnt.c projects/bmake/crypto/openssl/ssl/d1_lib.c projects/bmake/crypto/openssl/ssl/d1_srtp.c projects/bmake/crypto/openssl/ssl/d1_srvr.c projects/bmake/crypto/openssl/ssl/dtls1.h projects/bmake/crypto/openssl/ssl/heartbeat_test.c projects/bmake/crypto/openssl/ssl/s23_clnt.c projects/bmake/crypto/openssl/ssl/s23_lib.c projects/bmake/crypto/openssl/ssl/s23_srvr.c projects/bmake/crypto/openssl/ssl/s2_lib.c projects/bmake/crypto/openssl/ssl/s3_cbc.c projects/bmake/crypto/openssl/ssl/s3_clnt.c projects/bmake/crypto/openssl/ssl/s3_enc.c projects/bmake/crypto/openssl/ssl/s3_lib.c projects/bmake/crypto/openssl/ssl/s3_pkt.c projects/bmake/crypto/openssl/ssl/s3_srvr.c projects/bmake/crypto/openssl/ssl/srtp.h projects/bmake/crypto/openssl/ssl/ssl.h projects/bmake/crypto/openssl/ssl/ssl3.h projects/bmake/crypto/openssl/ssl/ssl_ciph.c projects/bmake/crypto/openssl/ssl/ssl_err.c projects/bmake/crypto/openssl/ssl/ssl_lib.c projects/bmake/crypto/openssl/ssl/ssl_locl.h projects/bmake/crypto/openssl/ssl/ssl_stat.c projects/bmake/crypto/openssl/ssl/t1_enc.c projects/bmake/crypto/openssl/ssl/t1_lib.c projects/bmake/crypto/openssl/ssl/tls1.h projects/bmake/crypto/openssl/ssl/tls_srp.c projects/bmake/crypto/openssl/util/mk1mf.pl projects/bmake/crypto/openssl/util/mkdef.pl projects/bmake/crypto/openssl/util/mkerr.pl projects/bmake/crypto/openssl/util/ssleay.num projects/bmake/etc/Makefile projects/bmake/etc/defaults/periodic.conf projects/bmake/etc/defaults/rc.conf projects/bmake/etc/devd/Makefile projects/bmake/etc/devd/apple.conf projects/bmake/etc/devd/usb.conf projects/bmake/etc/mail/Makefile projects/bmake/etc/motd projects/bmake/etc/mtree/BSD.debug.dist projects/bmake/etc/mtree/BSD.include.dist projects/bmake/etc/mtree/BSD.root.dist projects/bmake/etc/mtree/BSD.tests.dist projects/bmake/etc/mtree/BSD.usr.dist projects/bmake/etc/mtree/BSD.var.dist projects/bmake/etc/network.subr projects/bmake/etc/pam.d/README projects/bmake/etc/periodic/daily/110.clean-tmps projects/bmake/etc/periodic/security/Makefile projects/bmake/etc/rc.d/Makefile projects/bmake/etc/rc.d/NETWORKING projects/bmake/etc/rc.d/SERVERS projects/bmake/etc/rc.d/adjkerntz projects/bmake/etc/rc.d/bgfsck projects/bmake/etc/rc.d/bridge projects/bmake/etc/rc.d/defaultroute projects/bmake/etc/rc.d/geli projects/bmake/etc/rc.d/gssd projects/bmake/etc/rc.d/ip6addrctl projects/bmake/etc/rc.d/jail projects/bmake/etc/rc.d/kadmind projects/bmake/etc/rc.d/kfd projects/bmake/etc/rc.d/kpasswdd projects/bmake/etc/rc.d/netif projects/bmake/etc/rc.d/random projects/bmake/etc/rc.d/routing projects/bmake/etc/rc.d/syscons projects/bmake/etc/rc.d/syslogd projects/bmake/etc/rc.firewall projects/bmake/etc/rc.subr projects/bmake/games/factor/factor.6 projects/bmake/games/factor/factor.c projects/bmake/games/primes/Makefile projects/bmake/games/primes/primes.c projects/bmake/games/primes/primes.h projects/bmake/gnu/lib/csu/Makefile projects/bmake/gnu/lib/libdialog/Makefile projects/bmake/gnu/lib/libgcc/Makefile projects/bmake/gnu/lib/libgcov/Makefile projects/bmake/gnu/lib/libstdc++/Makefile projects/bmake/gnu/lib/libsupc++/Makefile projects/bmake/gnu/usr.bin/Makefile projects/bmake/gnu/usr.bin/binutils/addr2line/Makefile projects/bmake/gnu/usr.bin/binutils/nm/Makefile projects/bmake/gnu/usr.bin/binutils/objcopy/Makefile projects/bmake/gnu/usr.bin/binutils/objdump/Makefile projects/bmake/gnu/usr.bin/binutils/readelf/Makefile projects/bmake/gnu/usr.bin/binutils/size/Makefile projects/bmake/gnu/usr.bin/binutils/strings/Makefile projects/bmake/gnu/usr.bin/binutils/strip/Makefile projects/bmake/gnu/usr.bin/cc/Makefile.inc projects/bmake/gnu/usr.bin/cc/cc_tools/Makefile projects/bmake/gnu/usr.bin/diff/Makefile projects/bmake/gnu/usr.bin/gdb/Makefile.inc projects/bmake/gnu/usr.bin/gdb/gdb/Makefile projects/bmake/gnu/usr.bin/gdb/gdbtui/Makefile projects/bmake/gnu/usr.bin/gdb/kgdb/Makefile projects/bmake/gnu/usr.bin/gdb/kgdb/kgdb.h projects/bmake/gnu/usr.bin/gdb/kgdb/trgt_i386.c projects/bmake/gnu/usr.bin/grep/Makefile projects/bmake/gnu/usr.bin/groff/src/devices/grodvi/Makefile projects/bmake/gnu/usr.bin/groff/src/devices/grohtml/Makefile projects/bmake/gnu/usr.bin/groff/src/devices/grolbp/Makefile projects/bmake/gnu/usr.bin/groff/src/devices/grolj4/Makefile projects/bmake/gnu/usr.bin/groff/src/devices/grops/Makefile projects/bmake/gnu/usr.bin/groff/src/devices/grotty/Makefile projects/bmake/gnu/usr.bin/groff/src/preproc/eqn/Makefile projects/bmake/gnu/usr.bin/groff/src/preproc/grn/Makefile projects/bmake/gnu/usr.bin/groff/src/preproc/html/Makefile projects/bmake/gnu/usr.bin/groff/src/preproc/pic/Makefile projects/bmake/gnu/usr.bin/groff/src/preproc/refer/Makefile projects/bmake/gnu/usr.bin/groff/src/preproc/soelim/Makefile projects/bmake/gnu/usr.bin/groff/src/preproc/tbl/Makefile projects/bmake/gnu/usr.bin/groff/src/roff/groff/Makefile projects/bmake/gnu/usr.bin/groff/src/roff/troff/Makefile projects/bmake/gnu/usr.bin/groff/src/utils/addftinfo/Makefile projects/bmake/gnu/usr.bin/groff/src/utils/hpftodit/Makefile projects/bmake/gnu/usr.bin/groff/src/utils/indxbib/Makefile projects/bmake/gnu/usr.bin/groff/src/utils/lkbib/Makefile projects/bmake/gnu/usr.bin/groff/src/utils/lookbib/Makefile projects/bmake/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile projects/bmake/gnu/usr.bin/rcs/Makefile.inc projects/bmake/gnu/usr.bin/texinfo/info/Makefile projects/bmake/gnu/usr.bin/texinfo/infokey/Makefile projects/bmake/gnu/usr.bin/texinfo/install-info/Makefile projects/bmake/gnu/usr.bin/texinfo/makeinfo/Makefile projects/bmake/gnu/usr.bin/texinfo/texindex/Makefile projects/bmake/include/Makefile projects/bmake/include/arpa/inet.h projects/bmake/include/arpa/nameser.h projects/bmake/include/arpa/nameser_compat.h projects/bmake/include/pthread.h projects/bmake/include/res_update.h projects/bmake/include/resolv.h projects/bmake/include/rpcsvc/nis.x projects/bmake/include/semaphore.h projects/bmake/include/stddef.h projects/bmake/include/stdlib.h projects/bmake/include/strings.h projects/bmake/include/unistd.h projects/bmake/kerberos5/lib/libasn1/Makefile projects/bmake/kerberos5/lib/libkrb5/Makefile projects/bmake/kerberos5/libexec/digest-service/Makefile projects/bmake/kerberos5/libexec/hprop/Makefile projects/bmake/kerberos5/libexec/hpropd/Makefile projects/bmake/kerberos5/libexec/ipropd-master/Makefile projects/bmake/kerberos5/libexec/ipropd-slave/Makefile projects/bmake/kerberos5/libexec/kadmind/Makefile projects/bmake/kerberos5/libexec/kcm/Makefile projects/bmake/kerberos5/libexec/kdc/Makefile projects/bmake/kerberos5/libexec/kdigest/Makefile projects/bmake/kerberos5/libexec/kfd/Makefile projects/bmake/kerberos5/libexec/kimpersonate/Makefile projects/bmake/kerberos5/libexec/kpasswdd/Makefile projects/bmake/kerberos5/tools/asn1_compile/Makefile projects/bmake/kerberos5/tools/slc/Makefile projects/bmake/kerberos5/usr.bin/hxtool/Makefile projects/bmake/kerberos5/usr.bin/kadmin/Makefile projects/bmake/kerberos5/usr.bin/kcc/Makefile projects/bmake/kerberos5/usr.bin/kdestroy/Makefile projects/bmake/kerberos5/usr.bin/kf/Makefile projects/bmake/kerberos5/usr.bin/kgetcred/Makefile projects/bmake/kerberos5/usr.bin/kinit/Makefile projects/bmake/kerberos5/usr.bin/kpasswd/Makefile projects/bmake/kerberos5/usr.bin/ksu/Makefile projects/bmake/kerberos5/usr.bin/string2key/Makefile projects/bmake/kerberos5/usr.bin/verify_krb5_conf/Makefile projects/bmake/kerberos5/usr.sbin/iprop-log/Makefile projects/bmake/kerberos5/usr.sbin/kstash/Makefile projects/bmake/kerberos5/usr.sbin/ktutil/Makefile projects/bmake/lib/Makefile projects/bmake/lib/atf/Makefile.inc projects/bmake/lib/atf/common.mk projects/bmake/lib/atf/libatf-c++/Makefile projects/bmake/lib/atf/libatf-c++/tests/Makefile (contents, props changed) projects/bmake/lib/atf/libatf-c++/tests/detail/Makefile projects/bmake/lib/atf/libatf-c/Makefile projects/bmake/lib/atf/libatf-c/tests/Makefile (contents, props changed) projects/bmake/lib/atf/libatf-c/tests/detail/Makefile projects/bmake/lib/clang/clang.build.mk projects/bmake/lib/clang/include/clang/Config/config.h projects/bmake/lib/clang/include/llvm/Config/config.h projects/bmake/lib/csu/amd64/Makefile projects/bmake/lib/csu/i386-elf/Makefile projects/bmake/lib/libarchive/Makefile projects/bmake/lib/libc++/Makefile projects/bmake/lib/libc/Makefile projects/bmake/lib/libc/arm/Makefile.inc projects/bmake/lib/libc/arm/aeabi/Makefile.inc projects/bmake/lib/libc/arm/aeabi/Symbol.map projects/bmake/lib/libc/arm/aeabi/aeabi_double.c projects/bmake/lib/libc/arm/aeabi/aeabi_float.c projects/bmake/lib/libc/arm/aeabi/aeabi_vfp.h projects/bmake/lib/libc/arm/aeabi/aeabi_vfp_double.S projects/bmake/lib/libc/arm/aeabi/aeabi_vfp_float.S projects/bmake/lib/libc/arm/gen/Makefile.inc projects/bmake/lib/libc/arm/gen/__aeabi_read_tp.S projects/bmake/lib/libc/arm/gen/_ctx_start.S projects/bmake/lib/libc/arm/gen/_setjmp.S projects/bmake/lib/libc/arm/gen/alloca.S projects/bmake/lib/libc/arm/gen/divsi3.S projects/bmake/lib/libc/arm/gen/setjmp.S projects/bmake/lib/libc/arm/gen/sigsetjmp.S projects/bmake/lib/libc/arm/string/ffs.S projects/bmake/lib/libc/arm/string/memcmp.S projects/bmake/lib/libc/arm/string/memcpy_arm.S projects/bmake/lib/libc/arm/string/memcpy_xscale.S projects/bmake/lib/libc/arm/string/memmove.S projects/bmake/lib/libc/arm/string/memset.S projects/bmake/lib/libc/arm/string/strcmp.S projects/bmake/lib/libc/arm/string/strlen.S projects/bmake/lib/libc/arm/string/strncmp.S projects/bmake/lib/libc/arm/sys/Ovfork.S projects/bmake/lib/libc/arm/sys/brk.S projects/bmake/lib/libc/arm/sys/cerror.S projects/bmake/lib/libc/arm/sys/pipe.S projects/bmake/lib/libc/arm/sys/ptrace.S projects/bmake/lib/libc/arm/sys/sbrk.S projects/bmake/lib/libc/gen/dl_iterate_phdr.3 projects/bmake/lib/libc/gen/getgrouplist.3 projects/bmake/lib/libc/gen/initgroups.3 projects/bmake/lib/libc/gen/nlist.c projects/bmake/lib/libc/gen/posix_spawnattr_init.3 projects/bmake/lib/libc/gen/rewinddir.c projects/bmake/lib/libc/gen/sem_destroy.3 projects/bmake/lib/libc/gen/sem_getvalue.3 projects/bmake/lib/libc/gen/sem_init.3 projects/bmake/lib/libc/gen/sem_new.c projects/bmake/lib/libc/gen/sem_open.3 projects/bmake/lib/libc/gen/sem_post.3 projects/bmake/lib/libc/gen/sem_timedwait.3 projects/bmake/lib/libc/gen/sem_wait.3 projects/bmake/lib/libc/iconv/iconv.3 projects/bmake/lib/libc/include/isc/eventlib.h projects/bmake/lib/libc/include/isc/list.h projects/bmake/lib/libc/include/port_before.h projects/bmake/lib/libc/inet/inet_addr.c projects/bmake/lib/libc/inet/inet_cidr_ntop.c projects/bmake/lib/libc/inet/inet_cidr_pton.c projects/bmake/lib/libc/inet/inet_net_ntop.c projects/bmake/lib/libc/inet/inet_net_pton.c projects/bmake/lib/libc/inet/inet_neta.c projects/bmake/lib/libc/inet/inet_ntoa.c projects/bmake/lib/libc/inet/inet_ntop.c projects/bmake/lib/libc/inet/inet_pton.c projects/bmake/lib/libc/inet/nsap_addr.c projects/bmake/lib/libc/isc/ev_streams.c projects/bmake/lib/libc/isc/ev_timers.c projects/bmake/lib/libc/isc/eventlib_p.h projects/bmake/lib/libc/locale/lmonetary.c projects/bmake/lib/libc/nameser/Symbol.map projects/bmake/lib/libc/nameser/ns_name.c projects/bmake/lib/libc/nameser/ns_netint.c projects/bmake/lib/libc/nameser/ns_parse.c projects/bmake/lib/libc/nameser/ns_print.c projects/bmake/lib/libc/nameser/ns_samedomain.c projects/bmake/lib/libc/nameser/ns_ttl.c projects/bmake/lib/libc/net/getaddrinfo.c projects/bmake/lib/libc/net/getnameinfo.c projects/bmake/lib/libc/net/linkaddr.c projects/bmake/lib/libc/net/nsdispatch.c projects/bmake/lib/libc/net/sctp_sys_calls.c projects/bmake/lib/libc/posix1e/acl.3 projects/bmake/lib/libc/posix1e/acl_add_flag_np.3 projects/bmake/lib/libc/posix1e/acl_clear_flags_np.3 projects/bmake/lib/libc/posix1e/acl_delete_flag_np.3 projects/bmake/lib/libc/posix1e/acl_get_flag_np.3 projects/bmake/lib/libc/posix1e/acl_get_flagset_np.3 projects/bmake/lib/libc/posix1e/acl_set_entry_type_np.3 projects/bmake/lib/libc/posix1e/acl_set_flagset_np.3 projects/bmake/lib/libc/powerpc/gen/_ctx_start.S projects/bmake/lib/libc/powerpc/gen/_setjmp.S projects/bmake/lib/libc/powerpc/gen/eabi.S projects/bmake/lib/libc/powerpc/gen/fabs.S projects/bmake/lib/libc/powerpc/gen/setjmp.S projects/bmake/lib/libc/powerpc/gen/sigsetjmp.S projects/bmake/lib/libc/powerpc/sys/brk.S projects/bmake/lib/libc/powerpc/sys/exect.S projects/bmake/lib/libc/powerpc/sys/pipe.S projects/bmake/lib/libc/powerpc/sys/ptrace.S projects/bmake/lib/libc/powerpc/sys/sbrk.S projects/bmake/lib/libc/powerpc64/gen/_ctx_start.S projects/bmake/lib/libc/powerpc64/gen/_setjmp.S projects/bmake/lib/libc/powerpc64/gen/fabs.S projects/bmake/lib/libc/powerpc64/gen/setjmp.S projects/bmake/lib/libc/powerpc64/gen/sigsetjmp.S projects/bmake/lib/libc/powerpc64/sys/brk.S projects/bmake/lib/libc/powerpc64/sys/exect.S projects/bmake/lib/libc/powerpc64/sys/pipe.S projects/bmake/lib/libc/powerpc64/sys/ptrace.S projects/bmake/lib/libc/powerpc64/sys/sbrk.S projects/bmake/lib/libc/quad/Makefile.inc projects/bmake/lib/libc/resolv/Makefile.inc projects/bmake/lib/libc/resolv/Symbol.map projects/bmake/lib/libc/resolv/herror.c projects/bmake/lib/libc/resolv/res_comp.c projects/bmake/lib/libc/resolv/res_data.c projects/bmake/lib/libc/resolv/res_debug.c projects/bmake/lib/libc/resolv/res_findzonecut.c projects/bmake/lib/libc/resolv/res_init.c projects/bmake/lib/libc/resolv/res_mkquery.c projects/bmake/lib/libc/resolv/res_mkupdate.c projects/bmake/lib/libc/resolv/res_query.c projects/bmake/lib/libc/resolv/res_send.c projects/bmake/lib/libc/resolv/res_update.c projects/bmake/lib/libc/rpc/clnt_vc.c projects/bmake/lib/libc/stdio/getline.3 projects/bmake/lib/libc/stdio/open_memstream.3 projects/bmake/lib/libc/stdlib/Symbol.map projects/bmake/lib/libc/stdlib/lsearch.c projects/bmake/lib/libc/stdlib/strtonum.c projects/bmake/lib/libc/stdtime/strptime.3 projects/bmake/lib/libc/stdtime/strptime.c projects/bmake/lib/libc/string/Makefile.inc projects/bmake/lib/libc/string/Symbol.map projects/bmake/lib/libc/string/bzero.3 projects/bmake/lib/libc/sys/Makefile.inc projects/bmake/lib/libc/sys/Symbol.map projects/bmake/lib/libc/sys/accept.2 projects/bmake/lib/libc/sys/access.2 projects/bmake/lib/libc/sys/connect.2 projects/bmake/lib/libc/sys/kqueue.2 projects/bmake/lib/libc/sys/mmap.2 projects/bmake/lib/libc/sys/mq_open.2 projects/bmake/lib/libc/sys/poll.2 projects/bmake/lib/libc/sys/recv.2 projects/bmake/lib/libc/sys/utrace.2 projects/bmake/lib/libcompiler_rt/Makefile projects/bmake/lib/libcrypt/crypt.c projects/bmake/lib/libcrypt/tests/Makefile projects/bmake/lib/libcuse/Makefile projects/bmake/lib/libcuse/cuse_lib.c projects/bmake/lib/libcxxrt/Version.map projects/bmake/lib/libexpat/Makefile projects/bmake/lib/libfetch/common.c projects/bmake/lib/libfetch/fetch.3 projects/bmake/lib/libgeom/geom_getxml.c projects/bmake/lib/libgeom/geom_stats.c projects/bmake/lib/libkvm/kvm_arm.c projects/bmake/lib/libkvm/kvm_proc.c projects/bmake/lib/libmp/Makefile projects/bmake/lib/libnetbsd/sys/cdefs.h projects/bmake/lib/libnv/Makefile (contents, props changed) projects/bmake/lib/libnv/msgio.c (contents, props changed) projects/bmake/lib/libnv/nv.3 (contents, props changed) projects/bmake/lib/libnv/nv.h (contents, props changed) projects/bmake/lib/libnv/nv_impl.h (contents, props changed) projects/bmake/lib/libnv/nvlist.c (contents, props changed) projects/bmake/lib/libnv/nvlist_impl.h (contents, props changed) projects/bmake/lib/libnv/nvpair.c (contents, props changed) projects/bmake/lib/libnv/nvpair_impl.h (contents, props changed) projects/bmake/lib/libopie/Makefile projects/bmake/lib/libpam/libpam/Makefile projects/bmake/lib/libpam/modules/pam_login_access/pam_login_access.c projects/bmake/lib/libpam/modules/pam_opie/pam_opie.c projects/bmake/lib/libpam/modules/pam_ssh/Makefile projects/bmake/lib/libpcap/Makefile projects/bmake/lib/libpcap/config.h projects/bmake/lib/libproc/Makefile projects/bmake/lib/libproc/libproc.h projects/bmake/lib/libproc/proc_sym.c projects/bmake/lib/librt/Makefile projects/bmake/lib/librtld_db/rtld_db.c projects/bmake/lib/libstand/Makefile projects/bmake/lib/libstand/open.c projects/bmake/lib/libstand/stand.h projects/bmake/lib/libstdthreads/threads.h projects/bmake/lib/libthr/Makefile projects/bmake/lib/libthr/libthr.3 projects/bmake/lib/libthr/thread/thr_cond.c projects/bmake/lib/libthr/thread/thr_init.c projects/bmake/lib/libthr/thread/thr_stack.c projects/bmake/lib/libunbound/Makefile projects/bmake/lib/libusb/Makefile projects/bmake/lib/libusb/libusb.h projects/bmake/lib/libutil/Makefile projects/bmake/lib/libutil/gr_util.c projects/bmake/lib/libutil/login_class.c projects/bmake/lib/libz/Makefile projects/bmake/lib/msun/Makefile projects/bmake/lib/msun/Symbol.map projects/bmake/lib/msun/arm/fenv.c projects/bmake/lib/msun/man/lgamma.3 projects/bmake/lib/msun/src/e_lgamma.c projects/bmake/lib/msun/src/e_lgamma_r.c projects/bmake/lib/msun/src/e_lgammaf_r.c projects/bmake/lib/msun/src/imprecise.c projects/bmake/lib/msun/src/math.h projects/bmake/lib/msun/src/s_tanh.c projects/bmake/lib/msun/src/s_tanhf.c projects/bmake/libexec/Makefile projects/bmake/libexec/atf/atf-check/Makefile projects/bmake/libexec/atf/atf-sh/Makefile projects/bmake/libexec/atf/atf-sh/tests/Makefile projects/bmake/libexec/getty/main.c projects/bmake/libexec/mail.local/Makefile projects/bmake/libexec/rshd/rshd.c projects/bmake/libexec/rtld-elf/Makefile projects/bmake/libexec/rtld-elf/amd64/reloc.c projects/bmake/libexec/rtld-elf/arm/reloc.c projects/bmake/libexec/rtld-elf/i386/reloc.c projects/bmake/libexec/rtld-elf/libmap.c projects/bmake/libexec/rtld-elf/mips/reloc.c projects/bmake/libexec/rtld-elf/powerpc/reloc.c projects/bmake/libexec/rtld-elf/powerpc64/reloc.c projects/bmake/libexec/rtld-elf/rtld.c projects/bmake/libexec/rtld-elf/rtld.h projects/bmake/libexec/rtld-elf/sparc64/reloc.c projects/bmake/libexec/rtld-elf/tests/Makefile projects/bmake/libexec/rtld-elf/tests/ld_library_pathfds.c projects/bmake/libexec/rtld-elf/tests/libpythagoras/Makefile projects/bmake/libexec/rtld-elf/tests/target/Makefile projects/bmake/libexec/save-entropy/save-entropy.sh projects/bmake/libexec/smrsh/Makefile projects/bmake/libexec/telnetd/Makefile projects/bmake/release/Makefile projects/bmake/release/arm/BEAGLEBONE.conf projects/bmake/release/arm/PANDABOARD.conf projects/bmake/release/arm/RPI-B.conf projects/bmake/release/arm/WANDBOARD-QUAD.conf projects/bmake/release/arm/ZEDBOARD.conf projects/bmake/release/arm/release.sh projects/bmake/release/doc/en_US.ISO8859-1/hardware/article.xml projects/bmake/release/doc/en_US.ISO8859-1/share/xml/release.xsl projects/bmake/release/doc/share/mk/doc.relnotes.mk projects/bmake/release/doc/share/xml/release.ent projects/bmake/release/doc/share/xml/release.xsl projects/bmake/release/picobsd/bridge/PICOBSD projects/bmake/release/picobsd/qemu/PICOBSD projects/bmake/release/picobsd/tinyware/simple_httpd/simple_httpd.c projects/bmake/release/rc.local projects/bmake/release/release.conf.sample projects/bmake/release/release.sh projects/bmake/release/scripts/pkg-stage.sh projects/bmake/rescue/rescue/Makefile projects/bmake/sbin/atm/atmconfig/Makefile projects/bmake/sbin/atm/atmconfig/main.c projects/bmake/sbin/camcontrol/camcontrol.8 projects/bmake/sbin/camcontrol/camcontrol.c projects/bmake/sbin/conscontrol/conscontrol.8 projects/bmake/sbin/devd/Makefile projects/bmake/sbin/devd/devd.8 projects/bmake/sbin/devd/devd.cc projects/bmake/sbin/dhclient/packet.c projects/bmake/sbin/dhclient/tests/Makefile projects/bmake/sbin/dump/traverse.c projects/bmake/sbin/dumpon/dumpon.8 projects/bmake/sbin/fdisk_pc98/Makefile projects/bmake/sbin/fsck/Makefile projects/bmake/sbin/fsck_msdosfs/boot.c projects/bmake/sbin/fsck_msdosfs/dosfs.h projects/bmake/sbin/fsirand/Makefile projects/bmake/sbin/gbde/gbde.8 projects/bmake/sbin/gbde/gbde.c projects/bmake/sbin/geom/class/part/gpart.8 projects/bmake/sbin/geom/class/virstor/gvirstor.8 projects/bmake/sbin/geom/core/geom.c projects/bmake/sbin/hastd/Makefile projects/bmake/sbin/hastd/primary.c projects/bmake/sbin/hastd/synch.h projects/bmake/sbin/ifconfig/Makefile projects/bmake/sbin/ifconfig/af_inet6.c projects/bmake/sbin/ifconfig/ifconfig.8 projects/bmake/sbin/ifconfig/ifconfig.c projects/bmake/sbin/ifconfig/ifconfig.h projects/bmake/sbin/ifconfig/ifgre.c projects/bmake/sbin/ifconfig/iflagg.c projects/bmake/sbin/init/init.c projects/bmake/sbin/ipf/Makefile.inc projects/bmake/sbin/ipf/ipf/Makefile projects/bmake/sbin/ipf/ipfstat/Makefile projects/bmake/sbin/ipf/ipftest/Makefile projects/bmake/sbin/ipf/ipmon/Makefile projects/bmake/sbin/ipf/ipnat/Makefile projects/bmake/sbin/ipf/ippool/Makefile projects/bmake/sbin/ipf/ipresend/Makefile projects/bmake/sbin/ipfw/Makefile projects/bmake/sbin/ipfw/altq.c projects/bmake/sbin/ipfw/dummynet.c projects/bmake/sbin/ipfw/ipfw.8 projects/bmake/sbin/ipfw/ipfw2.c projects/bmake/sbin/ipfw/ipfw2.h projects/bmake/sbin/ipfw/ipv6.c projects/bmake/sbin/ipfw/main.c projects/bmake/sbin/ipfw/nat.c projects/bmake/sbin/iscontrol/iscontrol.8 projects/bmake/sbin/mksnap_ffs/Makefile projects/bmake/sbin/mount/mntopts.h projects/bmake/sbin/mount/mount.8 projects/bmake/sbin/mount/mount.c projects/bmake/sbin/mount_nfs/Makefile projects/bmake/sbin/mount_nfs/mount_nfs.8 projects/bmake/sbin/mount_nfs/mount_nfs.c projects/bmake/sbin/newfs_msdos/newfs_msdos.c projects/bmake/sbin/ping/Makefile projects/bmake/sbin/ping/ping.c projects/bmake/sbin/ping6/Makefile projects/bmake/sbin/ping6/ping6.8 projects/bmake/sbin/ping6/ping6.c projects/bmake/sbin/rcorder/Makefile projects/bmake/sbin/reboot/boot_i386.8 projects/bmake/sbin/restore/tape.c projects/bmake/sbin/route/keywords projects/bmake/sbin/route/route.8 projects/bmake/sbin/route/route.c projects/bmake/sbin/routed/defs.h projects/bmake/sbin/routed/input.c projects/bmake/sbin/routed/main.c projects/bmake/sbin/routed/output.c projects/bmake/sbin/routed/routed.8 projects/bmake/sbin/savecore/savecore.c projects/bmake/sbin/shutdown/Makefile projects/bmake/sbin/swapon/swapon.c projects/bmake/sbin/sysctl/sysctl.c projects/bmake/sbin/umount/umount.c projects/bmake/secure/lib/libcrypto/Makefile.inc projects/bmake/secure/lib/libcrypto/Makefile.man projects/bmake/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/bmake/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/bmake/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/bmake/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/bmake/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/bmake/secure/lib/libcrypto/man/BIO_ctrl.3 projects/bmake/secure/lib/libcrypto/man/BIO_f_base64.3 projects/bmake/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/bmake/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/bmake/secure/lib/libcrypto/man/BIO_f_md.3 projects/bmake/secure/lib/libcrypto/man/BIO_f_null.3 projects/bmake/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/bmake/secure/lib/libcrypto/man/BIO_find_type.3 projects/bmake/secure/lib/libcrypto/man/BIO_new.3 projects/bmake/secure/lib/libcrypto/man/BIO_new_CMS.3 projects/bmake/secure/lib/libcrypto/man/BIO_push.3 projects/bmake/secure/lib/libcrypto/man/BIO_read.3 projects/bmake/secure/lib/libcrypto/man/BIO_s_accept.3 projects/bmake/secure/lib/libcrypto/man/BIO_s_bio.3 projects/bmake/secure/lib/libcrypto/man/BIO_s_connect.3 projects/bmake/secure/lib/libcrypto/man/BIO_s_fd.3 projects/bmake/secure/lib/libcrypto/man/BIO_s_file.3 projects/bmake/secure/lib/libcrypto/man/BIO_s_mem.3 projects/bmake/secure/lib/libcrypto/man/BIO_s_null.3 projects/bmake/secure/lib/libcrypto/man/BIO_s_socket.3 projects/bmake/secure/lib/libcrypto/man/BIO_set_callback.3 projects/bmake/secure/lib/libcrypto/man/BIO_should_retry.3 projects/bmake/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/bmake/secure/lib/libcrypto/man/BN_CTX_new.3 projects/bmake/secure/lib/libcrypto/man/BN_CTX_start.3 projects/bmake/secure/lib/libcrypto/man/BN_add.3 projects/bmake/secure/lib/libcrypto/man/BN_add_word.3 projects/bmake/secure/lib/libcrypto/man/BN_bn2bin.3 projects/bmake/secure/lib/libcrypto/man/BN_cmp.3 projects/bmake/secure/lib/libcrypto/man/BN_copy.3 projects/bmake/secure/lib/libcrypto/man/BN_generate_prime.3 projects/bmake/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/bmake/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/bmake/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/bmake/secure/lib/libcrypto/man/BN_new.3 projects/bmake/secure/lib/libcrypto/man/BN_num_bytes.3 projects/bmake/secure/lib/libcrypto/man/BN_rand.3 projects/bmake/secure/lib/libcrypto/man/BN_set_bit.3 projects/bmake/secure/lib/libcrypto/man/BN_swap.3 projects/bmake/secure/lib/libcrypto/man/BN_zero.3 projects/bmake/secure/lib/libcrypto/man/CMS_add0_cert.3 projects/bmake/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 projects/bmake/secure/lib/libcrypto/man/CMS_compress.3 projects/bmake/secure/lib/libcrypto/man/CMS_decrypt.3 projects/bmake/secure/lib/libcrypto/man/CMS_encrypt.3 projects/bmake/secure/lib/libcrypto/man/CMS_final.3 projects/bmake/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 projects/bmake/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 projects/bmake/secure/lib/libcrypto/man/CMS_get0_type.3 projects/bmake/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 projects/bmake/secure/lib/libcrypto/man/CMS_sign.3 projects/bmake/secure/lib/libcrypto/man/CMS_sign_receipt.3 projects/bmake/secure/lib/libcrypto/man/CMS_uncompress.3 projects/bmake/secure/lib/libcrypto/man/CMS_verify.3 projects/bmake/secure/lib/libcrypto/man/CMS_verify_receipt.3 projects/bmake/secure/lib/libcrypto/man/CONF_modules_free.3 projects/bmake/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/bmake/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/bmake/secure/lib/libcrypto/man/DH_generate_key.3 projects/bmake/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/bmake/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/bmake/secure/lib/libcrypto/man/DH_new.3 projects/bmake/secure/lib/libcrypto/man/DH_set_method.3 projects/bmake/secure/lib/libcrypto/man/DH_size.3 projects/bmake/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/bmake/secure/lib/libcrypto/man/DSA_do_sign.3 projects/bmake/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/bmake/secure/lib/libcrypto/man/DSA_generate_key.3 projects/bmake/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/bmake/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/bmake/secure/lib/libcrypto/man/DSA_new.3 projects/bmake/secure/lib/libcrypto/man/DSA_set_method.3 projects/bmake/secure/lib/libcrypto/man/DSA_sign.3 projects/bmake/secure/lib/libcrypto/man/DSA_size.3 projects/bmake/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/bmake/secure/lib/libcrypto/man/ERR_clear_error.3 projects/bmake/secure/lib/libcrypto/man/ERR_error_string.3 projects/bmake/secure/lib/libcrypto/man/ERR_get_error.3 projects/bmake/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/bmake/secure/lib/libcrypto/man/ERR_load_strings.3 projects/bmake/secure/lib/libcrypto/man/ERR_print_errors.3 projects/bmake/secure/lib/libcrypto/man/ERR_put_error.3 projects/bmake/secure/lib/libcrypto/man/ERR_remove_state.3 projects/bmake/secure/lib/libcrypto/man/ERR_set_mark.3 projects/bmake/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/bmake/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/bmake/secure/lib/libcrypto/man/EVP_DigestSignInit.3 projects/bmake/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 projects/bmake/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/bmake/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_derive.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_sign.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_verify.3 projects/bmake/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 projects/bmake/secure/lib/libcrypto/man/EVP_SealInit.3 projects/bmake/secure/lib/libcrypto/man/EVP_SignInit.3 projects/bmake/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/bmake/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/bmake/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/bmake/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/bmake/secure/lib/libcrypto/man/OPENSSL_config.3 projects/bmake/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/bmake/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/bmake/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/bmake/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 projects/bmake/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 projects/bmake/secure/lib/libcrypto/man/PKCS12_create.3 projects/bmake/secure/lib/libcrypto/man/PKCS12_parse.3 projects/bmake/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/bmake/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/bmake/secure/lib/libcrypto/man/PKCS7_sign.3 projects/bmake/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 projects/bmake/secure/lib/libcrypto/man/PKCS7_verify.3 projects/bmake/secure/lib/libcrypto/man/RAND_add.3 projects/bmake/secure/lib/libcrypto/man/RAND_bytes.3 projects/bmake/secure/lib/libcrypto/man/RAND_cleanup.3 projects/bmake/secure/lib/libcrypto/man/RAND_egd.3 projects/bmake/secure/lib/libcrypto/man/RAND_load_file.3 projects/bmake/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/bmake/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/bmake/secure/lib/libcrypto/man/RSA_check_key.3 projects/bmake/secure/lib/libcrypto/man/RSA_generate_key.3 projects/bmake/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/bmake/secure/lib/libcrypto/man/RSA_new.3 projects/bmake/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/bmake/secure/lib/libcrypto/man/RSA_print.3 projects/bmake/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/bmake/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/bmake/secure/lib/libcrypto/man/RSA_set_method.3 projects/bmake/secure/lib/libcrypto/man/RSA_sign.3 projects/bmake/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/bmake/secure/lib/libcrypto/man/RSA_size.3 projects/bmake/secure/lib/libcrypto/man/SMIME_read_CMS.3 projects/bmake/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/bmake/secure/lib/libcrypto/man/SMIME_write_CMS.3 projects/bmake/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/bmake/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/bmake/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/bmake/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/bmake/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/bmake/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 projects/bmake/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 projects/bmake/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 projects/bmake/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 projects/bmake/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 projects/bmake/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 projects/bmake/secure/lib/libcrypto/man/X509_new.3 projects/bmake/secure/lib/libcrypto/man/X509_verify_cert.3 projects/bmake/secure/lib/libcrypto/man/bio.3 projects/bmake/secure/lib/libcrypto/man/blowfish.3 projects/bmake/secure/lib/libcrypto/man/bn.3 projects/bmake/secure/lib/libcrypto/man/bn_internal.3 projects/bmake/secure/lib/libcrypto/man/buffer.3 projects/bmake/secure/lib/libcrypto/man/crypto.3 projects/bmake/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/bmake/secure/lib/libcrypto/man/d2i_DHparams.3 projects/bmake/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/bmake/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/bmake/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/bmake/secure/lib/libcrypto/man/d2i_X509.3 projects/bmake/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/bmake/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/bmake/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/bmake/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/bmake/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/bmake/secure/lib/libcrypto/man/des.3 projects/bmake/secure/lib/libcrypto/man/dh.3 projects/bmake/secure/lib/libcrypto/man/dsa.3 projects/bmake/secure/lib/libcrypto/man/ecdsa.3 projects/bmake/secure/lib/libcrypto/man/engine.3 projects/bmake/secure/lib/libcrypto/man/err.3 projects/bmake/secure/lib/libcrypto/man/evp.3 projects/bmake/secure/lib/libcrypto/man/hmac.3 projects/bmake/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 projects/bmake/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 projects/bmake/secure/lib/libcrypto/man/lh_stats.3 projects/bmake/secure/lib/libcrypto/man/lhash.3 projects/bmake/secure/lib/libcrypto/man/md5.3 projects/bmake/secure/lib/libcrypto/man/mdc2.3 projects/bmake/secure/lib/libcrypto/man/pem.3 projects/bmake/secure/lib/libcrypto/man/rand.3 projects/bmake/secure/lib/libcrypto/man/rc4.3 projects/bmake/secure/lib/libcrypto/man/ripemd.3 projects/bmake/secure/lib/libcrypto/man/rsa.3 projects/bmake/secure/lib/libcrypto/man/sha.3 projects/bmake/secure/lib/libcrypto/man/threads.3 projects/bmake/secure/lib/libcrypto/man/ui.3 projects/bmake/secure/lib/libcrypto/man/ui_compat.3 projects/bmake/secure/lib/libcrypto/man/x509.3 projects/bmake/secure/lib/libssh/Makefile projects/bmake/secure/lib/libssl/Makefile.man projects/bmake/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/bmake/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_free.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_new.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/bmake/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 projects/bmake/secure/lib/libssl/man/SSL_SESSION_free.3 projects/bmake/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/bmake/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/bmake/secure/lib/libssl/man/SSL_accept.3 projects/bmake/secure/lib/libssl/man/SSL_alert_type_string.3 projects/bmake/secure/lib/libssl/man/SSL_clear.3 projects/bmake/secure/lib/libssl/man/SSL_connect.3 projects/bmake/secure/lib/libssl/man/SSL_do_handshake.3 projects/bmake/secure/lib/libssl/man/SSL_free.3 projects/bmake/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/bmake/secure/lib/libssl/man/SSL_get_ciphers.3 projects/bmake/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/bmake/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/bmake/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/bmake/secure/lib/libssl/man/SSL_get_error.3 projects/bmake/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/bmake/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/bmake/secure/lib/libssl/man/SSL_get_fd.3 projects/bmake/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/bmake/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/bmake/secure/lib/libssl/man/SSL_get_psk_identity.3 projects/bmake/secure/lib/libssl/man/SSL_get_rbio.3 projects/bmake/secure/lib/libssl/man/SSL_get_session.3 projects/bmake/secure/lib/libssl/man/SSL_get_verify_result.3 projects/bmake/secure/lib/libssl/man/SSL_get_version.3 projects/bmake/secure/lib/libssl/man/SSL_library_init.3 projects/bmake/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/bmake/secure/lib/libssl/man/SSL_new.3 projects/bmake/secure/lib/libssl/man/SSL_pending.3 projects/bmake/secure/lib/libssl/man/SSL_read.3 projects/bmake/secure/lib/libssl/man/SSL_rstate_string.3 projects/bmake/secure/lib/libssl/man/SSL_session_reused.3 projects/bmake/secure/lib/libssl/man/SSL_set_bio.3 projects/bmake/secure/lib/libssl/man/SSL_set_connect_state.3 projects/bmake/secure/lib/libssl/man/SSL_set_fd.3 projects/bmake/secure/lib/libssl/man/SSL_set_session.3 projects/bmake/secure/lib/libssl/man/SSL_set_shutdown.3 projects/bmake/secure/lib/libssl/man/SSL_set_verify_result.3 projects/bmake/secure/lib/libssl/man/SSL_shutdown.3 projects/bmake/secure/lib/libssl/man/SSL_state_string.3 projects/bmake/secure/lib/libssl/man/SSL_want.3 projects/bmake/secure/lib/libssl/man/SSL_write.3 projects/bmake/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/bmake/secure/lib/libssl/man/ssl.3 projects/bmake/secure/libexec/sftp-server/Makefile projects/bmake/secure/libexec/ssh-keysign/Makefile projects/bmake/secure/libexec/ssh-pkcs11-helper/Makefile projects/bmake/secure/usr.bin/openssl/Makefile.man projects/bmake/secure/usr.bin/openssl/man/CA.pl.1 projects/bmake/secure/usr.bin/openssl/man/asn1parse.1 projects/bmake/secure/usr.bin/openssl/man/ca.1 projects/bmake/secure/usr.bin/openssl/man/ciphers.1 projects/bmake/secure/usr.bin/openssl/man/cms.1 projects/bmake/secure/usr.bin/openssl/man/crl.1 projects/bmake/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/bmake/secure/usr.bin/openssl/man/dgst.1 projects/bmake/secure/usr.bin/openssl/man/dhparam.1 projects/bmake/secure/usr.bin/openssl/man/dsa.1 projects/bmake/secure/usr.bin/openssl/man/dsaparam.1 projects/bmake/secure/usr.bin/openssl/man/ec.1 projects/bmake/secure/usr.bin/openssl/man/ecparam.1 projects/bmake/secure/usr.bin/openssl/man/enc.1 projects/bmake/secure/usr.bin/openssl/man/errstr.1 projects/bmake/secure/usr.bin/openssl/man/gendsa.1 projects/bmake/secure/usr.bin/openssl/man/genpkey.1 projects/bmake/secure/usr.bin/openssl/man/genrsa.1 projects/bmake/secure/usr.bin/openssl/man/nseq.1 projects/bmake/secure/usr.bin/openssl/man/ocsp.1 projects/bmake/secure/usr.bin/openssl/man/openssl.1 projects/bmake/secure/usr.bin/openssl/man/passwd.1 projects/bmake/secure/usr.bin/openssl/man/pkcs12.1 projects/bmake/secure/usr.bin/openssl/man/pkcs7.1 projects/bmake/secure/usr.bin/openssl/man/pkcs8.1 projects/bmake/secure/usr.bin/openssl/man/pkey.1 projects/bmake/secure/usr.bin/openssl/man/pkeyparam.1 projects/bmake/secure/usr.bin/openssl/man/pkeyutl.1 projects/bmake/secure/usr.bin/openssl/man/rand.1 projects/bmake/secure/usr.bin/openssl/man/req.1 projects/bmake/secure/usr.bin/openssl/man/rsa.1 projects/bmake/secure/usr.bin/openssl/man/rsautl.1 projects/bmake/secure/usr.bin/openssl/man/s_client.1 projects/bmake/secure/usr.bin/openssl/man/s_server.1 projects/bmake/secure/usr.bin/openssl/man/s_time.1 projects/bmake/secure/usr.bin/openssl/man/sess_id.1 projects/bmake/secure/usr.bin/openssl/man/smime.1 projects/bmake/secure/usr.bin/openssl/man/speed.1 projects/bmake/secure/usr.bin/openssl/man/spkac.1 projects/bmake/secure/usr.bin/openssl/man/ts.1 projects/bmake/secure/usr.bin/openssl/man/tsget.1 projects/bmake/secure/usr.bin/openssl/man/verify.1 projects/bmake/secure/usr.bin/openssl/man/version.1 projects/bmake/secure/usr.bin/openssl/man/x509.1 projects/bmake/secure/usr.bin/openssl/man/x509v3_config.1 projects/bmake/secure/usr.bin/scp/Makefile projects/bmake/secure/usr.bin/sftp/Makefile projects/bmake/secure/usr.bin/ssh-add/Makefile projects/bmake/secure/usr.bin/ssh-agent/Makefile projects/bmake/secure/usr.bin/ssh-keygen/Makefile projects/bmake/secure/usr.bin/ssh-keyscan/Makefile projects/bmake/secure/usr.bin/ssh/Makefile projects/bmake/secure/usr.sbin/sshd/Makefile projects/bmake/share/doc/Makefile projects/bmake/share/dtrace/Makefile projects/bmake/share/dtrace/README projects/bmake/share/dtrace/toolkit/Makefile projects/bmake/share/examples/bhyve/vmrun.sh projects/bmake/share/examples/hwpmc/README projects/bmake/share/examples/kld/random_adaptor/random_adaptor_example.c projects/bmake/share/man/man3/offsetof.3 projects/bmake/share/man/man3/pthread.3 projects/bmake/share/man/man3/pthread_cleanup_pop.3 projects/bmake/share/man/man3/pthread_cleanup_push.3 projects/bmake/share/man/man4/Makefile projects/bmake/share/man/man4/acpi.4 projects/bmake/share/man/man4/acpi_wmi.4 projects/bmake/share/man/man4/ada.4 projects/bmake/share/man/man4/alc.4 projects/bmake/share/man/man4/altera_atse.4 projects/bmake/share/man/man4/atkbd.4 projects/bmake/share/man/man4/cdce.4 projects/bmake/share/man/man4/ctl.4 projects/bmake/share/man/man4/cxgbe.4 projects/bmake/share/man/man4/da.4 projects/bmake/share/man/man4/dpt.4 projects/bmake/share/man/man4/filemon.4 projects/bmake/share/man/man4/gif.4 projects/bmake/share/man/man4/gre.4 projects/bmake/share/man/man4/hptiop.4 projects/bmake/share/man/man4/icmp.4 projects/bmake/share/man/man4/igb.4 projects/bmake/share/man/man4/inet.4 projects/bmake/share/man/man4/inet6.4 projects/bmake/share/man/man4/ip.4 projects/bmake/share/man/man4/ip6.4 projects/bmake/share/man/man4/iscsi_initiator.4 projects/bmake/share/man/man4/iwn.4 projects/bmake/share/man/man4/iwnfw.4 projects/bmake/share/man/man4/kbdmux.4 projects/bmake/share/man/man4/lagg.4 projects/bmake/share/man/man4/malo.4 projects/bmake/share/man/man4/man4.arm/Makefile projects/bmake/share/man/man4/miibus.4 projects/bmake/share/man/man4/sfxge.4 projects/bmake/share/man/man4/tap.4 projects/bmake/share/man/man4/tcp.4 projects/bmake/share/man/man4/ucom.4 projects/bmake/share/man/man4/udplite.4 projects/bmake/share/man/man4/ukbd.4 projects/bmake/share/man/man4/urndis.4 projects/bmake/share/man/man4/urtwn.4 projects/bmake/share/man/man4/virtio.4 projects/bmake/share/man/man4/vkbd.4 projects/bmake/share/man/man4/vt.4 projects/bmake/share/man/man5/Makefile projects/bmake/share/man/man5/pf.conf.5 projects/bmake/share/man/man5/rc.conf.5 projects/bmake/share/man/man5/src.conf.5 projects/bmake/share/man/man7/Makefile projects/bmake/share/man/man7/hier.7 projects/bmake/share/man/man7/release.7 projects/bmake/share/man/man7/security.7 projects/bmake/share/man/man8/Makefile projects/bmake/share/man/man8/nanobsd.8 projects/bmake/share/man/man8/rc.subr.8 projects/bmake/share/man/man9/Makefile projects/bmake/share/man/man9/SDT.9 projects/bmake/share/man/man9/VOP_GETPAGES.9 projects/bmake/share/man/man9/altq.9 projects/bmake/share/man/man9/domain.9 projects/bmake/share/man/man9/fetch.9 projects/bmake/share/man/man9/fpu_kern.9 projects/bmake/share/man/man9/hash.9 projects/bmake/share/man/man9/ifnet.9 projects/bmake/share/man/man9/kernel_mount.9 projects/bmake/share/man/man9/lock.9 projects/bmake/share/man/man9/mbuf.9 projects/bmake/share/man/man9/pmap.9 projects/bmake/share/man/man9/pmap_unwire.9 projects/bmake/share/man/man9/sleepqueue.9 projects/bmake/share/man/man9/store.9 projects/bmake/share/man/man9/sysctl.9 projects/bmake/share/man/man9/sysctl_add_oid.9 projects/bmake/share/man/man9/sysctl_ctx_init.9 projects/bmake/share/man/man9/timeout.9 projects/bmake/share/man/man9/vm_page_busy.9 projects/bmake/share/man/man9/vnode.9 projects/bmake/share/misc/bsd-family-tree projects/bmake/share/misc/committers-ports.dot projects/bmake/share/misc/committers-src.dot projects/bmake/share/misc/scsi_modes projects/bmake/share/mk/atf.test.mk projects/bmake/share/mk/bsd.compiler.mk projects/bmake/share/mk/bsd.dep.mk projects/bmake/share/mk/bsd.endian.mk projects/bmake/share/mk/bsd.incs.mk projects/bmake/share/mk/bsd.lib.mk projects/bmake/share/mk/bsd.libnames.mk projects/bmake/share/mk/bsd.mkopt.mk projects/bmake/share/mk/bsd.obj.mk projects/bmake/share/mk/bsd.opts.mk projects/bmake/share/mk/bsd.port.mk projects/bmake/share/mk/bsd.port.subdir.mk projects/bmake/share/mk/bsd.prog.mk projects/bmake/share/mk/bsd.progs.mk projects/bmake/share/mk/bsd.sys.mk projects/bmake/share/mk/bsd.test.mk projects/bmake/share/mk/plain.test.mk projects/bmake/share/mk/src.opts.mk projects/bmake/share/mk/sys.mk projects/bmake/share/mk/tap.test.mk projects/bmake/share/syscons/keymaps/INDEX.keymaps projects/bmake/share/syscons/keymaps/be.iso.acc.kbd projects/bmake/share/syscons/keymaps/cs.latin2.qwertz.kbd projects/bmake/share/syscons/keymaps/uk.iso-ctrl.kbd projects/bmake/share/syscons/keymaps/uk.iso.kbd projects/bmake/share/vt/keymaps/Makefile projects/bmake/share/vt/keymaps/pl.kbd (contents, props changed) projects/bmake/share/vt/keymaps/ua.kbd (contents, props changed) projects/bmake/share/vt/keymaps/ua.shift.alt.kbd (contents, props changed) projects/bmake/share/zoneinfo/Makefile projects/bmake/sys/Makefile projects/bmake/sys/amd64/amd64/cpu_switch.S projects/bmake/sys/amd64/amd64/fpu.c projects/bmake/sys/amd64/amd64/genassym.c projects/bmake/sys/amd64/amd64/machdep.c projects/bmake/sys/amd64/amd64/minidump_machdep.c projects/bmake/sys/amd64/amd64/mp_machdep.c projects/bmake/sys/amd64/amd64/pmap.c projects/bmake/sys/amd64/amd64/support.S projects/bmake/sys/amd64/amd64/sys_machdep.c projects/bmake/sys/amd64/amd64/trap.c projects/bmake/sys/amd64/amd64/uio_machdep.c projects/bmake/sys/amd64/amd64/vm_machdep.c projects/bmake/sys/amd64/conf/GENERIC projects/bmake/sys/amd64/conf/NOTES projects/bmake/sys/amd64/ia32/ia32_syscall.c projects/bmake/sys/amd64/include/asmacros.h projects/bmake/sys/amd64/include/fpu.h projects/bmake/sys/amd64/include/md_var.h projects/bmake/sys/amd64/include/param.h projects/bmake/sys/amd64/include/pc/bios.h projects/bmake/sys/amd64/include/pcb.h projects/bmake/sys/amd64/include/pmap.h projects/bmake/sys/amd64/include/sf_buf.h projects/bmake/sys/amd64/include/vmm.h (contents, props changed) projects/bmake/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/bmake/sys/amd64/include/vmparam.h projects/bmake/sys/amd64/include/xen/hypercall.h projects/bmake/sys/amd64/linux32/linux.h projects/bmake/sys/amd64/linux32/linux32_dummy.c projects/bmake/sys/amd64/linux32/linux32_proto.h projects/bmake/sys/amd64/linux32/linux32_syscall.h projects/bmake/sys/amd64/linux32/linux32_syscalls.c projects/bmake/sys/amd64/linux32/linux32_sysent.c projects/bmake/sys/amd64/linux32/linux32_systrace_args.c projects/bmake/sys/amd64/linux32/syscalls.master projects/bmake/sys/amd64/vmm/amd/amdv.c projects/bmake/sys/amd64/vmm/intel/ept.c projects/bmake/sys/amd64/vmm/intel/vmcs.h projects/bmake/sys/amd64/vmm/intel/vmx.c projects/bmake/sys/amd64/vmm/intel/vmx.h projects/bmake/sys/amd64/vmm/intel/vmx_msr.c projects/bmake/sys/amd64/vmm/intel/vmx_msr.h projects/bmake/sys/amd64/vmm/intel/vmx_support.S projects/bmake/sys/amd64/vmm/intel/vtd.c projects/bmake/sys/amd64/vmm/io/vatpic.c projects/bmake/sys/amd64/vmm/io/vatpic.h projects/bmake/sys/amd64/vmm/io/vatpit.c projects/bmake/sys/amd64/vmm/io/vatpit.h projects/bmake/sys/amd64/vmm/io/vlapic.c projects/bmake/sys/amd64/vmm/vmm.c projects/bmake/sys/amd64/vmm/vmm_instruction_emul.c projects/bmake/sys/amd64/vmm/vmm_ioport.c projects/bmake/sys/amd64/vmm/vmm_ioport.h projects/bmake/sys/amd64/vmm/x86.c projects/bmake/sys/arm/allwinner/a10_clk.c projects/bmake/sys/arm/allwinner/a10_gpio.c projects/bmake/sys/arm/allwinner/if_emac.c projects/bmake/sys/arm/allwinner/timer.c projects/bmake/sys/arm/arm/busdma_machdep-v6.c projects/bmake/sys/arm/arm/busdma_machdep.c projects/bmake/sys/arm/arm/cpufunc_asm_arm10.S projects/bmake/sys/arm/arm/cpufunc_asm_arm9.S projects/bmake/sys/arm/arm/cpufunc_asm_armv5.S projects/bmake/sys/arm/arm/cpufunc_asm_armv6.S projects/bmake/sys/arm/arm/cpufunc_asm_armv7.S projects/bmake/sys/arm/arm/cpufunc_asm_sheeva.S projects/bmake/sys/arm/arm/cpufunc_asm_xscale.S projects/bmake/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/bmake/sys/arm/arm/db_trace.c projects/bmake/sys/arm/arm/disassem.c projects/bmake/sys/arm/arm/dump_machdep.c projects/bmake/sys/arm/arm/elf_machdep.c projects/bmake/sys/arm/arm/exception.S projects/bmake/sys/arm/arm/fiq.c projects/bmake/sys/arm/arm/fusu.S projects/bmake/sys/arm/arm/generic_timer.c projects/bmake/sys/arm/arm/gic.c projects/bmake/sys/arm/arm/intr.c projects/bmake/sys/arm/arm/locore.S projects/bmake/sys/arm/arm/machdep.c projects/bmake/sys/arm/arm/minidump_machdep.c projects/bmake/sys/arm/arm/mp_machdep.c projects/bmake/sys/arm/arm/mpcore_timer.c projects/bmake/sys/arm/arm/nexus.c projects/bmake/sys/arm/arm/physmem.c projects/bmake/sys/arm/arm/pl190.c projects/bmake/sys/arm/arm/pl310.c projects/bmake/sys/arm/arm/pmap-v6.c projects/bmake/sys/arm/arm/pmap.c projects/bmake/sys/arm/arm/setstack.s projects/bmake/sys/arm/arm/stdatomic.c projects/bmake/sys/arm/arm/support.S projects/bmake/sys/arm/arm/trap.c projects/bmake/sys/arm/arm/undefined.c projects/bmake/sys/arm/arm/vm_machdep.c projects/bmake/sys/arm/at91/at91.c projects/bmake/sys/arm/at91/at91_aic.c projects/bmake/sys/arm/at91/at91_machdep.c projects/bmake/sys/arm/at91/at91_mci.c projects/bmake/sys/arm/at91/at91_mcireg.h projects/bmake/sys/arm/at91/at91_pio.c projects/bmake/sys/arm/at91/at91_piovar.h projects/bmake/sys/arm/at91/at91_pit.c projects/bmake/sys/arm/at91/at91_pmc.c projects/bmake/sys/arm/at91/at91rm9200.c projects/bmake/sys/arm/at91/at91rm92reg.h projects/bmake/sys/arm/at91/at91sam9260.c projects/bmake/sys/arm/at91/at91sam9260reg.h projects/bmake/sys/arm/at91/at91sam9g20reg.h projects/bmake/sys/arm/at91/at91sam9g45reg.h projects/bmake/sys/arm/at91/at91sam9x5reg.h projects/bmake/sys/arm/at91/files.at91 projects/bmake/sys/arm/at91/if_ate.c projects/bmake/sys/arm/at91/if_macb.c projects/bmake/sys/arm/at91/std.atmel projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/bmake/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/bmake/sys/arm/cavium/cns11xx/econa.c projects/bmake/sys/arm/cavium/cns11xx/if_ece.c projects/bmake/sys/arm/conf/ATMEL projects/bmake/sys/arm/conf/BEAGLEBONE projects/bmake/sys/arm/conf/CHROMEBOOK projects/bmake/sys/arm/conf/CHROMEBOOK-SNOW projects/bmake/sys/arm/conf/CHROMEBOOK-SPRING projects/bmake/sys/arm/conf/CNS11XXNAS projects/bmake/sys/arm/conf/CUBIEBOARD projects/bmake/sys/arm/conf/CUBIEBOARD2 projects/bmake/sys/arm/conf/DB-78XXX projects/bmake/sys/arm/conf/DB-88F5XXX projects/bmake/sys/arm/conf/DB-88F6XXX projects/bmake/sys/arm/conf/DIGI-CCWMX53 projects/bmake/sys/arm/conf/DOCKSTAR projects/bmake/sys/arm/conf/DREAMPLUG-1001 projects/bmake/sys/arm/conf/EA3250 projects/bmake/sys/arm/conf/EB9200 projects/bmake/sys/arm/conf/EFIKA_MX projects/bmake/sys/arm/conf/ETHERNUT5 projects/bmake/sys/arm/conf/EXYNOS5.common projects/bmake/sys/arm/conf/HL200 projects/bmake/sys/arm/conf/HL201 projects/bmake/sys/arm/conf/IMX53-QSB projects/bmake/sys/arm/conf/IMX6 projects/bmake/sys/arm/conf/KB920X projects/bmake/sys/arm/conf/LN2410SBC projects/bmake/sys/arm/conf/NOTES projects/bmake/sys/arm/conf/NSLU projects/bmake/sys/arm/conf/PANDABOARD projects/bmake/sys/arm/conf/QILA9G20 projects/bmake/sys/arm/conf/RK3188 projects/bmake/sys/arm/conf/RPI-B projects/bmake/sys/arm/conf/SAM9260EK projects/bmake/sys/arm/conf/SAM9G20EK projects/bmake/sys/arm/conf/SAM9X25EK projects/bmake/sys/arm/conf/SN9G45 projects/bmake/sys/arm/conf/VYBRID projects/bmake/sys/arm/conf/WANDBOARD-DUAL projects/bmake/sys/arm/conf/WANDBOARD-QUAD projects/bmake/sys/arm/conf/WANDBOARD-SOLO projects/bmake/sys/arm/conf/ZEDBOARD projects/bmake/sys/arm/freescale/fsl_ocotp.c projects/bmake/sys/arm/freescale/imx/files.imx51 projects/bmake/sys/arm/freescale/imx/files.imx53 projects/bmake/sys/arm/freescale/imx/files.imx6 projects/bmake/sys/arm/freescale/imx/imx51_ccm.c projects/bmake/sys/arm/freescale/imx/imx51_ipuv3_fbd.c projects/bmake/sys/arm/freescale/imx/imx6_anatop.c projects/bmake/sys/arm/freescale/imx/imx6_ccm.c projects/bmake/sys/arm/freescale/imx/imx6_ccmreg.h projects/bmake/sys/arm/freescale/imx/imx6_machdep.c projects/bmake/sys/arm/freescale/imx/imx_ccmvar.h projects/bmake/sys/arm/freescale/imx/imx_common.c projects/bmake/sys/arm/freescale/imx/imx_gpio.c projects/bmake/sys/arm/freescale/imx/imx_gpt.c projects/bmake/sys/arm/freescale/imx/imx_i2c.c projects/bmake/sys/arm/freescale/imx/imx_sdhci.c projects/bmake/sys/arm/freescale/imx/std.imx51 projects/bmake/sys/arm/freescale/imx/std.imx53 projects/bmake/sys/arm/freescale/imx/std.imx6 projects/bmake/sys/arm/freescale/vybrid/vf_gpio.c projects/bmake/sys/arm/freescale/vybrid/vf_sai.c projects/bmake/sys/arm/include/armreg.h projects/bmake/sys/arm/include/asm.h projects/bmake/sys/arm/include/asmacros.h projects/bmake/sys/arm/include/atomic.h projects/bmake/sys/arm/include/counter.h projects/bmake/sys/arm/include/cpuconf.h projects/bmake/sys/arm/include/elf.h projects/bmake/sys/arm/include/intr.h projects/bmake/sys/arm/include/md_var.h projects/bmake/sys/arm/include/param.h projects/bmake/sys/arm/include/pl310.h projects/bmake/sys/arm/include/platform.h projects/bmake/sys/arm/include/pmap.h projects/bmake/sys/arm/include/sf_buf.h projects/bmake/sys/arm/include/vmparam.h projects/bmake/sys/arm/lpc/if_lpe.c projects/bmake/sys/arm/lpc/lpc_gpio.c projects/bmake/sys/arm/mv/gpio.c projects/bmake/sys/arm/mv/mv_common.c projects/bmake/sys/arm/rockchip/rk30xx_gpio.c projects/bmake/sys/arm/samsung/exynos/chrome_ec.c projects/bmake/sys/arm/samsung/exynos/chrome_ec.h projects/bmake/sys/arm/samsung/exynos/chrome_kb.c projects/bmake/sys/arm/samsung/exynos/exynos5_combiner.c projects/bmake/sys/arm/samsung/exynos/exynos5_ehci.c projects/bmake/sys/arm/samsung/exynos/exynos5_fimd.c projects/bmake/sys/arm/samsung/exynos/exynos5_i2c.c projects/bmake/sys/arm/samsung/exynos/exynos5_machdep.c projects/bmake/sys/arm/samsung/exynos/exynos5_mct.c projects/bmake/sys/arm/samsung/exynos/exynos5_pad.c projects/bmake/sys/arm/samsung/exynos/files.exynos5 projects/bmake/sys/arm/ti/am335x/am335x_scm_padconf.c projects/bmake/sys/arm/ti/am335x/files.am335x projects/bmake/sys/arm/ti/cpsw/if_cpsw.c projects/bmake/sys/arm/ti/files.ti projects/bmake/sys/arm/ti/omap4/files.omap4 projects/bmake/sys/arm/ti/omap4/omap4_scm_padconf.c projects/bmake/sys/arm/ti/ti_common.c projects/bmake/sys/arm/ti/ti_cpuid.c projects/bmake/sys/arm/ti/ti_cpuid.h projects/bmake/sys/arm/ti/ti_gpio.c projects/bmake/sys/arm/ti/ti_i2c.c projects/bmake/sys/arm/ti/ti_i2c.h projects/bmake/sys/arm/ti/ti_scm.h projects/bmake/sys/arm/ti/ti_sdhci.c projects/bmake/sys/arm/ti/ti_smc.S projects/bmake/sys/arm/versatile/files.versatile projects/bmake/sys/arm/versatile/versatile_common.c projects/bmake/sys/arm/versatile/versatile_machdep.c projects/bmake/sys/arm/xilinx/files.zynq7 projects/bmake/sys/arm/xilinx/uart_dev_cdnc.c projects/bmake/sys/arm/xilinx/zy7_gpio.c projects/bmake/sys/arm/xilinx/zy7_machdep.c projects/bmake/sys/arm/xscale/i80321/i80321_intr.h projects/bmake/sys/arm/xscale/i80321/i80321_timer.c projects/bmake/sys/arm/xscale/i80321/iq80321.c projects/bmake/sys/arm/xscale/i8134x/i81342.c projects/bmake/sys/arm/xscale/ixp425/avila_gpio.c projects/bmake/sys/arm/xscale/ixp425/cambria_gpio.c projects/bmake/sys/arm/xscale/ixp425/if_npe.c projects/bmake/sys/arm/xscale/ixp425/ixp425.c projects/bmake/sys/arm/xscale/ixp425/ixp425_pci.c projects/bmake/sys/arm/xscale/ixp425/ixp425_timer.c projects/bmake/sys/arm/xscale/pxa/pxa_icu.c projects/bmake/sys/arm/xscale/pxa/pxa_timer.c projects/bmake/sys/boot/Makefile.pc98 projects/bmake/sys/boot/amd64/boot1.efi/boot1.c projects/bmake/sys/boot/amd64/efi/bootinfo.c projects/bmake/sys/boot/amd64/efi/conf.c projects/bmake/sys/boot/arm/ixp425/boot2/Makefile projects/bmake/sys/boot/arm/uboot/Makefile projects/bmake/sys/boot/arm/uboot/help.uboot projects/bmake/sys/boot/common/Makefile.inc projects/bmake/sys/boot/common/bootstrap.h projects/bmake/sys/boot/common/disk.c projects/bmake/sys/boot/common/disk.h projects/bmake/sys/boot/common/load_elf.c projects/bmake/sys/boot/common/misc.c projects/bmake/sys/boot/common/module.c projects/bmake/sys/boot/common/part.c projects/bmake/sys/boot/efi/include/efiapi.h projects/bmake/sys/boot/efi/libefi/Makefile projects/bmake/sys/boot/efi/libefi/libefi.c projects/bmake/sys/boot/fdt/Makefile projects/bmake/sys/boot/fdt/dts/arm/am335x.dtsi projects/bmake/sys/boot/fdt/dts/arm/cubieboard2.dts projects/bmake/sys/boot/fdt/dts/arm/exynos5.dtsi projects/bmake/sys/boot/fdt/dts/arm/exynos5250.dtsi projects/bmake/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts projects/bmake/sys/boot/fdt/dts/arm/exynos5420.dtsi projects/bmake/sys/boot/fdt/dts/arm/imx6.dtsi projects/bmake/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/bmake/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/bmake/sys/boot/fdt/dts/arm/wandboard-dual.dts projects/bmake/sys/boot/fdt/dts/arm/wandboard-quad.dts projects/bmake/sys/boot/fdt/dts/arm/wandboard-solo.dts projects/bmake/sys/boot/fdt/fdt_loader_cmd.c projects/bmake/sys/boot/ficl/amd64/sysdep.c projects/bmake/sys/boot/ficl/arm/sysdep.c projects/bmake/sys/boot/ficl/i386/sysdep.c projects/bmake/sys/boot/ficl/loader.c projects/bmake/sys/boot/ficl/mips/sysdep.c projects/bmake/sys/boot/ficl/mips64/sysdep.c projects/bmake/sys/boot/ficl/powerpc/sysdep.c projects/bmake/sys/boot/ficl/sparc64/sysdep.c projects/bmake/sys/boot/forth/loader.conf projects/bmake/sys/boot/i386/boot2/Makefile projects/bmake/sys/boot/i386/btx/btx/Makefile projects/bmake/sys/boot/i386/btx/btxldr/Makefile projects/bmake/sys/boot/i386/btx/lib/Makefile projects/bmake/sys/boot/i386/gptboot/gptboot.c projects/bmake/sys/boot/i386/gptzfsboot/Makefile projects/bmake/sys/boot/i386/libfirewire/fwohcireg.h projects/bmake/sys/boot/i386/libi386/biospci.c projects/bmake/sys/boot/i386/libi386/comconsole.c projects/bmake/sys/boot/i386/libi386/libi386.h projects/bmake/sys/boot/i386/loader/Makefile projects/bmake/sys/boot/i386/loader/conf.c projects/bmake/sys/boot/i386/loader/main.c projects/bmake/sys/boot/i386/zfsboot/Makefile projects/bmake/sys/boot/libstand32/Makefile projects/bmake/sys/boot/mips/beri/boot2/Makefile projects/bmake/sys/boot/mips/beri/loader/Makefile projects/bmake/sys/boot/pc98/boot2/Makefile projects/bmake/sys/boot/pc98/btx/lib/Makefile projects/bmake/sys/boot/pc98/cdboot/cdboot.S projects/bmake/sys/boot/pc98/libpc98/Makefile projects/bmake/sys/boot/pc98/loader/Makefile projects/bmake/sys/boot/pc98/loader/conf.c projects/bmake/sys/boot/powerpc/ofw/ldscript.powerpc projects/bmake/sys/boot/powerpc/ps3/ldscript.powerpc projects/bmake/sys/boot/powerpc/uboot/Makefile projects/bmake/sys/boot/powerpc/uboot/ldscript.powerpc projects/bmake/sys/boot/sparc64/boot1/Makefile projects/bmake/sys/boot/sparc64/loader/Makefile projects/bmake/sys/boot/uboot/Makefile projects/bmake/sys/boot/uboot/common/main.c projects/bmake/sys/boot/uboot/common/metadata.c projects/bmake/sys/boot/uboot/lib/Makefile projects/bmake/sys/boot/uboot/lib/libuboot.h projects/bmake/sys/boot/uboot/lib/module.c projects/bmake/sys/boot/usb/Makefile projects/bmake/sys/boot/userboot/userboot/devicename.c projects/bmake/sys/boot/zfs/zfsimpl.c projects/bmake/sys/cam/ata/ata_all.c projects/bmake/sys/cam/ata/ata_da.c projects/bmake/sys/cam/ata/ata_xpt.c projects/bmake/sys/cam/cam_ccb.h projects/bmake/sys/cam/cam_queue.c projects/bmake/sys/cam/cam_queue.h projects/bmake/sys/cam/cam_xpt.c projects/bmake/sys/cam/ctl/ctl.c projects/bmake/sys/cam/ctl/ctl.h projects/bmake/sys/cam/ctl/ctl_backend.h projects/bmake/sys/cam/ctl/ctl_backend_block.c projects/bmake/sys/cam/ctl/ctl_backend_ramdisk.c projects/bmake/sys/cam/ctl/ctl_cmd_table.c projects/bmake/sys/cam/ctl/ctl_debug.h projects/bmake/sys/cam/ctl/ctl_error.c projects/bmake/sys/cam/ctl/ctl_error.h projects/bmake/sys/cam/ctl/ctl_frontend.c projects/bmake/sys/cam/ctl/ctl_frontend_cam_sim.c projects/bmake/sys/cam/ctl/ctl_frontend_iscsi.c projects/bmake/sys/cam/ctl/ctl_frontend_iscsi.h projects/bmake/sys/cam/ctl/ctl_io.h projects/bmake/sys/cam/ctl/ctl_ioctl.h projects/bmake/sys/cam/ctl/ctl_private.h projects/bmake/sys/cam/ctl/ctl_scsi_all.c projects/bmake/sys/cam/ctl/ctl_ser_table.c projects/bmake/sys/cam/ctl/ctl_tpc.c projects/bmake/sys/cam/ctl/ctl_util.c projects/bmake/sys/cam/ctl/ctl_util.h projects/bmake/sys/cam/ctl/scsi_ctl.c projects/bmake/sys/cam/scsi/scsi_all.c projects/bmake/sys/cam/scsi/scsi_all.h projects/bmake/sys/cam/scsi/scsi_da.c projects/bmake/sys/cam/scsi/scsi_da.h projects/bmake/sys/cam/scsi/scsi_low.c projects/bmake/sys/cam/scsi/scsi_sa.c projects/bmake/sys/cam/scsi/scsi_xpt.c projects/bmake/sys/cddl/boot/zfs/lz4.c projects/bmake/sys/cddl/boot/zfs/zfsimpl.h projects/bmake/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c projects/bmake/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c projects/bmake/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c projects/bmake/sys/cddl/compat/opensolaris/sys/assfail.h projects/bmake/sys/cddl/compat/opensolaris/sys/atomic.h projects/bmake/sys/cddl/compat/opensolaris/sys/kmem.h projects/bmake/sys/cddl/compat/opensolaris/sys/sdt.h projects/bmake/sys/cddl/compat/opensolaris/sys/vnode.h projects/bmake/sys/cddl/contrib/opensolaris/common/avl/avl.c projects/bmake/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/bmake/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/bmake/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/bmake/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/os/fm.c projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h projects/bmake/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h projects/bmake/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c projects/bmake/sys/cddl/dev/dtrace/dtrace_sysctl.c projects/bmake/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/bmake/sys/cddl/dev/fbt/fbt.c projects/bmake/sys/compat/freebsd32/freebsd32.h projects/bmake/sys/compat/freebsd32/freebsd32_misc.c projects/bmake/sys/compat/freebsd32/freebsd32_proto.h projects/bmake/sys/compat/freebsd32/freebsd32_syscall.h projects/bmake/sys/compat/freebsd32/freebsd32_syscalls.c projects/bmake/sys/compat/freebsd32/freebsd32_sysent.c projects/bmake/sys/compat/freebsd32/freebsd32_systrace_args.c projects/bmake/sys/compat/freebsd32/freebsd32_util.h projects/bmake/sys/compat/freebsd32/syscalls.master projects/bmake/sys/compat/linprocfs/linprocfs.c projects/bmake/sys/compat/linux/linux_file.c projects/bmake/sys/compat/linux/linux_ioctl.c projects/bmake/sys/compat/linux/linux_mib.c projects/bmake/sys/compat/linux/linux_misc.c projects/bmake/sys/compat/linux/linux_socket.c projects/bmake/sys/compat/linux/linux_stats.c projects/bmake/sys/compat/linux/linux_uid16.c projects/bmake/sys/compat/ndis/kern_ndis.c projects/bmake/sys/compat/svr4/svr4_fcntl.c projects/bmake/sys/compat/svr4/svr4_misc.c projects/bmake/sys/compat/svr4/svr4_stat.c projects/bmake/sys/compat/svr4/svr4_stream.c projects/bmake/sys/conf/Makefile.arm projects/bmake/sys/conf/NOTES projects/bmake/sys/conf/files projects/bmake/sys/conf/files.amd64 projects/bmake/sys/conf/files.arm projects/bmake/sys/conf/files.i386 projects/bmake/sys/conf/files.mips projects/bmake/sys/conf/files.pc98 projects/bmake/sys/conf/files.powerpc projects/bmake/sys/conf/files.sparc64 projects/bmake/sys/conf/kern.mk projects/bmake/sys/conf/kern.opts.mk projects/bmake/sys/conf/kern.post.mk projects/bmake/sys/conf/kmod.mk projects/bmake/sys/conf/ldscript.powerpc projects/bmake/sys/conf/ldscript.powerpc64 projects/bmake/sys/conf/newvers.sh projects/bmake/sys/conf/options projects/bmake/sys/conf/options.pc98 projects/bmake/sys/contrib/altq/altq/if_altq.h projects/bmake/sys/contrib/dev/acpica/acpica_prep.sh projects/bmake/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/bmake/sys/contrib/dev/acpica/common/adfile.c projects/bmake/sys/contrib/dev/acpica/common/adisasm.c projects/bmake/sys/contrib/dev/acpica/common/adwalk.c projects/bmake/sys/contrib/dev/acpica/common/ahpredef.c projects/bmake/sys/contrib/dev/acpica/common/dmextern.c projects/bmake/sys/contrib/dev/acpica/common/dmrestag.c projects/bmake/sys/contrib/dev/acpica/common/dmtable.c projects/bmake/sys/contrib/dev/acpica/common/dmtbdump.c projects/bmake/sys/contrib/dev/acpica/common/dmtbinfo.c projects/bmake/sys/contrib/dev/acpica/common/getopt.c projects/bmake/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/bmake/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/bmake/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/bmake/sys/contrib/dev/acpica/compiler/aslcompile.c projects/bmake/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/bmake/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/bmake/sys/contrib/dev/acpica/compiler/asldefine.h projects/bmake/sys/contrib/dev/acpica/compiler/aslerror.c projects/bmake/sys/contrib/dev/acpica/compiler/aslfileio.c projects/bmake/sys/contrib/dev/acpica/compiler/aslfiles.c projects/bmake/sys/contrib/dev/acpica/compiler/aslfold.c projects/bmake/sys/contrib/dev/acpica/compiler/aslglobal.h projects/bmake/sys/contrib/dev/acpica/compiler/aslhex.c projects/bmake/sys/contrib/dev/acpica/compiler/asllength.c projects/bmake/sys/contrib/dev/acpica/compiler/asllisting.c projects/bmake/sys/contrib/dev/acpica/compiler/asllistsup.c projects/bmake/sys/contrib/dev/acpica/compiler/aslload.c projects/bmake/sys/contrib/dev/acpica/compiler/asllookup.c projects/bmake/sys/contrib/dev/acpica/compiler/aslmain.c projects/bmake/sys/contrib/dev/acpica/compiler/aslmap.c projects/bmake/sys/contrib/dev/acpica/compiler/aslmessages.h projects/bmake/sys/contrib/dev/acpica/compiler/aslmethod.c projects/bmake/sys/contrib/dev/acpica/compiler/aslnamesp.c projects/bmake/sys/contrib/dev/acpica/compiler/asloffset.c projects/bmake/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/bmake/sys/contrib/dev/acpica/compiler/asloperands.c projects/bmake/sys/contrib/dev/acpica/compiler/aslopt.c projects/bmake/sys/contrib/dev/acpica/compiler/asloptions.c projects/bmake/sys/contrib/dev/acpica/compiler/aslpredef.c projects/bmake/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/bmake/sys/contrib/dev/acpica/compiler/aslresource.c projects/bmake/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/bmake/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/bmake/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/bmake/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/bmake/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/bmake/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/bmake/sys/contrib/dev/acpica/compiler/aslrestype2s.c projects/bmake/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/bmake/sys/contrib/dev/acpica/compiler/aslstartup.c projects/bmake/sys/contrib/dev/acpica/compiler/aslstubs.c projects/bmake/sys/contrib/dev/acpica/compiler/aslsupport.l projects/bmake/sys/contrib/dev/acpica/compiler/asltransform.c projects/bmake/sys/contrib/dev/acpica/compiler/asltree.c projects/bmake/sys/contrib/dev/acpica/compiler/asltypes.h projects/bmake/sys/contrib/dev/acpica/compiler/aslutils.c projects/bmake/sys/contrib/dev/acpica/compiler/asluuid.c projects/bmake/sys/contrib/dev/acpica/compiler/aslwalks.c projects/bmake/sys/contrib/dev/acpica/compiler/aslxref.c projects/bmake/sys/contrib/dev/acpica/compiler/dtcompile.c projects/bmake/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/bmake/sys/contrib/dev/acpica/compiler/dtexpress.c projects/bmake/sys/contrib/dev/acpica/compiler/dtfield.c projects/bmake/sys/contrib/dev/acpica/compiler/dtio.c projects/bmake/sys/contrib/dev/acpica/compiler/dtparser.l projects/bmake/sys/contrib/dev/acpica/compiler/dtparser.y projects/bmake/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/bmake/sys/contrib/dev/acpica/compiler/dttable.c projects/bmake/sys/contrib/dev/acpica/compiler/dttemplate.c projects/bmake/sys/contrib/dev/acpica/compiler/dttemplate.h projects/bmake/sys/contrib/dev/acpica/compiler/dtutils.c projects/bmake/sys/contrib/dev/acpica/compiler/preprocess.h projects/bmake/sys/contrib/dev/acpica/compiler/prexpress.c projects/bmake/sys/contrib/dev/acpica/compiler/prmacros.c projects/bmake/sys/contrib/dev/acpica/compiler/prparser.l projects/bmake/sys/contrib/dev/acpica/compiler/prparser.y projects/bmake/sys/contrib/dev/acpica/compiler/prscan.c projects/bmake/sys/contrib/dev/acpica/compiler/prutils.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/bmake/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmobject.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/bmake/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dsargs.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dswload2.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dswscope.c projects/bmake/sys/contrib/dev/acpica/components/dispatcher/dswstate.c projects/bmake/sys/contrib/dev/acpica/components/events/evevent.c projects/bmake/sys/contrib/dev/acpica/components/events/evglock.c projects/bmake/sys/contrib/dev/acpica/components/events/evgpe.c projects/bmake/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/bmake/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/bmake/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/bmake/sys/contrib/dev/acpica/components/events/evhandler.c projects/bmake/sys/contrib/dev/acpica/components/events/evmisc.c projects/bmake/sys/contrib/dev/acpica/components/events/evregion.c projects/bmake/sys/contrib/dev/acpica/components/events/evrgnini.c projects/bmake/sys/contrib/dev/acpica/components/events/evsci.c projects/bmake/sys/contrib/dev/acpica/components/events/evxface.c projects/bmake/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/bmake/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/bmake/sys/contrib/dev/acpica/components/events/evxfregn.c projects/bmake/sys/contrib/dev/acpica/components/executer/exconfig.c projects/bmake/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/bmake/sys/contrib/dev/acpica/components/executer/excreate.c projects/bmake/sys/contrib/dev/acpica/components/executer/exdebug.c projects/bmake/sys/contrib/dev/acpica/components/executer/exdump.c projects/bmake/sys/contrib/dev/acpica/components/executer/exfield.c projects/bmake/sys/contrib/dev/acpica/components/executer/exfldio.c projects/bmake/sys/contrib/dev/acpica/components/executer/exmisc.c projects/bmake/sys/contrib/dev/acpica/components/executer/exmutex.c projects/bmake/sys/contrib/dev/acpica/components/executer/exnames.c projects/bmake/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/bmake/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/bmake/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/bmake/sys/contrib/dev/acpica/components/executer/exoparg6.c projects/bmake/sys/contrib/dev/acpica/components/executer/exprep.c projects/bmake/sys/contrib/dev/acpica/components/executer/exregion.c projects/bmake/sys/contrib/dev/acpica/components/executer/exresnte.c projects/bmake/sys/contrib/dev/acpica/components/executer/exresolv.c projects/bmake/sys/contrib/dev/acpica/components/executer/exresop.c projects/bmake/sys/contrib/dev/acpica/components/executer/exstore.c projects/bmake/sys/contrib/dev/acpica/components/executer/exstoren.c projects/bmake/sys/contrib/dev/acpica/components/executer/exstorob.c projects/bmake/sys/contrib/dev/acpica/components/executer/exsystem.c projects/bmake/sys/contrib/dev/acpica/components/executer/exutils.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwacpi.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwesleep.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwsleep.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/bmake/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsalloc.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsarguments.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nseval.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsload.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsobject.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsrepair.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nssearch.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/bmake/sys/contrib/dev/acpica/components/namespace/nsxfobj.c projects/bmake/sys/contrib/dev/acpica/components/parser/psargs.c projects/bmake/sys/contrib/dev/acpica/components/parser/psloop.c projects/bmake/sys/contrib/dev/acpica/components/parser/psobject.c projects/bmake/sys/contrib/dev/acpica/components/parser/psopcode.c projects/bmake/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/bmake/sys/contrib/dev/acpica/components/parser/psparse.c projects/bmake/sys/contrib/dev/acpica/components/parser/psscope.c projects/bmake/sys/contrib/dev/acpica/components/parser/pstree.c projects/bmake/sys/contrib/dev/acpica/components/parser/psutils.c projects/bmake/sys/contrib/dev/acpica/components/parser/pswalk.c projects/bmake/sys/contrib/dev/acpica/components/parser/psxface.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/bmake/sys/contrib/dev/acpica/components/resources/rscalc.c projects/bmake/sys/contrib/dev/acpica/components/resources/rscreate.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsdump.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsinfo.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsio.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsirq.c projects/bmake/sys/contrib/dev/acpica/components/resources/rslist.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsmemory.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsmisc.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsserial.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsutils.c projects/bmake/sys/contrib/dev/acpica/components/resources/rsxface.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbfind.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbprint.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbutils.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbxface.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/bmake/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utalloc.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utcache.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utcopy.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utdecode.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/bmake/sys/contrib/dev/acpica/components/utilities/uterror.c projects/bmake/sys/contrib/dev/acpica/components/utilities/uteval.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utexcep.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utids.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utinit.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utlock.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utmath.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utmutex.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utobject.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utosi.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utownerid.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utpredef.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utresrc.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utstate.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utstring.c projects/bmake/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utxface.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/bmake/sys/contrib/dev/acpica/components/utilities/utxfmutex.c projects/bmake/sys/contrib/dev/acpica/include/acapps.h projects/bmake/sys/contrib/dev/acpica/include/acbuffer.h projects/bmake/sys/contrib/dev/acpica/include/accommon.h projects/bmake/sys/contrib/dev/acpica/include/acconfig.h projects/bmake/sys/contrib/dev/acpica/include/acdebug.h projects/bmake/sys/contrib/dev/acpica/include/acdisasm.h projects/bmake/sys/contrib/dev/acpica/include/acdispat.h projects/bmake/sys/contrib/dev/acpica/include/acevents.h projects/bmake/sys/contrib/dev/acpica/include/acexcep.h projects/bmake/sys/contrib/dev/acpica/include/acglobal.h projects/bmake/sys/contrib/dev/acpica/include/achware.h projects/bmake/sys/contrib/dev/acpica/include/acinterp.h projects/bmake/sys/contrib/dev/acpica/include/aclocal.h projects/bmake/sys/contrib/dev/acpica/include/acmacros.h projects/bmake/sys/contrib/dev/acpica/include/acnames.h projects/bmake/sys/contrib/dev/acpica/include/acnamesp.h projects/bmake/sys/contrib/dev/acpica/include/acobject.h projects/bmake/sys/contrib/dev/acpica/include/acopcode.h projects/bmake/sys/contrib/dev/acpica/include/acoutput.h projects/bmake/sys/contrib/dev/acpica/include/acparser.h projects/bmake/sys/contrib/dev/acpica/include/acpi.h projects/bmake/sys/contrib/dev/acpica/include/acpiosxf.h projects/bmake/sys/contrib/dev/acpica/include/acpixf.h projects/bmake/sys/contrib/dev/acpica/include/acpredef.h projects/bmake/sys/contrib/dev/acpica/include/acresrc.h projects/bmake/sys/contrib/dev/acpica/include/acrestyp.h projects/bmake/sys/contrib/dev/acpica/include/acstruct.h projects/bmake/sys/contrib/dev/acpica/include/actables.h projects/bmake/sys/contrib/dev/acpica/include/actbl.h projects/bmake/sys/contrib/dev/acpica/include/actbl1.h projects/bmake/sys/contrib/dev/acpica/include/actbl2.h projects/bmake/sys/contrib/dev/acpica/include/actbl3.h projects/bmake/sys/contrib/dev/acpica/include/actypes.h projects/bmake/sys/contrib/dev/acpica/include/acutils.h projects/bmake/sys/contrib/dev/acpica/include/amlcode.h projects/bmake/sys/contrib/dev/acpica/include/amlresrc.h projects/bmake/sys/contrib/dev/acpica/include/platform/acenv.h projects/bmake/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/bmake/sys/contrib/dev/acpica/include/platform/acgcc.h projects/bmake/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c projects/bmake/sys/contrib/dev/ath/ath_hal/ar9300/ar9300desc.h projects/bmake/sys/contrib/ipfilter/netinet/fil.c projects/bmake/sys/contrib/ipfilter/netinet/ip_compat.h projects/bmake/sys/contrib/ipfilter/netinet/ip_dns_pxy.c projects/bmake/sys/contrib/ipfilter/netinet/ip_dstlist.c projects/bmake/sys/contrib/ipfilter/netinet/ip_frag.c projects/bmake/sys/contrib/ipfilter/netinet/ip_nat.c projects/bmake/sys/contrib/rdma/krping/krping.c projects/bmake/sys/crypto/rijndael/rijndael-api-fst.c projects/bmake/sys/crypto/rijndael/rijndael-api-fst.h projects/bmake/sys/ddb/db_access.c projects/bmake/sys/ddb/db_break.c projects/bmake/sys/ddb/db_command.c projects/bmake/sys/ddb/db_examine.c projects/bmake/sys/ddb/db_input.c projects/bmake/sys/ddb/db_lex.c projects/bmake/sys/ddb/db_main.c projects/bmake/sys/ddb/db_output.c projects/bmake/sys/ddb/db_output.h projects/bmake/sys/ddb/db_print.c projects/bmake/sys/ddb/db_ps.c projects/bmake/sys/ddb/db_run.c projects/bmake/sys/ddb/db_sym.c projects/bmake/sys/ddb/db_sym.h projects/bmake/sys/ddb/db_textdump.c projects/bmake/sys/ddb/db_variables.h projects/bmake/sys/ddb/db_watch.c projects/bmake/sys/ddb/db_watch.h projects/bmake/sys/ddb/db_write_cmd.c projects/bmake/sys/ddb/ddb.h projects/bmake/sys/dev/acpi_support/acpi_asus.c projects/bmake/sys/dev/acpi_support/acpi_asus_wmi.c projects/bmake/sys/dev/acpi_support/acpi_hp.c projects/bmake/sys/dev/acpi_support/acpi_ibm.c projects/bmake/sys/dev/acpi_support/acpi_rapidstart.c projects/bmake/sys/dev/acpi_support/acpi_sony.c projects/bmake/sys/dev/acpica/Osd/OsdSchedule.c projects/bmake/sys/dev/acpica/Osd/OsdTable.c projects/bmake/sys/dev/acpica/acpi.c projects/bmake/sys/dev/acpica/acpi_cpu.c projects/bmake/sys/dev/acpica/acpi_hpet.c projects/bmake/sys/dev/acpica/acpi_pci.c projects/bmake/sys/dev/acpica/acpi_timer.c projects/bmake/sys/dev/acpica/acpivar.h projects/bmake/sys/dev/ae/if_ae.c projects/bmake/sys/dev/age/if_age.c projects/bmake/sys/dev/agp/agp.c projects/bmake/sys/dev/agp/agp_amd.c projects/bmake/sys/dev/agp/agp_amd64.c projects/bmake/sys/dev/agp/agp_apple.c projects/bmake/sys/dev/agp/agp_ati.c projects/bmake/sys/dev/agp/agp_i810.c projects/bmake/sys/dev/agp/agppriv.h projects/bmake/sys/dev/agp/agpvar.h projects/bmake/sys/dev/ahci/ahci.c projects/bmake/sys/dev/ahci/ahci.h projects/bmake/sys/dev/ahci/ahciem.c projects/bmake/sys/dev/aic7xxx/aic79xx_pci.c projects/bmake/sys/dev/alc/if_alc.c projects/bmake/sys/dev/alc/if_alcreg.h projects/bmake/sys/dev/alc/if_alcvar.h projects/bmake/sys/dev/ale/if_ale.c projects/bmake/sys/dev/ale/if_alereg.h projects/bmake/sys/dev/altera/atse/a_api.h projects/bmake/sys/dev/altera/atse/if_atse.c projects/bmake/sys/dev/amdtemp/amdtemp.c projects/bmake/sys/dev/amr/amr.c projects/bmake/sys/dev/an/if_an.c projects/bmake/sys/dev/asmc/asmc.c projects/bmake/sys/dev/asmc/asmcvar.h projects/bmake/sys/dev/ata/ata-pci.h projects/bmake/sys/dev/ata/chipsets/ata-jmicron.c projects/bmake/sys/dev/ata/chipsets/ata-promise.c projects/bmake/sys/dev/ath/ath_hal/ah.c projects/bmake/sys/dev/ath/ath_hal/ah.h projects/bmake/sys/dev/ath/ath_hal/ah_decode.h projects/bmake/sys/dev/ath/ath_hal/ah_internal.h projects/bmake/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/bmake/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/bmake/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/bmake/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c projects/bmake/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/bmake/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c projects/bmake/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c projects/bmake/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/bmake/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/bmake/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c projects/bmake/sys/dev/ath/if_ath.c projects/bmake/sys/dev/ath/if_ath_beacon.c projects/bmake/sys/dev/ath/if_ath_lna_div.c projects/bmake/sys/dev/ath/if_ath_pci.c projects/bmake/sys/dev/ath/if_ath_rx.c projects/bmake/sys/dev/ath/if_ath_rx_edma.c projects/bmake/sys/dev/ath/if_ath_tx.c projects/bmake/sys/dev/ath/if_athvar.h projects/bmake/sys/dev/atkbdc/atkbd.c projects/bmake/sys/dev/bce/if_bce.c projects/bmake/sys/dev/bce/if_bcereg.h projects/bmake/sys/dev/bfe/if_bfe.c projects/bmake/sys/dev/bge/if_bge.c projects/bmake/sys/dev/bktr/CHANGELOG.TXT projects/bmake/sys/dev/bm/if_bm.c projects/bmake/sys/dev/bwi/if_bwi.c projects/bmake/sys/dev/bwn/if_bwn.c projects/bmake/sys/dev/bxe/bxe.c projects/bmake/sys/dev/bxe/bxe_stats.c projects/bmake/sys/dev/bxe/bxe_stats.h projects/bmake/sys/dev/bxe/ecore_sp.h projects/bmake/sys/dev/cadence/if_cgem.c projects/bmake/sys/dev/cadence/if_cgem_hw.h projects/bmake/sys/dev/cas/if_cas.c projects/bmake/sys/dev/ce/if_ce.c projects/bmake/sys/dev/cfe/cfe_env.c projects/bmake/sys/dev/cfi/cfi_core.c projects/bmake/sys/dev/cm/smc90cx6.c projects/bmake/sys/dev/cp/if_cp.c projects/bmake/sys/dev/cs/if_cs.c projects/bmake/sys/dev/ctau/if_ct.c projects/bmake/sys/dev/cx/if_cx.c projects/bmake/sys/dev/cxgb/common/cxgb_ael1002.c projects/bmake/sys/dev/cxgb/cxgb_adapter.h projects/bmake/sys/dev/cxgb/cxgb_main.c projects/bmake/sys/dev/cxgb/cxgb_osdep.h projects/bmake/sys/dev/cxgb/cxgb_sge.c projects/bmake/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/bmake/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/bmake/sys/dev/cxgbe/adapter.h projects/bmake/sys/dev/cxgbe/common/common.h projects/bmake/sys/dev/cxgbe/common/t4_hw.c projects/bmake/sys/dev/cxgbe/common/t4_msg.h projects/bmake/sys/dev/cxgbe/common/t4_regs.h projects/bmake/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/bmake/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/bmake/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/bmake/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt projects/bmake/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/bmake/sys/dev/cxgbe/iw_cxgbe/cm.c projects/bmake/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/bmake/sys/dev/cxgbe/iw_cxgbe/qp.c projects/bmake/sys/dev/cxgbe/t4_main.c projects/bmake/sys/dev/cxgbe/t4_netmap.c projects/bmake/sys/dev/cxgbe/t4_sge.c projects/bmake/sys/dev/cxgbe/tom/t4_connect.c projects/bmake/sys/dev/cxgbe/tom/t4_cpl_io.c projects/bmake/sys/dev/cxgbe/tom/t4_ddp.c projects/bmake/sys/dev/cxgbe/tom/t4_listen.c projects/bmake/sys/dev/cxgbe/tom/t4_tom.c projects/bmake/sys/dev/cxgbe/tom/t4_tom.h projects/bmake/sys/dev/cxgbe/tom/t4_tom_l2t.c projects/bmake/sys/dev/dc/if_dc.c projects/bmake/sys/dev/de/if_de.c projects/bmake/sys/dev/digi/digi_isa.c projects/bmake/sys/dev/drm/drm_sysctl.c projects/bmake/sys/dev/drm2/drm_agpsupport.c projects/bmake/sys/dev/drm2/drm_crtc_helper.c projects/bmake/sys/dev/drm2/drm_edid.c projects/bmake/sys/dev/drm2/drm_fb_helper.c projects/bmake/sys/dev/drm2/drm_fb_helper.h projects/bmake/sys/dev/drm2/drm_gem_names.c projects/bmake/sys/dev/drm2/drm_gem_names.h projects/bmake/sys/dev/drm2/i915/i915_dma.c projects/bmake/sys/dev/drm2/i915/i915_drm.h projects/bmake/sys/dev/drm2/i915/i915_drv.c projects/bmake/sys/dev/drm2/i915/i915_drv.h projects/bmake/sys/dev/drm2/i915/i915_gem.c projects/bmake/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/bmake/sys/dev/drm2/i915/i915_gem_gtt.c projects/bmake/sys/dev/drm2/i915/i915_irq.c projects/bmake/sys/dev/drm2/i915/i915_reg.h projects/bmake/sys/dev/drm2/i915/intel_opregion.c projects/bmake/sys/dev/drm2/i915/intel_ringbuffer.c projects/bmake/sys/dev/drm2/i915/intel_ringbuffer.h projects/bmake/sys/dev/drm2/radeon/radeon.h projects/bmake/sys/dev/drm2/radeon/radeon_connectors.c projects/bmake/sys/dev/drm2/radeon/radeon_device.c projects/bmake/sys/dev/drm2/radeon/radeon_fb.c projects/bmake/sys/dev/drm2/radeon/radeon_ttm.c projects/bmake/sys/dev/drm2/ttm/ttm_agp_backend.c projects/bmake/sys/dev/drm2/ttm/ttm_bo_driver.h projects/bmake/sys/dev/drm2/ttm/ttm_bo_util.c projects/bmake/sys/dev/drm2/ttm/ttm_bo_vm.c projects/bmake/sys/dev/drm2/ttm/ttm_page_alloc.c projects/bmake/sys/dev/e1000/if_em.c projects/bmake/sys/dev/e1000/if_igb.c projects/bmake/sys/dev/e1000/if_igb.h projects/bmake/sys/dev/e1000/if_lem.c projects/bmake/sys/dev/ed/if_ed.c projects/bmake/sys/dev/en/midway.c projects/bmake/sys/dev/ep/if_ep.c projects/bmake/sys/dev/esp/ncr53c9x.c projects/bmake/sys/dev/et/if_et.c projects/bmake/sys/dev/ex/if_ex.c projects/bmake/sys/dev/fatm/if_fatm.c projects/bmake/sys/dev/fb/fbd.c projects/bmake/sys/dev/fdc/fdc.c projects/bmake/sys/dev/fdc/fdcvar.h projects/bmake/sys/dev/fdt/fdt_common.c projects/bmake/sys/dev/fdt/fdt_common.h projects/bmake/sys/dev/fdt/simplebus.c projects/bmake/sys/dev/fe/if_fe.c projects/bmake/sys/dev/ffec/if_ffec.c projects/bmake/sys/dev/firewire/firewire.c projects/bmake/sys/dev/firewire/firewire.h projects/bmake/sys/dev/firewire/firewire_phy.h projects/bmake/sys/dev/firewire/firewirereg.h projects/bmake/sys/dev/firewire/fwcrom.c projects/bmake/sys/dev/firewire/fwdev.c projects/bmake/sys/dev/firewire/fwdma.c projects/bmake/sys/dev/firewire/fwdma.h projects/bmake/sys/dev/firewire/fwmem.c projects/bmake/sys/dev/firewire/fwohci.c projects/bmake/sys/dev/firewire/fwohci_pci.c projects/bmake/sys/dev/firewire/fwohcireg.h projects/bmake/sys/dev/firewire/fwohcivar.h projects/bmake/sys/dev/firewire/iec68113.h projects/bmake/sys/dev/firewire/if_fwe.c projects/bmake/sys/dev/firewire/if_fwip.c projects/bmake/sys/dev/firewire/sbp.c projects/bmake/sys/dev/firewire/sbp.h projects/bmake/sys/dev/firewire/sbp_targ.c projects/bmake/sys/dev/fxp/if_fxp.c projects/bmake/sys/dev/gem/if_gem.c projects/bmake/sys/dev/glxsb/glxsb.c projects/bmake/sys/dev/gpio/gpio_if.m projects/bmake/sys/dev/gpio/gpiobus.c projects/bmake/sys/dev/gpio/gpiobus_if.m projects/bmake/sys/dev/gpio/gpiobusvar.h projects/bmake/sys/dev/gpio/gpioc.c projects/bmake/sys/dev/gpio/gpioiic.c projects/bmake/sys/dev/gpio/gpioled.c projects/bmake/sys/dev/gpio/ofw_gpiobus.c projects/bmake/sys/dev/gxemul/ether/if_gx.c projects/bmake/sys/dev/hatm/if_hatm.c projects/bmake/sys/dev/hatm/if_hatm_rx.c projects/bmake/sys/dev/hatm/if_hatm_tx.c projects/bmake/sys/dev/hme/if_hme.c projects/bmake/sys/dev/hpt27xx/hpt27xx_os_bsd.c projects/bmake/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/bmake/sys/dev/hpt27xx/os_bsd.h projects/bmake/sys/dev/hptiop/hptiop.c projects/bmake/sys/dev/hptiop/hptiop.h projects/bmake/sys/dev/hptmv/entry.c projects/bmake/sys/dev/hptmv/global.h projects/bmake/sys/dev/hptmv/hptproc.c projects/bmake/sys/dev/hptmv/ioctl.c projects/bmake/sys/dev/hptmv/mv.c projects/bmake/sys/dev/hptmv/osbsd.h projects/bmake/sys/dev/hptnr/README projects/bmake/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu projects/bmake/sys/dev/hptnr/hptnr_config.c projects/bmake/sys/dev/hptnr/hptnr_os_bsd.c projects/bmake/sys/dev/hptnr/hptnr_osm_bsd.c projects/bmake/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu projects/bmake/sys/dev/hptnr/os_bsd.h projects/bmake/sys/dev/hptrr/hptrr_os_bsd.c projects/bmake/sys/dev/hptrr/hptrr_osm_bsd.c projects/bmake/sys/dev/hptrr/os_bsd.h projects/bmake/sys/dev/hwpmc/hwpmc_core.c projects/bmake/sys/dev/hwpmc/hwpmc_mod.c projects/bmake/sys/dev/hwpmc/hwpmc_powerpc.c projects/bmake/sys/dev/hyperv/include/hyperv.h projects/bmake/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/bmake/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/bmake/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/bmake/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/bmake/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/bmake/sys/dev/hyperv/utilities/hv_kvp.h projects/bmake/sys/dev/hyperv/utilities/hv_util.c projects/bmake/sys/dev/ida/ida_eisa.c projects/bmake/sys/dev/ie/if_ie.c projects/bmake/sys/dev/if_ndis/if_ndis.c projects/bmake/sys/dev/iicbus/if_ic.c projects/bmake/sys/dev/iicbus/iicbus.c projects/bmake/sys/dev/iicbus/iicbus.h projects/bmake/sys/dev/iicbus/iicbus_if.m projects/bmake/sys/dev/iicbus/iiconf.c projects/bmake/sys/dev/iicbus/max6690.c projects/bmake/sys/dev/iir/iir.c projects/bmake/sys/dev/iir/iir.h projects/bmake/sys/dev/iir/iir_ctrl.c projects/bmake/sys/dev/iir/iir_pci.c projects/bmake/sys/dev/ips/ips.c projects/bmake/sys/dev/ips/ips.h projects/bmake/sys/dev/ips/ips_pci.c projects/bmake/sys/dev/ipw/if_ipw.c projects/bmake/sys/dev/iscsi/icl.c projects/bmake/sys/dev/iscsi/icl.h projects/bmake/sys/dev/iscsi/icl_proxy.c projects/bmake/sys/dev/iscsi/iscsi.c projects/bmake/sys/dev/iscsi_initiator/isc_cam.c projects/bmake/sys/dev/isp/isp_freebsd.c projects/bmake/sys/dev/isp/isp_freebsd.h projects/bmake/sys/dev/isp/isp_library.c projects/bmake/sys/dev/isp/ispmbox.h projects/bmake/sys/dev/iwi/if_iwi.c projects/bmake/sys/dev/iwn/if_iwn.c projects/bmake/sys/dev/iwn/if_iwnreg.h projects/bmake/sys/dev/iwn/if_iwnvar.h projects/bmake/sys/dev/ixgb/if_ixgb.c projects/bmake/sys/dev/ixgbe/ixgbe.c projects/bmake/sys/dev/ixgbe/ixgbe.h projects/bmake/sys/dev/ixgbe/ixv.c projects/bmake/sys/dev/jme/if_jme.c projects/bmake/sys/dev/le/am7990.c projects/bmake/sys/dev/le/am79900.c projects/bmake/sys/dev/le/lance.c projects/bmake/sys/dev/lge/if_lge.c projects/bmake/sys/dev/lmc/if_lmc.c projects/bmake/sys/dev/lmc/if_lmc.h projects/bmake/sys/dev/malo/if_malo.c projects/bmake/sys/dev/mc146818/mc146818.c projects/bmake/sys/dev/mcd/mcd.c projects/bmake/sys/dev/mcd/mcd_isa.c projects/bmake/sys/dev/mcd/mcdvar.h projects/bmake/sys/dev/mge/if_mge.c projects/bmake/sys/dev/mii/brgphy.c projects/bmake/sys/dev/mii/e1000phy.c projects/bmake/sys/dev/mii/mii.c projects/bmake/sys/dev/mii/miidevs projects/bmake/sys/dev/mii/rgephy.c projects/bmake/sys/dev/mii/rlphy.c projects/bmake/sys/dev/mii/rlswitch.c projects/bmake/sys/dev/mly/mly.c projects/bmake/sys/dev/mly/mlyvar.h projects/bmake/sys/dev/mmc/mmc.c projects/bmake/sys/dev/mmc/mmcsd.c projects/bmake/sys/dev/mmc/mmcvar.h projects/bmake/sys/dev/mpr/mpr.c projects/bmake/sys/dev/mpr/mpr_sas.c projects/bmake/sys/dev/mpr/mpr_table.c projects/bmake/sys/dev/mps/mps.c projects/bmake/sys/dev/mps/mps_mapping.c projects/bmake/sys/dev/mps/mps_sas.c projects/bmake/sys/dev/mps/mps_sas.h projects/bmake/sys/dev/mps/mps_sas_lsi.c projects/bmake/sys/dev/mps/mpsvar.h projects/bmake/sys/dev/mrsas/mrsas.c projects/bmake/sys/dev/mrsas/mrsas.h projects/bmake/sys/dev/mrsas/mrsas_cam.c projects/bmake/sys/dev/mrsas/mrsas_fp.c projects/bmake/sys/dev/mrsas/mrsas_ioctl.c projects/bmake/sys/dev/mrsas/mrsas_ioctl.h projects/bmake/sys/dev/mse/mse.c projects/bmake/sys/dev/mse/mse_cbus.c projects/bmake/sys/dev/mse/mse_isa.c projects/bmake/sys/dev/mse/msevar.h projects/bmake/sys/dev/msk/if_msk.c projects/bmake/sys/dev/mvs/mvs.c projects/bmake/sys/dev/mvs/mvs_pci.c projects/bmake/sys/dev/mvs/mvs_soc.c projects/bmake/sys/dev/mwl/if_mwl.c projects/bmake/sys/dev/mxge/if_mxge.c projects/bmake/sys/dev/my/if_my.c projects/bmake/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c projects/bmake/sys/dev/netmap/if_em_netmap.h projects/bmake/sys/dev/netmap/if_igb_netmap.h projects/bmake/sys/dev/netmap/if_lem_netmap.h projects/bmake/sys/dev/netmap/if_re_netmap.h projects/bmake/sys/dev/netmap/ixgbe_netmap.h projects/bmake/sys/dev/netmap/netmap.c projects/bmake/sys/dev/netmap/netmap_freebsd.c projects/bmake/sys/dev/netmap/netmap_generic.c projects/bmake/sys/dev/netmap/netmap_kern.h projects/bmake/sys/dev/netmap/netmap_mbq.h projects/bmake/sys/dev/netmap/netmap_mem2.c projects/bmake/sys/dev/netmap/netmap_mem2.h projects/bmake/sys/dev/netmap/netmap_offloadings.c projects/bmake/sys/dev/netmap/netmap_pipe.c projects/bmake/sys/dev/netmap/netmap_vale.c projects/bmake/sys/dev/nfe/if_nfe.c projects/bmake/sys/dev/nge/if_nge.c projects/bmake/sys/dev/nmdm/nmdm.c projects/bmake/sys/dev/null/null.c projects/bmake/sys/dev/nvram2env/nvram2env.c projects/bmake/sys/dev/oce/oce_if.c projects/bmake/sys/dev/oce/oce_if.h projects/bmake/sys/dev/oce/oce_mbox.c projects/bmake/sys/dev/oce/oce_sysctl.c projects/bmake/sys/dev/ofw/ofw_bus_subr.c projects/bmake/sys/dev/ofw/ofw_bus_subr.h projects/bmake/sys/dev/ofw/ofw_console.c projects/bmake/sys/dev/ofw/ofw_fdt.c projects/bmake/sys/dev/ofw/ofw_iicbus.c projects/bmake/sys/dev/ofw/ofwbus.c projects/bmake/sys/dev/ofw/openfirm.c projects/bmake/sys/dev/ofw/openfirm.h projects/bmake/sys/dev/patm/if_patm_attach.c projects/bmake/sys/dev/patm/if_patm_rx.c projects/bmake/sys/dev/patm/if_patm_tx.c projects/bmake/sys/dev/pccbb/pccbb.c projects/bmake/sys/dev/pccbb/pccbb_pci.c projects/bmake/sys/dev/pci/pci.c projects/bmake/sys/dev/pci/pci_if.m projects/bmake/sys/dev/pci/pci_pci.c projects/bmake/sys/dev/pci/pci_private.h projects/bmake/sys/dev/pci/pcivar.h projects/bmake/sys/dev/pcn/if_pcn.c projects/bmake/sys/dev/pdq/pdq_ifsubr.c projects/bmake/sys/dev/ppbus/if_plip.c projects/bmake/sys/dev/pst/pst-pci.c projects/bmake/sys/dev/pst/pst-raid.c projects/bmake/sys/dev/puc/pucdata.c projects/bmake/sys/dev/qlxgb/qla_os.c projects/bmake/sys/dev/qlxgbe/ql_hw.c projects/bmake/sys/dev/qlxgbe/ql_isr.c projects/bmake/sys/dev/qlxgbe/ql_os.c projects/bmake/sys/dev/qlxge/qls_isr.c projects/bmake/sys/dev/qlxge/qls_os.c projects/bmake/sys/dev/ral/rt2560.c projects/bmake/sys/dev/ral/rt2661.c projects/bmake/sys/dev/ral/rt2860.c projects/bmake/sys/dev/random/dummy_rng.c projects/bmake/sys/dev/random/hash.c projects/bmake/sys/dev/random/hash.h projects/bmake/sys/dev/random/ivy.c projects/bmake/sys/dev/random/live_entropy_sources.c projects/bmake/sys/dev/random/live_entropy_sources.h projects/bmake/sys/dev/random/nehemiah.c projects/bmake/sys/dev/random/random_adaptors.c projects/bmake/sys/dev/random/random_adaptors.h projects/bmake/sys/dev/random/random_harvestq.c projects/bmake/sys/dev/random/random_harvestq.h projects/bmake/sys/dev/random/randomdev.c projects/bmake/sys/dev/random/randomdev.h projects/bmake/sys/dev/random/randomdev_soft.c projects/bmake/sys/dev/random/randomdev_soft.h projects/bmake/sys/dev/random/yarrow.c projects/bmake/sys/dev/random/yarrow.h projects/bmake/sys/dev/re/if_re.c projects/bmake/sys/dev/rp/rp.c projects/bmake/sys/dev/rp/rp_pci.c projects/bmake/sys/dev/rp/rpreg.h projects/bmake/sys/dev/rp/rpvar.h projects/bmake/sys/dev/rt/if_rt.c projects/bmake/sys/dev/safe/safe.c projects/bmake/sys/dev/sbni/if_sbni.c projects/bmake/sys/dev/scd/scd.c projects/bmake/sys/dev/scd/scd_isa.c projects/bmake/sys/dev/scd/scdvar.h projects/bmake/sys/dev/sdhci/sdhci.c projects/bmake/sys/dev/sdhci/sdhci.h projects/bmake/sys/dev/sdhci/sdhci_fdt.c projects/bmake/sys/dev/sdhci/sdhci_if.m projects/bmake/sys/dev/sdhci/sdhci_pci.c projects/bmake/sys/dev/sf/if_sf.c projects/bmake/sys/dev/sfxge/common/efsys.h projects/bmake/sys/dev/sfxge/sfxge.c projects/bmake/sys/dev/sfxge/sfxge.h projects/bmake/sys/dev/sfxge/sfxge_dma.c projects/bmake/sys/dev/sfxge/sfxge_ev.c projects/bmake/sys/dev/sfxge/sfxge_intr.c projects/bmake/sys/dev/sfxge/sfxge_port.c projects/bmake/sys/dev/sfxge/sfxge_rx.c projects/bmake/sys/dev/sfxge/sfxge_rx.h projects/bmake/sys/dev/sfxge/sfxge_tx.c projects/bmake/sys/dev/sfxge/sfxge_tx.h projects/bmake/sys/dev/sge/if_sge.c projects/bmake/sys/dev/si/si.c projects/bmake/sys/dev/siis/siis.c projects/bmake/sys/dev/sis/if_sis.c projects/bmake/sys/dev/sk/if_sk.c projects/bmake/sys/dev/smc/if_smc.c projects/bmake/sys/dev/sn/if_sn.c projects/bmake/sys/dev/snc/dp83932.c projects/bmake/sys/dev/sound/isa/gusc.c projects/bmake/sys/dev/sound/isa/sb16.c projects/bmake/sys/dev/sound/isa/sbc.c projects/bmake/sys/dev/sound/midi/sequencer.c projects/bmake/sys/dev/sound/pci/als4000.c projects/bmake/sys/dev/sound/pci/cs4281.c projects/bmake/sys/dev/sound/pci/csa.c projects/bmake/sys/dev/sound/pci/emu10kx.c projects/bmake/sys/dev/sound/pci/envy24.c projects/bmake/sys/dev/sound/pci/envy24ht.c projects/bmake/sys/dev/sound/pci/hda/hdaa.c projects/bmake/sys/dev/sound/pci/maestro.c projects/bmake/sys/dev/sound/pci/spicds.c projects/bmake/sys/dev/sound/pci/vibes.c projects/bmake/sys/dev/sound/pcm/dsp.c projects/bmake/sys/dev/sound/pcm/mixer.c projects/bmake/sys/dev/sound/pcm/sound.c projects/bmake/sys/dev/sound/pcm/sound.h projects/bmake/sys/dev/sound/usb/uaudio.c projects/bmake/sys/dev/sound/usb/uaudioreg.h projects/bmake/sys/dev/ste/if_ste.c projects/bmake/sys/dev/stge/if_stge.c projects/bmake/sys/dev/streams/streams.c projects/bmake/sys/dev/terasic/mtl/terasic_mtl.h projects/bmake/sys/dev/ti/if_ti.c projects/bmake/sys/dev/tl/if_tl.c projects/bmake/sys/dev/tsec/if_tsec.c projects/bmake/sys/dev/tsec/if_tsec_fdt.c projects/bmake/sys/dev/tws/tws.c projects/bmake/sys/dev/tws/tws.h projects/bmake/sys/dev/tws/tws_cam.c projects/bmake/sys/dev/tws/tws_hdm.c projects/bmake/sys/dev/tws/tws_hdm.h projects/bmake/sys/dev/tws/tws_services.c projects/bmake/sys/dev/tx/if_tx.c projects/bmake/sys/dev/txp/if_txp.c projects/bmake/sys/dev/uart/uart.h projects/bmake/sys/dev/uart/uart_bus_fdt.c projects/bmake/sys/dev/uart/uart_dev_imx.c projects/bmake/sys/dev/uart/uart_dev_pl011.c projects/bmake/sys/dev/uart/uart_subr.c projects/bmake/sys/dev/usb/controller/at91dci.c projects/bmake/sys/dev/usb/controller/at91dci.h projects/bmake/sys/dev/usb/controller/at91dci_atmelarm.c projects/bmake/sys/dev/usb/controller/at91dci_fdt.c projects/bmake/sys/dev/usb/controller/ehci.c projects/bmake/sys/dev/usb/controller/ehci_pci.c projects/bmake/sys/dev/usb/controller/ohci_s3c24x0.c projects/bmake/sys/dev/usb/controller/saf1761_otg.c projects/bmake/sys/dev/usb/controller/usb_controller.c projects/bmake/sys/dev/usb/controller/uss820dci.c projects/bmake/sys/dev/usb/controller/uss820dci.h projects/bmake/sys/dev/usb/controller/uss820dci_atmelarm.c projects/bmake/sys/dev/usb/controller/xhci.c projects/bmake/sys/dev/usb/controller/xhci.h projects/bmake/sys/dev/usb/controller/xhci_pci.c projects/bmake/sys/dev/usb/gadget/g_audio.c projects/bmake/sys/dev/usb/net/if_aue.c projects/bmake/sys/dev/usb/net/if_axe.c projects/bmake/sys/dev/usb/net/if_axge.c projects/bmake/sys/dev/usb/net/if_axgereg.h projects/bmake/sys/dev/usb/net/if_cdce.c projects/bmake/sys/dev/usb/net/if_cue.c projects/bmake/sys/dev/usb/net/if_ipheth.c projects/bmake/sys/dev/usb/net/if_kue.c projects/bmake/sys/dev/usb/net/if_mos.c projects/bmake/sys/dev/usb/net/if_rue.c projects/bmake/sys/dev/usb/net/if_smsc.c projects/bmake/sys/dev/usb/net/if_udav.c projects/bmake/sys/dev/usb/net/if_urndis.c projects/bmake/sys/dev/usb/net/if_usie.c projects/bmake/sys/dev/usb/net/uhso.c projects/bmake/sys/dev/usb/net/usb_ethernet.c projects/bmake/sys/dev/usb/quirk/usb_quirk.c projects/bmake/sys/dev/usb/quirk/usb_quirk.h projects/bmake/sys/dev/usb/serial/u3g.c projects/bmake/sys/dev/usb/serial/uftdi.c projects/bmake/sys/dev/usb/serial/umcs.c projects/bmake/sys/dev/usb/template/usb_template.c projects/bmake/sys/dev/usb/template/usb_template.h projects/bmake/sys/dev/usb/usb.h projects/bmake/sys/dev/usb/usb_dev.c projects/bmake/sys/dev/usb/usb_device.c projects/bmake/sys/dev/usb/usb_freebsd.h projects/bmake/sys/dev/usb/usb_freebsd_loader.h projects/bmake/sys/dev/usb/usb_hub.c projects/bmake/sys/dev/usb/usb_ioctl.h projects/bmake/sys/dev/usb/usb_msctest.c projects/bmake/sys/dev/usb/usb_msctest.h projects/bmake/sys/dev/usb/usbdevs projects/bmake/sys/dev/usb/wlan/if_rsu.c projects/bmake/sys/dev/usb/wlan/if_rum.c projects/bmake/sys/dev/usb/wlan/if_run.c projects/bmake/sys/dev/usb/wlan/if_uath.c projects/bmake/sys/dev/usb/wlan/if_upgt.c projects/bmake/sys/dev/usb/wlan/if_ural.c projects/bmake/sys/dev/usb/wlan/if_urtw.c projects/bmake/sys/dev/usb/wlan/if_urtwn.c projects/bmake/sys/dev/usb/wlan/if_zyd.c projects/bmake/sys/dev/vge/if_vge.c projects/bmake/sys/dev/virtio/block/virtio_blk.c projects/bmake/sys/dev/virtio/network/if_vtnet.c projects/bmake/sys/dev/virtio/virtqueue.c projects/bmake/sys/dev/vmware/vmxnet3/if_vmx.c projects/bmake/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/bmake/sys/dev/vr/if_vr.c projects/bmake/sys/dev/vt/colors/vt_termcolors.c projects/bmake/sys/dev/vt/colors/vt_termcolors.h projects/bmake/sys/dev/vt/font/vt_mouse_cursor.c projects/bmake/sys/dev/vt/hw/efifb/efifb.c projects/bmake/sys/dev/vt/hw/fb/vt_early_fb.c projects/bmake/sys/dev/vt/hw/fb/vt_fb.c projects/bmake/sys/dev/vt/hw/fb/vt_fb.h projects/bmake/sys/dev/vt/hw/ofwfb/ofwfb.c projects/bmake/sys/dev/vt/hw/vga/vt_vga.c projects/bmake/sys/dev/vt/logo/logo_freebsd.c projects/bmake/sys/dev/vt/vt.h projects/bmake/sys/dev/vt/vt_buf.c projects/bmake/sys/dev/vt/vt_consolectl.c projects/bmake/sys/dev/vt/vt_core.c projects/bmake/sys/dev/vt/vt_sysmouse.c projects/bmake/sys/dev/vte/if_vte.c projects/bmake/sys/dev/vx/if_vx.c projects/bmake/sys/dev/vxge/vxge.c projects/bmake/sys/dev/wb/if_wb.c projects/bmake/sys/dev/wds/wd7000.c projects/bmake/sys/dev/wi/if_wi.c projects/bmake/sys/dev/wl/if_wl.c projects/bmake/sys/dev/wpi/if_wpi.c projects/bmake/sys/dev/wtap/if_wtap.c projects/bmake/sys/dev/xe/if_xe.c projects/bmake/sys/dev/xen/balloon/balloon.c projects/bmake/sys/dev/xen/blkback/blkback.c projects/bmake/sys/dev/xen/console/xencons_ring.c projects/bmake/sys/dev/xen/netback/netback.c projects/bmake/sys/dev/xen/netfront/netfront.c projects/bmake/sys/dev/xl/if_xl.c projects/bmake/sys/fs/deadfs/dead_vnops.c projects/bmake/sys/fs/devfs/devfs_devs.c projects/bmake/sys/fs/devfs/devfs_vnops.c projects/bmake/sys/fs/ext2fs/ext2_extern.h projects/bmake/sys/fs/ext2fs/ext2_inode_cnv.c projects/bmake/sys/fs/ext2fs/ext2_vfsops.c projects/bmake/sys/fs/ext2fs/ext2_vnops.c projects/bmake/sys/fs/fuse/fuse_main.c projects/bmake/sys/fs/fuse/fuse_vfsops.c projects/bmake/sys/fs/fuse/fuse_vnops.c projects/bmake/sys/fs/msdosfs/msdosfs_vnops.c projects/bmake/sys/fs/nandfs/nandfs_subr.c projects/bmake/sys/fs/nandfs/nandfs_vfsops.c projects/bmake/sys/fs/nandfs/nandfs_vnops.c projects/bmake/sys/fs/nfs/nfs_commonsubs.c projects/bmake/sys/fs/nfs/nfs_var.h projects/bmake/sys/fs/nfs/nfsm_subs.h projects/bmake/sys/fs/nfs/nfsproto.h projects/bmake/sys/fs/nfs/nfsrvcache.h projects/bmake/sys/fs/nfsclient/nfs_clbio.c projects/bmake/sys/fs/nfsclient/nfs_clvfsops.c projects/bmake/sys/fs/nfsserver/nfs_nfsdkrpc.c projects/bmake/sys/fs/nfsserver/nfs_nfsdport.c projects/bmake/sys/fs/nfsserver/nfs_nfsdserv.c projects/bmake/sys/fs/nfsserver/nfs_nfsdsocket.c projects/bmake/sys/fs/nfsserver/nfs_nfsdstate.c projects/bmake/sys/fs/nfsserver/nfs_nfsdsubs.c projects/bmake/sys/fs/nullfs/null_vfsops.c projects/bmake/sys/fs/nullfs/null_vnops.c projects/bmake/sys/fs/smbfs/smbfs_io.c projects/bmake/sys/fs/tmpfs/tmpfs_vfsops.c projects/bmake/sys/fs/unionfs/union_vfsops.c projects/bmake/sys/gdb/gdb_int.h projects/bmake/sys/gdb/gdb_main.c projects/bmake/sys/gdb/gdb_packet.c projects/bmake/sys/geom/bde/g_bde.c projects/bmake/sys/geom/bde/g_bde.h projects/bmake/sys/geom/cache/g_cache.c projects/bmake/sys/geom/eli/g_eli.c projects/bmake/sys/geom/eli/g_eli_crypto.c projects/bmake/sys/geom/eli/g_eli_integrity.c projects/bmake/sys/geom/eli/g_eli_privacy.c projects/bmake/sys/geom/geom_dev.c projects/bmake/sys/geom/geom_disk.c projects/bmake/sys/geom/geom_dump.c projects/bmake/sys/geom/geom_kern.c projects/bmake/sys/geom/geom_map.c projects/bmake/sys/geom/journal/g_journal.c projects/bmake/sys/geom/part/g_part.c projects/bmake/sys/geom/part/g_part_bsd.c projects/bmake/sys/geom/part/g_part_if.m projects/bmake/sys/geom/part/g_part_mbr.c projects/bmake/sys/geom/raid/g_raid.c projects/bmake/sys/geom/sched/g_sched.c projects/bmake/sys/gnu/dts/include/dt-bindings/clock/exynos4.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/exynos5250.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/exynos5420.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/exynos5440.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/hi3620-clock.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/r8a7790-clock.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/r8a7791-clock.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/tegra114-car.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/tegra124-car.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/vf610-clock.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/mfd/as3722.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/am43xx.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/dra.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/omap.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8960.h (contents, props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8960.h (contents, props changed) projects/bmake/sys/gnu/fs/reiserfs/reiserfs_fs_i.h projects/bmake/sys/i386/acpica/acpi_wakecode.S projects/bmake/sys/i386/conf/GENERIC projects/bmake/sys/i386/conf/NOTES projects/bmake/sys/i386/conf/XBOX projects/bmake/sys/i386/conf/XEN projects/bmake/sys/i386/i386/bios.c projects/bmake/sys/i386/i386/db_disasm.c projects/bmake/sys/i386/i386/genassym.c projects/bmake/sys/i386/i386/initcpu.c projects/bmake/sys/i386/i386/locore.s projects/bmake/sys/i386/i386/machdep.c projects/bmake/sys/i386/i386/minidump_machdep.c projects/bmake/sys/i386/i386/mp_machdep.c projects/bmake/sys/i386/i386/pmap.c projects/bmake/sys/i386/i386/ptrace_machdep.c projects/bmake/sys/i386/i386/support.s projects/bmake/sys/i386/i386/swtch.s projects/bmake/sys/i386/i386/sys_machdep.c projects/bmake/sys/i386/i386/trap.c projects/bmake/sys/i386/i386/vm86bios.s projects/bmake/sys/i386/i386/vm_machdep.c projects/bmake/sys/i386/ibcs2/ibcs2_fcntl.c projects/bmake/sys/i386/ibcs2/ibcs2_misc.c projects/bmake/sys/i386/ibcs2/ibcs2_other.c projects/bmake/sys/i386/ibcs2/ibcs2_stat.c projects/bmake/sys/i386/ibcs2/ibcs2_xenix.c projects/bmake/sys/i386/include/cpufunc.h projects/bmake/sys/i386/include/md_var.h projects/bmake/sys/i386/include/npx.h projects/bmake/sys/i386/include/pc/bios.h projects/bmake/sys/i386/include/pcb.h projects/bmake/sys/i386/include/pmap.h projects/bmake/sys/i386/include/sf_buf.h projects/bmake/sys/i386/include/vmparam.h projects/bmake/sys/i386/include/xen/hypercall.h projects/bmake/sys/i386/isa/npx.c projects/bmake/sys/i386/linux/linux.h projects/bmake/sys/i386/linux/linux_machdep.c projects/bmake/sys/i386/linux/linux_proto.h projects/bmake/sys/i386/linux/linux_ptrace.c projects/bmake/sys/i386/linux/linux_syscall.h projects/bmake/sys/i386/linux/linux_syscalls.c projects/bmake/sys/i386/linux/linux_sysent.c projects/bmake/sys/i386/linux/linux_systrace_args.c projects/bmake/sys/i386/linux/linux_sysvec.c projects/bmake/sys/i386/linux/syscalls.master projects/bmake/sys/i386/svr4/svr4_machdep.c projects/bmake/sys/i386/xen/locore.s projects/bmake/sys/i386/xen/mp_machdep.c projects/bmake/sys/i386/xen/pmap.c projects/bmake/sys/i386/xen/xen_machdep.c projects/bmake/sys/kern/bus_if.m projects/bmake/sys/kern/imgact_binmisc.c projects/bmake/sys/kern/imgact_elf.c projects/bmake/sys/kern/imgact_shell.c projects/bmake/sys/kern/init_main.c projects/bmake/sys/kern/init_sysent.c projects/bmake/sys/kern/kern_clock.c projects/bmake/sys/kern/kern_cons.c projects/bmake/sys/kern/kern_cpuset.c projects/bmake/sys/kern/kern_descrip.c projects/bmake/sys/kern/kern_environment.c projects/bmake/sys/kern/kern_event.c projects/bmake/sys/kern/kern_exec.c projects/bmake/sys/kern/kern_exit.c projects/bmake/sys/kern/kern_ffclock.c projects/bmake/sys/kern/kern_fork.c projects/bmake/sys/kern/kern_intr.c projects/bmake/sys/kern/kern_jail.c projects/bmake/sys/kern/kern_linker.c projects/bmake/sys/kern/kern_lock.c projects/bmake/sys/kern/kern_loginclass.c projects/bmake/sys/kern/kern_malloc.c projects/bmake/sys/kern/kern_mbuf.c projects/bmake/sys/kern/kern_mib.c projects/bmake/sys/kern/kern_mutex.c projects/bmake/sys/kern/kern_poll.c projects/bmake/sys/kern/kern_proc.c projects/bmake/sys/kern/kern_prot.c projects/bmake/sys/kern/kern_racct.c projects/bmake/sys/kern/kern_resource.c projects/bmake/sys/kern/kern_rwlock.c projects/bmake/sys/kern/kern_shutdown.c projects/bmake/sys/kern/kern_sig.c projects/bmake/sys/kern/kern_sx.c projects/bmake/sys/kern/kern_synch.c projects/bmake/sys/kern/kern_syscalls.c projects/bmake/sys/kern/kern_sysctl.c projects/bmake/sys/kern/kern_thr.c projects/bmake/sys/kern/kern_thread.c projects/bmake/sys/kern/kern_time.c projects/bmake/sys/kern/kern_timeout.c projects/bmake/sys/kern/kern_umtx.c projects/bmake/sys/kern/link_elf.c projects/bmake/sys/kern/link_elf_obj.c projects/bmake/sys/kern/sched_4bsd.c projects/bmake/sys/kern/sched_ule.c projects/bmake/sys/kern/subr_bus.c projects/bmake/sys/kern/subr_devstat.c projects/bmake/sys/kern/subr_hints.c projects/bmake/sys/kern/subr_kdb.c projects/bmake/sys/kern/subr_param.c projects/bmake/sys/kern/subr_prof.c projects/bmake/sys/kern/subr_terminal.c projects/bmake/sys/kern/subr_uio.c projects/bmake/sys/kern/subr_witness.c projects/bmake/sys/kern/sys_generic.c projects/bmake/sys/kern/sys_pipe.c projects/bmake/sys/kern/sys_procdesc.c projects/bmake/sys/kern/sys_process.c projects/bmake/sys/kern/sys_socket.c projects/bmake/sys/kern/syscalls.c projects/bmake/sys/kern/syscalls.master projects/bmake/sys/kern/systrace_args.c projects/bmake/sys/kern/sysv_msg.c projects/bmake/sys/kern/sysv_sem.c projects/bmake/sys/kern/sysv_shm.c projects/bmake/sys/kern/tty.c projects/bmake/sys/kern/tty_pts.c projects/bmake/sys/kern/uipc_debug.c projects/bmake/sys/kern/uipc_mbuf.c projects/bmake/sys/kern/uipc_mqueue.c projects/bmake/sys/kern/uipc_sem.c projects/bmake/sys/kern/uipc_shm.c projects/bmake/sys/kern/uipc_sockbuf.c projects/bmake/sys/kern/uipc_socket.c projects/bmake/sys/kern/uipc_syscalls.c projects/bmake/sys/kern/uipc_usrreq.c projects/bmake/sys/kern/vfs_acl.c projects/bmake/sys/kern/vfs_aio.c projects/bmake/sys/kern/vfs_bio.c projects/bmake/sys/kern/vfs_cache.c projects/bmake/sys/kern/vfs_default.c projects/bmake/sys/kern/vfs_export.c projects/bmake/sys/kern/vfs_init.c projects/bmake/sys/kern/vfs_lookup.c projects/bmake/sys/kern/vfs_mount.c projects/bmake/sys/kern/vfs_mountroot.c projects/bmake/sys/kern/vfs_subr.c projects/bmake/sys/kern/vfs_syscalls.c projects/bmake/sys/kern/vfs_vnops.c projects/bmake/sys/kern/vnode_if.src projects/bmake/sys/kgssapi/gss_impl.c projects/bmake/sys/libkern/arm/divsi3.S projects/bmake/sys/libkern/strncmp.c projects/bmake/sys/mips/adm5120/if_admsw.c projects/bmake/sys/mips/atheros/ar71xx_gpio.c projects/bmake/sys/mips/atheros/ar71xx_machdep.c projects/bmake/sys/mips/atheros/ar724x_pci.c projects/bmake/sys/mips/atheros/if_arge.c projects/bmake/sys/mips/beri/beri_machdep.c projects/bmake/sys/mips/beri/beri_simplebus.c projects/bmake/sys/mips/cavium/ciu.c projects/bmake/sys/mips/cavium/if_octm.c projects/bmake/sys/mips/cavium/octe/ethernet-mdio.c projects/bmake/sys/mips/cavium/octe/ethernet-rx.c projects/bmake/sys/mips/cavium/octe/ethernet-tx.c projects/bmake/sys/mips/cavium/octe/octe.c projects/bmake/sys/mips/cavium/octeon_ds1337.c projects/bmake/sys/mips/cavium/octeon_gpio.c projects/bmake/sys/mips/conf/GXEMUL projects/bmake/sys/mips/conf/GXEMUL32 projects/bmake/sys/mips/conf/OCTEON1 projects/bmake/sys/mips/conf/PICOSTATION_M2HP.hints projects/bmake/sys/mips/conf/WZR-300HP projects/bmake/sys/mips/conf/WZR-300HP.hints projects/bmake/sys/mips/idt/if_kr.c projects/bmake/sys/mips/include/md_var.h projects/bmake/sys/mips/include/param.h projects/bmake/sys/mips/include/sf_buf.h projects/bmake/sys/mips/include/vmparam.h projects/bmake/sys/mips/mips/busdma_machdep.c projects/bmake/sys/mips/mips/dump_machdep.c projects/bmake/sys/mips/mips/machdep.c projects/bmake/sys/mips/mips/minidump_machdep.c projects/bmake/sys/mips/mips/pmap.c projects/bmake/sys/mips/mips/stdatomic.c projects/bmake/sys/mips/mips/trap.c projects/bmake/sys/mips/mips/vm_machdep.c projects/bmake/sys/mips/nlm/dev/net/xlpge.c projects/bmake/sys/mips/nlm/xlp_machdep.c projects/bmake/sys/mips/rmi/dev/nlge/if_nlge.c projects/bmake/sys/mips/rmi/dev/xlr/rge.c projects/bmake/sys/mips/rmi/rootfs_list.txt projects/bmake/sys/mips/rmi/xlr_machdep.c projects/bmake/sys/mips/rt305x/rt305x_gpio.c projects/bmake/sys/mips/rt305x/rt305x_machdep.c projects/bmake/sys/modules/Makefile projects/bmake/sys/modules/acl_nfs4/Makefile projects/bmake/sys/modules/acl_posix1e/Makefile projects/bmake/sys/modules/ahci/Makefile projects/bmake/sys/modules/aic7xxx/ahc/Makefile projects/bmake/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile projects/bmake/sys/modules/alq/Makefile projects/bmake/sys/modules/an/Makefile projects/bmake/sys/modules/arcnet/Makefile projects/bmake/sys/modules/bce/Makefile projects/bmake/sys/modules/bxe/Makefile projects/bmake/sys/modules/cam/Makefile projects/bmake/sys/modules/carp/Makefile projects/bmake/sys/modules/cc/cc_cdg/Makefile projects/bmake/sys/modules/cc/cc_chd/Makefile projects/bmake/sys/modules/cc/cc_cubic/Makefile projects/bmake/sys/modules/cc/cc_hd/Makefile projects/bmake/sys/modules/cc/cc_htcp/Makefile projects/bmake/sys/modules/cc/cc_vegas/Makefile projects/bmake/sys/modules/cxgb/Makefile projects/bmake/sys/modules/cxgb/cxgb/Makefile projects/bmake/sys/modules/cxgb/iw_cxgb/Makefile projects/bmake/sys/modules/cxgb/tom/Makefile projects/bmake/sys/modules/cxgbe/Makefile projects/bmake/sys/modules/cxgbe/if_cxgbe/Makefile projects/bmake/sys/modules/cxgbe/iw_cxgbe/Makefile projects/bmake/sys/modules/cxgbe/t4_firmware/Makefile projects/bmake/sys/modules/cxgbe/t5_firmware/Makefile projects/bmake/sys/modules/cxgbe/tom/Makefile projects/bmake/sys/modules/dpt/Makefile projects/bmake/sys/modules/drm/Makefile projects/bmake/sys/modules/drm2/Makefile projects/bmake/sys/modules/drm2/drm2/Makefile projects/bmake/sys/modules/drm2/i915kms/Makefile projects/bmake/sys/modules/drm2/radeonkms/Makefile projects/bmake/sys/modules/dtrace/Makefile projects/bmake/sys/modules/dtrace/dtrace/Makefile projects/bmake/sys/modules/dtrace/dtraceall/dtraceall.c projects/bmake/sys/modules/dtrace/fbt/Makefile projects/bmake/sys/modules/dummynet/Makefile projects/bmake/sys/modules/em/Makefile projects/bmake/sys/modules/en/Makefile projects/bmake/sys/modules/ep/Makefile projects/bmake/sys/modules/fatm/Makefile projects/bmake/sys/modules/fdc/Makefile projects/bmake/sys/modules/firewire/fwip/Makefile projects/bmake/sys/modules/geom/geom_part/geom_part_bsd/Makefile projects/bmake/sys/modules/hatm/Makefile projects/bmake/sys/modules/hyperv/utilities/Makefile projects/bmake/sys/modules/i2c/controllers/alpm/Makefile projects/bmake/sys/modules/i2c/controllers/amdpm/Makefile projects/bmake/sys/modules/i2c/controllers/amdsmb/Makefile projects/bmake/sys/modules/i2c/controllers/intpm/Makefile projects/bmake/sys/modules/i2c/controllers/nfsmb/Makefile projects/bmake/sys/modules/i2c/controllers/viapm/Makefile projects/bmake/sys/modules/ibcore/Makefile projects/bmake/sys/modules/if_bridge/Makefile projects/bmake/sys/modules/if_disc/Makefile projects/bmake/sys/modules/if_gif/Makefile projects/bmake/sys/modules/if_gre/Makefile projects/bmake/sys/modules/if_lagg/Makefile projects/bmake/sys/modules/if_stf/Makefile projects/bmake/sys/modules/if_tap/Makefile projects/bmake/sys/modules/if_tun/Makefile projects/bmake/sys/modules/igb/Makefile projects/bmake/sys/modules/ip6_mroute_mod/Makefile projects/bmake/sys/modules/ip_mroute_mod/Makefile projects/bmake/sys/modules/ipdivert/Makefile projects/bmake/sys/modules/ipfilter/Makefile projects/bmake/sys/modules/ipfw/Makefile projects/bmake/sys/modules/ipoib/Makefile projects/bmake/sys/modules/iwnfw/Makefile projects/bmake/sys/modules/ixgbe/Makefile projects/bmake/sys/modules/khelp/h_ertt/Makefile projects/bmake/sys/modules/krpc/Makefile projects/bmake/sys/modules/linux/Makefile projects/bmake/sys/modules/lmc/Makefile projects/bmake/sys/modules/mlx4/Makefile projects/bmake/sys/modules/mlx4ib/Makefile projects/bmake/sys/modules/mlxen/Makefile projects/bmake/sys/modules/mrsas/Makefile projects/bmake/sys/modules/mthca/Makefile projects/bmake/sys/modules/netgraph/Makefile projects/bmake/sys/modules/netgraph/gif/Makefile projects/bmake/sys/modules/netgraph/iface/Makefile projects/bmake/sys/modules/netgraph/ipfw/Makefile projects/bmake/sys/modules/netgraph/netflow/Makefile projects/bmake/sys/modules/netmap/Makefile projects/bmake/sys/modules/nfscl/Makefile projects/bmake/sys/modules/nfsclient/Makefile projects/bmake/sys/modules/nfslockd/Makefile projects/bmake/sys/modules/nfsserver/Makefile projects/bmake/sys/modules/patm/Makefile projects/bmake/sys/modules/pf/Makefile projects/bmake/sys/modules/pflog/Makefile projects/bmake/sys/modules/pfsync/Makefile projects/bmake/sys/modules/qlxgb/Makefile projects/bmake/sys/modules/qlxgbe/Makefile projects/bmake/sys/modules/qlxge/Makefile projects/bmake/sys/modules/random/Makefile projects/bmake/sys/modules/rl/Makefile projects/bmake/sys/modules/siftr/Makefile projects/bmake/sys/modules/smbfs/Makefile projects/bmake/sys/modules/snc/Makefile projects/bmake/sys/modules/sound/driver/Makefile projects/bmake/sys/modules/sound/sound/Makefile projects/bmake/sys/modules/sppp/Makefile projects/bmake/sys/modules/svr4/Makefile projects/bmake/sys/modules/trm/Makefile projects/bmake/sys/modules/usb/Makefile projects/bmake/sys/modules/usb/template/Makefile projects/bmake/sys/modules/virtio/Makefile projects/bmake/sys/modules/virtio/network/Makefile projects/bmake/sys/modules/vmm/Makefile projects/bmake/sys/modules/vmware/vmxnet3/Makefile projects/bmake/sys/modules/vx/Makefile projects/bmake/sys/modules/wlan/Makefile projects/bmake/sys/modules/wlan_acl/Makefile projects/bmake/sys/modules/wlan_amrr/Makefile projects/bmake/sys/modules/wlan_ccmp/Makefile projects/bmake/sys/modules/wlan_rssadapt/Makefile projects/bmake/sys/modules/wlan_tkip/Makefile projects/bmake/sys/modules/wlan_wep/Makefile projects/bmake/sys/modules/wlan_xauth/Makefile projects/bmake/sys/modules/zfs/Makefile projects/bmake/sys/net/bpf.c projects/bmake/sys/net/ethernet.h projects/bmake/sys/net/flowtable.c projects/bmake/sys/net/ieee8023ad_lacp.c projects/bmake/sys/net/ieee8023ad_lacp.h projects/bmake/sys/net/if.c projects/bmake/sys/net/if.h projects/bmake/sys/net/if_arcsubr.c projects/bmake/sys/net/if_arp.h projects/bmake/sys/net/if_atmsubr.c projects/bmake/sys/net/if_bridge.c projects/bmake/sys/net/if_clone.c projects/bmake/sys/net/if_clone.h projects/bmake/sys/net/if_debug.c projects/bmake/sys/net/if_disc.c projects/bmake/sys/net/if_edsc.c projects/bmake/sys/net/if_enc.c projects/bmake/sys/net/if_epair.c projects/bmake/sys/net/if_ethersubr.c projects/bmake/sys/net/if_fddisubr.c projects/bmake/sys/net/if_fwsubr.c projects/bmake/sys/net/if_gif.c projects/bmake/sys/net/if_gif.h projects/bmake/sys/net/if_gre.c projects/bmake/sys/net/if_gre.h projects/bmake/sys/net/if_iso88025subr.c projects/bmake/sys/net/if_lagg.c projects/bmake/sys/net/if_lagg.h projects/bmake/sys/net/if_loop.c projects/bmake/sys/net/if_mib.c projects/bmake/sys/net/if_spppfr.c projects/bmake/sys/net/if_spppsubr.c projects/bmake/sys/net/if_stf.c projects/bmake/sys/net/if_stf.h projects/bmake/sys/net/if_tap.c projects/bmake/sys/net/if_tun.c projects/bmake/sys/net/if_types.h projects/bmake/sys/net/if_var.h projects/bmake/sys/net/if_vlan.c projects/bmake/sys/net/if_vlan_var.h projects/bmake/sys/net/ifq.h projects/bmake/sys/net/netisr.h projects/bmake/sys/net/netmap.h projects/bmake/sys/net/netmap_user.h projects/bmake/sys/net/pfvar.h projects/bmake/sys/net/radix.c projects/bmake/sys/net/route.c projects/bmake/sys/net/route.h projects/bmake/sys/net/rtsock.c projects/bmake/sys/net/sff8472.h projects/bmake/sys/net/vnet.h projects/bmake/sys/net80211/ieee80211.c projects/bmake/sys/net80211/ieee80211_adhoc.c projects/bmake/sys/net80211/ieee80211_amrr.c projects/bmake/sys/net80211/ieee80211_hostap.c projects/bmake/sys/net80211/ieee80211_ht.c projects/bmake/sys/net80211/ieee80211_hwmp.c projects/bmake/sys/net80211/ieee80211_input.c projects/bmake/sys/net80211/ieee80211_mesh.c projects/bmake/sys/net80211/ieee80211_monitor.c projects/bmake/sys/net80211/ieee80211_output.c projects/bmake/sys/net80211/ieee80211_sta.c projects/bmake/sys/net80211/ieee80211_superg.c projects/bmake/sys/net80211/ieee80211_wds.c projects/bmake/sys/netgraph/bluetooth/common/ng_bluetooth.c projects/bmake/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c projects/bmake/sys/netgraph/bluetooth/drivers/h4/ng_h4.c projects/bmake/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h projects/bmake/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h projects/bmake/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/bmake/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/bmake/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c projects/bmake/sys/netgraph/ng_base.c projects/bmake/sys/netgraph/ng_bridge.c projects/bmake/sys/netgraph/ng_device.c projects/bmake/sys/netgraph/ng_eiface.c projects/bmake/sys/netgraph/ng_ether.c projects/bmake/sys/netgraph/ng_frame_relay.c projects/bmake/sys/netgraph/ng_iface.c projects/bmake/sys/netgraph/ng_ipfw.c projects/bmake/sys/netgraph/ng_ppp.c projects/bmake/sys/netgraph/ng_socket.c projects/bmake/sys/netgraph/ng_sppp.c projects/bmake/sys/netgraph/ng_tty.c projects/bmake/sys/netinet/accf_dns.c projects/bmake/sys/netinet/accf_http.c projects/bmake/sys/netinet/cc/cc.c projects/bmake/sys/netinet/cc/cc_cdg.c projects/bmake/sys/netinet/cc/cc_chd.c projects/bmake/sys/netinet/cc/cc_hd.c projects/bmake/sys/netinet/cc/cc_htcp.c projects/bmake/sys/netinet/cc/cc_vegas.c projects/bmake/sys/netinet/if_ether.c projects/bmake/sys/netinet/igmp.c projects/bmake/sys/netinet/igmp_var.h projects/bmake/sys/netinet/in.c projects/bmake/sys/netinet/in.h projects/bmake/sys/netinet/in_gif.c projects/bmake/sys/netinet/in_gif.h projects/bmake/sys/netinet/in_mcast.c projects/bmake/sys/netinet/in_pcb.c projects/bmake/sys/netinet/in_pcb.h projects/bmake/sys/netinet/in_pcbgroup.c projects/bmake/sys/netinet/in_proto.c projects/bmake/sys/netinet/in_rmx.c projects/bmake/sys/netinet/in_rss.c projects/bmake/sys/netinet/in_rss.h projects/bmake/sys/netinet/in_var.h projects/bmake/sys/netinet/ip6.h projects/bmake/sys/netinet/ip_carp.c projects/bmake/sys/netinet/ip_carp.h projects/bmake/sys/netinet/ip_divert.c projects/bmake/sys/netinet/ip_encap.c projects/bmake/sys/netinet/ip_encap.h projects/bmake/sys/netinet/ip_fastfwd.c projects/bmake/sys/netinet/ip_fw.h projects/bmake/sys/netinet/ip_gre.c projects/bmake/sys/netinet/ip_icmp.c projects/bmake/sys/netinet/ip_icmp.h projects/bmake/sys/netinet/ip_input.c projects/bmake/sys/netinet/ip_ipsec.c projects/bmake/sys/netinet/ip_mroute.c projects/bmake/sys/netinet/ip_options.c projects/bmake/sys/netinet/ip_options.h projects/bmake/sys/netinet/ip_output.c projects/bmake/sys/netinet/ip_var.h projects/bmake/sys/netinet/pim_var.h projects/bmake/sys/netinet/raw_ip.c projects/bmake/sys/netinet/sctp.h projects/bmake/sys/netinet/sctp_asconf.c projects/bmake/sys/netinet/sctp_auth.c projects/bmake/sys/netinet/sctp_auth.h projects/bmake/sys/netinet/sctp_cc_functions.c projects/bmake/sys/netinet/sctp_constants.h projects/bmake/sys/netinet/sctp_header.h projects/bmake/sys/netinet/sctp_indata.c projects/bmake/sys/netinet/sctp_input.c projects/bmake/sys/netinet/sctp_input.h projects/bmake/sys/netinet/sctp_os_bsd.h projects/bmake/sys/netinet/sctp_output.c projects/bmake/sys/netinet/sctp_output.h projects/bmake/sys/netinet/sctp_pcb.c projects/bmake/sys/netinet/sctp_pcb.h projects/bmake/sys/netinet/sctp_peeloff.c projects/bmake/sys/netinet/sctp_structs.h projects/bmake/sys/netinet/sctp_sysctl.c projects/bmake/sys/netinet/sctp_sysctl.h projects/bmake/sys/netinet/sctp_timer.c projects/bmake/sys/netinet/sctp_uio.h projects/bmake/sys/netinet/sctp_usrreq.c projects/bmake/sys/netinet/sctp_var.h projects/bmake/sys/netinet/sctputil.c projects/bmake/sys/netinet/sctputil.h projects/bmake/sys/netinet/siftr.c projects/bmake/sys/netinet/tcp_hostcache.c projects/bmake/sys/netinet/tcp_hostcache.h projects/bmake/sys/netinet/tcp_input.c projects/bmake/sys/netinet/tcp_output.c projects/bmake/sys/netinet/tcp_reass.c projects/bmake/sys/netinet/tcp_sack.c projects/bmake/sys/netinet/tcp_subr.c projects/bmake/sys/netinet/tcp_syncache.c projects/bmake/sys/netinet/tcp_timer.c projects/bmake/sys/netinet/tcp_timer.h projects/bmake/sys/netinet/tcp_timewait.c projects/bmake/sys/netinet/tcp_usrreq.c projects/bmake/sys/netinet/tcp_var.h projects/bmake/sys/netinet/toecore.c projects/bmake/sys/netinet/udp_usrreq.c projects/bmake/sys/netinet/udp_var.h projects/bmake/sys/netinet6/frag6.c projects/bmake/sys/netinet6/icmp6.c projects/bmake/sys/netinet6/in6.c projects/bmake/sys/netinet6/in6.h projects/bmake/sys/netinet6/in6_cksum.c projects/bmake/sys/netinet6/in6_gif.c projects/bmake/sys/netinet6/in6_gif.h projects/bmake/sys/netinet6/in6_ifattach.c projects/bmake/sys/netinet6/in6_mcast.c projects/bmake/sys/netinet6/in6_pcb.c projects/bmake/sys/netinet6/in6_pcb.h projects/bmake/sys/netinet6/in6_proto.c projects/bmake/sys/netinet6/in6_rmx.c projects/bmake/sys/netinet6/in6_src.c projects/bmake/sys/netinet6/in6_var.h projects/bmake/sys/netinet6/ip6_forward.c projects/bmake/sys/netinet6/ip6_input.c projects/bmake/sys/netinet6/ip6_ipsec.c projects/bmake/sys/netinet6/ip6_mroute.c projects/bmake/sys/netinet6/ip6_output.c projects/bmake/sys/netinet6/ip6_var.h projects/bmake/sys/netinet6/ip6protosw.h projects/bmake/sys/netinet6/mld6.c projects/bmake/sys/netinet6/nd6.c projects/bmake/sys/netinet6/nd6.h projects/bmake/sys/netinet6/nd6_nbr.c projects/bmake/sys/netinet6/raw_ip6.c projects/bmake/sys/netinet6/scope6.c projects/bmake/sys/netinet6/scope6_var.h projects/bmake/sys/netinet6/sctp6_usrreq.c projects/bmake/sys/netinet6/udp6_usrreq.c projects/bmake/sys/netipsec/ipsec.c projects/bmake/sys/netipsec/ipsec.h projects/bmake/sys/netipsec/ipsec_input.c projects/bmake/sys/netipsec/ipsec_output.c projects/bmake/sys/netipsec/key.c projects/bmake/sys/netipsec/key.h projects/bmake/sys/netipsec/keysock.c projects/bmake/sys/netipsec/keysock.h projects/bmake/sys/netipsec/xform.h projects/bmake/sys/netipsec/xform_ah.c projects/bmake/sys/netipsec/xform_esp.c projects/bmake/sys/netipsec/xform_ipcomp.c projects/bmake/sys/netipsec/xform_ipip.c projects/bmake/sys/netpfil/ipfw/ip_dn_io.c projects/bmake/sys/netpfil/ipfw/ip_dummynet.c projects/bmake/sys/netpfil/ipfw/ip_fw2.c projects/bmake/sys/netpfil/ipfw/ip_fw_dynamic.c projects/bmake/sys/netpfil/ipfw/ip_fw_log.c projects/bmake/sys/netpfil/ipfw/ip_fw_nat.c projects/bmake/sys/netpfil/ipfw/ip_fw_pfil.c projects/bmake/sys/netpfil/ipfw/ip_fw_private.h projects/bmake/sys/netpfil/ipfw/ip_fw_sockopt.c projects/bmake/sys/netpfil/ipfw/ip_fw_table.c projects/bmake/sys/netpfil/pf/if_pflog.c projects/bmake/sys/netpfil/pf/if_pfsync.c projects/bmake/sys/netpfil/pf/pf.c projects/bmake/sys/netpfil/pf/pf.h projects/bmake/sys/netpfil/pf/pf_ioctl.c projects/bmake/sys/netpfil/pf/pf_lb.c projects/bmake/sys/netpfil/pf/pf_table.c projects/bmake/sys/nfs/bootp_subr.c projects/bmake/sys/nfs/nfs_diskless.c projects/bmake/sys/nfs/nfs_nfssvc.c projects/bmake/sys/nfsclient/nfs_bio.c projects/bmake/sys/nfsclient/nfs_vfsops.c projects/bmake/sys/nlm/nlm_prot_impl.c projects/bmake/sys/ofed/drivers/infiniband/core/addr.c projects/bmake/sys/ofed/drivers/infiniband/core/agent.c projects/bmake/sys/ofed/drivers/infiniband/core/cm.c projects/bmake/sys/ofed/drivers/infiniband/core/device.c projects/bmake/sys/ofed/drivers/infiniband/core/iwcm.c projects/bmake/sys/ofed/drivers/infiniband/core/sa_query.c projects/bmake/sys/ofed/drivers/infiniband/core/sysfs.c projects/bmake/sys/ofed/drivers/infiniband/core/ucm.c projects/bmake/sys/ofed/drivers/infiniband/core/user_mad.c projects/bmake/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/bmake/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/bmake/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c projects/bmake/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c projects/bmake/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c projects/bmake/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c projects/bmake/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/bmake/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/bmake/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/bmake/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c projects/bmake/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/bmake/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/bmake/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/bmake/sys/ofed/drivers/net/mlx4/Makefile projects/bmake/sys/ofed/drivers/net/mlx4/alloc.c projects/bmake/sys/ofed/drivers/net/mlx4/catas.c projects/bmake/sys/ofed/drivers/net/mlx4/cmd.c projects/bmake/sys/ofed/drivers/net/mlx4/cq.c projects/bmake/sys/ofed/drivers/net/mlx4/en_cq.c projects/bmake/sys/ofed/drivers/net/mlx4/en_ethtool.c projects/bmake/sys/ofed/drivers/net/mlx4/en_main.c projects/bmake/sys/ofed/drivers/net/mlx4/en_netdev.c projects/bmake/sys/ofed/drivers/net/mlx4/en_port.c projects/bmake/sys/ofed/drivers/net/mlx4/en_port.h projects/bmake/sys/ofed/drivers/net/mlx4/en_resources.c projects/bmake/sys/ofed/drivers/net/mlx4/en_rx.c projects/bmake/sys/ofed/drivers/net/mlx4/en_selftest.c projects/bmake/sys/ofed/drivers/net/mlx4/en_tx.c projects/bmake/sys/ofed/drivers/net/mlx4/eq.c projects/bmake/sys/ofed/drivers/net/mlx4/fw.c projects/bmake/sys/ofed/drivers/net/mlx4/fw.h projects/bmake/sys/ofed/drivers/net/mlx4/icm.c projects/bmake/sys/ofed/drivers/net/mlx4/icm.h projects/bmake/sys/ofed/drivers/net/mlx4/intf.c projects/bmake/sys/ofed/drivers/net/mlx4/main.c projects/bmake/sys/ofed/drivers/net/mlx4/mcg.c projects/bmake/sys/ofed/drivers/net/mlx4/mlx4.h projects/bmake/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/bmake/sys/ofed/drivers/net/mlx4/mr.c projects/bmake/sys/ofed/drivers/net/mlx4/pd.c projects/bmake/sys/ofed/drivers/net/mlx4/port.c projects/bmake/sys/ofed/drivers/net/mlx4/profile.c projects/bmake/sys/ofed/drivers/net/mlx4/qp.c projects/bmake/sys/ofed/drivers/net/mlx4/reset.c projects/bmake/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/bmake/sys/ofed/drivers/net/mlx4/sense.c projects/bmake/sys/ofed/drivers/net/mlx4/srq.c projects/bmake/sys/ofed/drivers/net/mlx4/sys_tune.c projects/bmake/sys/ofed/include/asm/atomic-long.h projects/bmake/sys/ofed/include/asm/atomic.h projects/bmake/sys/ofed/include/asm/byteorder.h projects/bmake/sys/ofed/include/asm/fcntl.h projects/bmake/sys/ofed/include/asm/io.h projects/bmake/sys/ofed/include/asm/pgtable.h projects/bmake/sys/ofed/include/asm/types.h projects/bmake/sys/ofed/include/asm/uaccess.h projects/bmake/sys/ofed/include/linux/bitops.h projects/bmake/sys/ofed/include/linux/cdev.h projects/bmake/sys/ofed/include/linux/clocksource.h projects/bmake/sys/ofed/include/linux/compat.h projects/bmake/sys/ofed/include/linux/compiler.h projects/bmake/sys/ofed/include/linux/completion.h projects/bmake/sys/ofed/include/linux/delay.h projects/bmake/sys/ofed/include/linux/device.h projects/bmake/sys/ofed/include/linux/dma-attrs.h projects/bmake/sys/ofed/include/linux/dma-mapping.h projects/bmake/sys/ofed/include/linux/dmapool.h projects/bmake/sys/ofed/include/linux/err.h projects/bmake/sys/ofed/include/linux/errno.h projects/bmake/sys/ofed/include/linux/file.h projects/bmake/sys/ofed/include/linux/fs.h projects/bmake/sys/ofed/include/linux/gfp.h projects/bmake/sys/ofed/include/linux/hardirq.h projects/bmake/sys/ofed/include/linux/idr.h projects/bmake/sys/ofed/include/linux/if_arp.h projects/bmake/sys/ofed/include/linux/if_ether.h projects/bmake/sys/ofed/include/linux/if_vlan.h projects/bmake/sys/ofed/include/linux/in.h projects/bmake/sys/ofed/include/linux/in6.h projects/bmake/sys/ofed/include/linux/inetdevice.h projects/bmake/sys/ofed/include/linux/interrupt.h projects/bmake/sys/ofed/include/linux/io-mapping.h projects/bmake/sys/ofed/include/linux/io.h projects/bmake/sys/ofed/include/linux/ioctl.h projects/bmake/sys/ofed/include/linux/jiffies.h projects/bmake/sys/ofed/include/linux/kdev_t.h projects/bmake/sys/ofed/include/linux/kernel.h projects/bmake/sys/ofed/include/linux/kobject.h projects/bmake/sys/ofed/include/linux/kref.h projects/bmake/sys/ofed/include/linux/kthread.h projects/bmake/sys/ofed/include/linux/linux_compat.c projects/bmake/sys/ofed/include/linux/linux_idr.c projects/bmake/sys/ofed/include/linux/linux_radix.c projects/bmake/sys/ofed/include/linux/list.h projects/bmake/sys/ofed/include/linux/lockdep.h projects/bmake/sys/ofed/include/linux/log2.h projects/bmake/sys/ofed/include/linux/miscdevice.h projects/bmake/sys/ofed/include/linux/mlx4/cmd.h projects/bmake/sys/ofed/include/linux/mlx4/cq.h projects/bmake/sys/ofed/include/linux/mlx4/device.h projects/bmake/sys/ofed/include/linux/mlx4/driver.h projects/bmake/sys/ofed/include/linux/mlx4/qp.h projects/bmake/sys/ofed/include/linux/mlx4/srq.h projects/bmake/sys/ofed/include/linux/mm.h projects/bmake/sys/ofed/include/linux/module.h projects/bmake/sys/ofed/include/linux/moduleparam.h projects/bmake/sys/ofed/include/linux/mutex.h projects/bmake/sys/ofed/include/linux/net.h projects/bmake/sys/ofed/include/linux/netdevice.h projects/bmake/sys/ofed/include/linux/notifier.h projects/bmake/sys/ofed/include/linux/page.h projects/bmake/sys/ofed/include/linux/pci.h projects/bmake/sys/ofed/include/linux/poll.h projects/bmake/sys/ofed/include/linux/radix-tree.h projects/bmake/sys/ofed/include/linux/random.h projects/bmake/sys/ofed/include/linux/rbtree.h projects/bmake/sys/ofed/include/linux/rwlock.h projects/bmake/sys/ofed/include/linux/rwsem.h projects/bmake/sys/ofed/include/linux/scatterlist.h projects/bmake/sys/ofed/include/linux/sched.h projects/bmake/sys/ofed/include/linux/semaphore.h projects/bmake/sys/ofed/include/linux/slab.h projects/bmake/sys/ofed/include/linux/socket.h projects/bmake/sys/ofed/include/linux/spinlock.h projects/bmake/sys/ofed/include/linux/string.h projects/bmake/sys/ofed/include/linux/sysfs.h projects/bmake/sys/ofed/include/linux/timer.h projects/bmake/sys/ofed/include/linux/types.h projects/bmake/sys/ofed/include/linux/uaccess.h projects/bmake/sys/ofed/include/linux/vmalloc.h projects/bmake/sys/ofed/include/linux/wait.h projects/bmake/sys/ofed/include/linux/workqueue.h projects/bmake/sys/ofed/include/net/ip.h projects/bmake/sys/ofed/include/net/ipv6.h projects/bmake/sys/ofed/include/net/netevent.h projects/bmake/sys/ofed/include/net/tcp.h projects/bmake/sys/ofed/include/rdma/ib_addr.h projects/bmake/sys/ofed/include/rdma/ib_smi.h projects/bmake/sys/ofed/include/rdma/ib_umem.h projects/bmake/sys/ofed/include/rdma/ib_user_cm.h projects/bmake/sys/ofed/include/rdma/ib_verbs.h projects/bmake/sys/opencrypto/cryptodev.c projects/bmake/sys/pc98/cbus/olpt.c projects/bmake/sys/pc98/cbus/pckbd.c projects/bmake/sys/pc98/conf/GENERIC projects/bmake/sys/powerpc/aim/locore64.S projects/bmake/sys/powerpc/aim/machdep.c projects/bmake/sys/powerpc/aim/mmu_oea.c projects/bmake/sys/powerpc/aim/mmu_oea64.c projects/bmake/sys/powerpc/aim/trap.c projects/bmake/sys/powerpc/booke/machdep.c projects/bmake/sys/powerpc/booke/pmap.c projects/bmake/sys/powerpc/conf/GENERIC projects/bmake/sys/powerpc/conf/GENERIC64 projects/bmake/sys/powerpc/conf/NOTES projects/bmake/sys/powerpc/conf/WII projects/bmake/sys/powerpc/include/pmap.h projects/bmake/sys/powerpc/include/vmparam.h projects/bmake/sys/powerpc/ofw/ofw_pcibus.c projects/bmake/sys/powerpc/powermac/fcu.c projects/bmake/sys/powerpc/powermac/macio.c projects/bmake/sys/powerpc/powermac/pmu.c projects/bmake/sys/powerpc/powermac/smu.c projects/bmake/sys/powerpc/powerpc/busdma_machdep.c projects/bmake/sys/powerpc/powerpc/copyinout.c projects/bmake/sys/powerpc/powerpc/cpu.c projects/bmake/sys/powerpc/powerpc/intr_machdep.c projects/bmake/sys/powerpc/powerpc/mmu_if.m projects/bmake/sys/powerpc/powerpc/pmap_dispatch.c projects/bmake/sys/powerpc/powerpc/vm_machdep.c projects/bmake/sys/powerpc/ps3/if_glc.c projects/bmake/sys/powerpc/ps3/ps3_syscons.c projects/bmake/sys/powerpc/pseries/phyp_llan.c projects/bmake/sys/powerpc/pseries/vdevice.c projects/bmake/sys/powerpc/wii/wii_gpio.c projects/bmake/sys/rpc/clnt_vc.c projects/bmake/sys/rpc/svc_vc.c projects/bmake/sys/security/audit/audit_pipe.c projects/bmake/sys/sparc64/conf/GENERIC projects/bmake/sys/sparc64/include/param.h projects/bmake/sys/sparc64/include/vmparam.h projects/bmake/sys/sparc64/sparc64/intr_machdep.c projects/bmake/sys/sparc64/sparc64/machdep.c projects/bmake/sys/sparc64/sparc64/mem.c projects/bmake/sys/sparc64/sparc64/pmap.c projects/bmake/sys/sparc64/sparc64/support.S projects/bmake/sys/sparc64/sparc64/vm_machdep.c projects/bmake/sys/sys/_cpuset.h projects/bmake/sys/sys/_umtx.h projects/bmake/sys/sys/ata.h projects/bmake/sys/sys/bitset.h projects/bmake/sys/sys/buf_ring.h projects/bmake/sys/sys/bus.h projects/bmake/sys/sys/callout.h projects/bmake/sys/sys/cdefs.h projects/bmake/sys/sys/conf.h projects/bmake/sys/sys/consio.h projects/bmake/sys/sys/cpuset.h projects/bmake/sys/sys/disk.h projects/bmake/sys/sys/domain.h projects/bmake/sys/sys/elf_common.h projects/bmake/sys/sys/event.h projects/bmake/sys/sys/exec.h projects/bmake/sys/sys/fbio.h projects/bmake/sys/sys/fdcio.h projects/bmake/sys/sys/file.h projects/bmake/sys/sys/filedesc.h projects/bmake/sys/sys/hash.h projects/bmake/sys/sys/hhook.h projects/bmake/sys/sys/imgact.h projects/bmake/sys/sys/imgact_elf.h projects/bmake/sys/sys/interrupt.h projects/bmake/sys/sys/khelp.h projects/bmake/sys/sys/ksem.h projects/bmake/sys/sys/libkern.h projects/bmake/sys/sys/linker.h projects/bmake/sys/sys/lockmgr.h projects/bmake/sys/sys/mbuf.h projects/bmake/sys/sys/mman.h projects/bmake/sys/sys/mount.h projects/bmake/sys/sys/param.h projects/bmake/sys/sys/poll.h projects/bmake/sys/sys/priv.h projects/bmake/sys/sys/proc.h projects/bmake/sys/sys/procdesc.h projects/bmake/sys/sys/protosw.h projects/bmake/sys/sys/racct.h projects/bmake/sys/sys/random.h projects/bmake/sys/sys/sdt.h projects/bmake/sys/sys/sf_buf.h projects/bmake/sys/sys/sleepqueue.h projects/bmake/sys/sys/sockbuf.h projects/bmake/sys/sys/socket.h projects/bmake/sys/sys/socketvar.h projects/bmake/sys/sys/sockio.h projects/bmake/sys/sys/syscall.h projects/bmake/sys/sys/syscall.mk projects/bmake/sys/sys/syscallsubr.h projects/bmake/sys/sys/sysctl.h projects/bmake/sys/sys/sysent.h projects/bmake/sys/sys/sysproto.h projects/bmake/sys/sys/systm.h projects/bmake/sys/sys/terminal.h projects/bmake/sys/sys/timex.h projects/bmake/sys/sys/ucred.h projects/bmake/sys/sys/umtx.h projects/bmake/sys/sys/user.h projects/bmake/sys/sys/vnode.h projects/bmake/sys/tools/fdt/make_dtb.sh projects/bmake/sys/ufs/ffs/ffs_softdep.c projects/bmake/sys/ufs/ffs/ffs_vfsops.c projects/bmake/sys/ufs/ffs/ffs_vnops.c projects/bmake/sys/ufs/ffs/softdep.h projects/bmake/sys/ufs/ufs/dir.h projects/bmake/sys/ufs/ufs/ufs_dirhash.c projects/bmake/sys/ufs/ufs/ufs_quota.c projects/bmake/sys/ufs/ufs/ufs_vnops.c projects/bmake/sys/vm/default_pager.c projects/bmake/sys/vm/memguard.c projects/bmake/sys/vm/pmap.h projects/bmake/sys/vm/swap_pager.c projects/bmake/sys/vm/uma_core.c projects/bmake/sys/vm/vm_extern.h projects/bmake/sys/vm/vm_fault.c projects/bmake/sys/vm/vm_glue.c projects/bmake/sys/vm/vm_kern.c projects/bmake/sys/vm/vm_map.c projects/bmake/sys/vm/vm_map.h projects/bmake/sys/vm/vm_mmap.c projects/bmake/sys/vm/vm_object.h projects/bmake/sys/vm/vm_page.c projects/bmake/sys/vm/vm_page.h projects/bmake/sys/vm/vm_pageout.c projects/bmake/sys/vm/vm_pager.c projects/bmake/sys/vm/vm_pager.h projects/bmake/sys/vm/vm_phys.c projects/bmake/sys/vm/vm_phys.h projects/bmake/sys/vm/vm_reserv.c projects/bmake/sys/vm/vnode_pager.c projects/bmake/sys/vm/vnode_pager.h projects/bmake/sys/x86/acpica/acpi_wakeup.c projects/bmake/sys/x86/acpica/madt.c projects/bmake/sys/x86/acpica/srat.c projects/bmake/sys/x86/include/acpica_machdep.h (contents, props changed) projects/bmake/sys/x86/include/fpu.h projects/bmake/sys/x86/include/init.h projects/bmake/sys/x86/include/specialreg.h projects/bmake/sys/x86/iommu/busdma_dmar.c projects/bmake/sys/x86/isa/atpic.c projects/bmake/sys/x86/isa/orm.c projects/bmake/sys/x86/x86/busdma_bounce.c projects/bmake/sys/x86/x86/dump_machdep.c projects/bmake/sys/x86/x86/intr_machdep.c projects/bmake/sys/x86/x86/local_apic.c projects/bmake/sys/x86/x86/mca.c projects/bmake/sys/x86/x86/tsc.c projects/bmake/sys/x86/xen/hvm.c projects/bmake/sys/x86/xen/pv.c projects/bmake/sys/x86/xen/pvcpu_enum.c projects/bmake/sys/x86/xen/xen_intr.c projects/bmake/sys/x86/xen/xen_nexus.c projects/bmake/sys/xen/gnttab.c projects/bmake/sys/xen/interface/memory.h projects/bmake/sys/xen/interface/physdev.h projects/bmake/sys/xen/interface/xen.h projects/bmake/sys/xen/xen_intr.h projects/bmake/sys/xen/xenstore/xenstore_internal.h projects/bmake/tests/sys/Makefile projects/bmake/tests/sys/kern/unix_seqpacket_test.c projects/bmake/tests/sys/netinet/Makefile projects/bmake/tests/sys/netinet/fibs_test.sh projects/bmake/tools/build/make_check/Makefile projects/bmake/tools/build/mk/OptionalObsoleteFiles.inc projects/bmake/tools/build/options/WITHOUT_CLANG_BOOTSTRAP projects/bmake/tools/build/options/WITHOUT_GCC_BOOTSTRAP projects/bmake/tools/build/options/WITHOUT_GNU_GREP_COMPAT projects/bmake/tools/build/options/WITHOUT_LIB32 projects/bmake/tools/build/options/WITHOUT_RCS projects/bmake/tools/build/options/WITHOUT_TOOLCHAIN projects/bmake/tools/make_libdeps.sh projects/bmake/tools/regression/acltools/01.t projects/bmake/tools/regression/acltools/03.t projects/bmake/tools/regression/acltools/04.t projects/bmake/tools/regression/lib/libc/gen/Makefile projects/bmake/tools/regression/lib/libc/nss/test-gethostby.c projects/bmake/tools/regression/lib/libc/stdio/Makefile projects/bmake/tools/regression/lib/msun/test-cexp.c projects/bmake/tools/regression/lib/msun/test-conj.c projects/bmake/tools/regression/lib/msun/test-csqrt.c projects/bmake/tools/regression/lib/msun/test-invctrig.c projects/bmake/tools/regression/zfs/misc.sh projects/bmake/tools/regression/zfs/zpool/add/option-f_size_mismatch.t projects/bmake/tools/regression/zfs/zpool/add/option-f_type_mismatch.t projects/bmake/tools/regression/zfs/zpool/create/files.t projects/bmake/tools/sched/schedgraph.py projects/bmake/tools/test/dtrace/Makefile projects/bmake/tools/tools/ath/Makefile projects/bmake/tools/tools/ath/athaggrstats/Makefile projects/bmake/tools/tools/ath/athalq/ar9300_ds.c projects/bmake/tools/tools/ath/athdecode/main.c projects/bmake/tools/tools/ath/athpoke/athpoke.c projects/bmake/tools/tools/ath/athregs/dumpregs.c projects/bmake/tools/tools/ath/athstats/Makefile projects/bmake/tools/tools/bootparttest/Makefile projects/bmake/tools/tools/bootparttest/bootparttest.c projects/bmake/tools/tools/cxgbetool/cxgbetool.c projects/bmake/tools/tools/nanobsd/dhcpd/README projects/bmake/tools/tools/nanobsd/dhcpd/common projects/bmake/tools/tools/nanobsd/nanobsd.sh projects/bmake/tools/tools/nanobsd/pcengines/ALIX_DSK projects/bmake/tools/tools/nanobsd/pcengines/ALIX_NFS projects/bmake/tools/tools/nanobsd/rescue/common projects/bmake/tools/tools/net80211/wlanstats/Makefile projects/bmake/tools/tools/netmap/pkt-gen.c projects/bmake/tools/tools/netmap/vale-ctl.c projects/bmake/tools/tools/sysbuild/sysbuild.sh projects/bmake/tools/tools/sysdoc/tunables.mdoc projects/bmake/tools/tools/tinybsd/conf/default/TINYBSD projects/bmake/tools/tools/tinybsd/conf/vpn/TINYBSD projects/bmake/tools/tools/tinybsd/conf/wrap/TINYBSD projects/bmake/usr.bin/Makefile projects/bmake/usr.bin/at/at.c projects/bmake/usr.bin/basename/Makefile projects/bmake/usr.bin/bc/Makefile projects/bmake/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/bmake/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 projects/bmake/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c projects/bmake/usr.bin/calendar/calendars/calendar.freebsd projects/bmake/usr.bin/clang/clang-tblgen/Makefile projects/bmake/usr.bin/clang/clang.prog.mk projects/bmake/usr.bin/clang/lldb/Makefile projects/bmake/usr.bin/clang/tblgen/Makefile projects/bmake/usr.bin/cmp/Makefile projects/bmake/usr.bin/col/col.c projects/bmake/usr.bin/compile_et/Makefile projects/bmake/usr.bin/csup/cpasswd.1 projects/bmake/usr.bin/csup/csup.1 projects/bmake/usr.bin/cut/Makefile projects/bmake/usr.bin/dirname/Makefile projects/bmake/usr.bin/drill/Makefile projects/bmake/usr.bin/elfdump/elfdump.1 projects/bmake/usr.bin/elfdump/elfdump.c projects/bmake/usr.bin/find/function.c projects/bmake/usr.bin/ftp/Makefile projects/bmake/usr.bin/gcore/elfcore.c projects/bmake/usr.bin/grep/Makefile projects/bmake/usr.bin/grep/regex/tre-fastmatch.c projects/bmake/usr.bin/grep/util.c projects/bmake/usr.bin/gzip/Makefile projects/bmake/usr.bin/gzip/gzip.1 projects/bmake/usr.bin/gzip/gzip.c projects/bmake/usr.bin/gzip/zmore projects/bmake/usr.bin/gzip/zmore.1 projects/bmake/usr.bin/hexdump/hexdump.1 projects/bmake/usr.bin/host/Makefile projects/bmake/usr.bin/iconv/Makefile projects/bmake/usr.bin/id/Makefile projects/bmake/usr.bin/iscsictl/Makefile projects/bmake/usr.bin/iscsictl/iscsictl.8 projects/bmake/usr.bin/iscsictl/iscsictl.c projects/bmake/usr.bin/iscsictl/token.l projects/bmake/usr.bin/kdump/kdump.c projects/bmake/usr.bin/kdump/mksubr projects/bmake/usr.bin/ktrace/ktrace.1 projects/bmake/usr.bin/lock/lock.1 projects/bmake/usr.bin/lock/lock.c projects/bmake/usr.bin/login/login.c projects/bmake/usr.bin/m4/Makefile projects/bmake/usr.bin/m4/m4.1 projects/bmake/usr.bin/m4/misc.c projects/bmake/usr.bin/mail/edit.c projects/bmake/usr.bin/man/man.1 projects/bmake/usr.bin/mandoc/Makefile projects/bmake/usr.bin/mkimg/Makefile projects/bmake/usr.bin/mkimg/apm.c projects/bmake/usr.bin/mkimg/bsd.c projects/bmake/usr.bin/mkimg/ebr.c projects/bmake/usr.bin/mkimg/gpt.c projects/bmake/usr.bin/mkimg/image.c projects/bmake/usr.bin/mkimg/mbr.c projects/bmake/usr.bin/mkimg/mkimg.1 projects/bmake/usr.bin/mkimg/mkimg.c projects/bmake/usr.bin/mkimg/mkimg.h projects/bmake/usr.bin/mkimg/pc98.c projects/bmake/usr.bin/mkimg/scheme.c projects/bmake/usr.bin/mkimg/scheme.h projects/bmake/usr.bin/mkimg/vhd.c projects/bmake/usr.bin/mkimg/vmdk.c projects/bmake/usr.bin/mkimg/vtoc8.c projects/bmake/usr.bin/netstat/inet6.c projects/bmake/usr.bin/opiekey/Makefile projects/bmake/usr.bin/rctl/rctl.8 projects/bmake/usr.bin/sed/defs.h projects/bmake/usr.bin/sed/main.c projects/bmake/usr.bin/sed/process.c projects/bmake/usr.bin/sed/tests/regress.y.out projects/bmake/usr.bin/showmount/showmount.8 projects/bmake/usr.bin/showmount/showmount.c projects/bmake/usr.bin/sort/Makefile projects/bmake/usr.bin/sort/sort.1.in projects/bmake/usr.bin/sort/sort.c projects/bmake/usr.bin/svn/svn/Makefile projects/bmake/usr.bin/svn/svn_private_config.h projects/bmake/usr.bin/svn/svnadmin/Makefile projects/bmake/usr.bin/svn/svndumpfilter/Makefile projects/bmake/usr.bin/svn/svnlook/Makefile projects/bmake/usr.bin/svn/svnmucc/Makefile projects/bmake/usr.bin/svn/svnrdump/Makefile projects/bmake/usr.bin/svn/svnserve/Makefile projects/bmake/usr.bin/svn/svnsync/Makefile projects/bmake/usr.bin/svn/svnversion/Makefile projects/bmake/usr.bin/systat/ifstat.c projects/bmake/usr.bin/systat/systat.1 projects/bmake/usr.bin/talk/Makefile projects/bmake/usr.bin/telnet/Makefile projects/bmake/usr.bin/timeout/Makefile projects/bmake/usr.bin/timeout/timeout.1 projects/bmake/usr.bin/timeout/timeout.c projects/bmake/usr.bin/top/machine.c projects/bmake/usr.bin/truss/arm-fbsd.c projects/bmake/usr.bin/truss/syscall.h projects/bmake/usr.bin/truss/syscalls.c projects/bmake/usr.bin/vacation/Makefile projects/bmake/usr.bin/vmstat/vmstat.8 projects/bmake/usr.bin/vmstat/vmstat.c projects/bmake/usr.bin/w/Makefile projects/bmake/usr.bin/w/pr_time.c projects/bmake/usr.bin/w/w.1 projects/bmake/usr.bin/w/w.c projects/bmake/usr.bin/wc/Makefile projects/bmake/usr.bin/wc/wc.1 projects/bmake/usr.bin/wc/wc.c projects/bmake/usr.bin/xinstall/xinstall.c projects/bmake/usr.bin/yacc/Makefile projects/bmake/usr.bin/yacc/tests/Makefile projects/bmake/usr.bin/yacc/tests/yacc_tests.sh projects/bmake/usr.sbin/Makefile projects/bmake/usr.sbin/Makefile.amd64 projects/bmake/usr.sbin/Makefile.i386 projects/bmake/usr.sbin/acpi/acpiconf/Makefile projects/bmake/usr.sbin/acpi/acpidb/Makefile projects/bmake/usr.sbin/acpi/acpidb/acpidb.c projects/bmake/usr.sbin/acpi/acpidump/Makefile projects/bmake/usr.sbin/acpi/acpidump/acpi.c projects/bmake/usr.sbin/acpi/iasl/Makefile projects/bmake/usr.sbin/amd/amd/Makefile projects/bmake/usr.sbin/amd/amq/Makefile projects/bmake/usr.sbin/amd/fixmount/Makefile projects/bmake/usr.sbin/amd/fsinfo/Makefile projects/bmake/usr.sbin/amd/hlfsd/Makefile projects/bmake/usr.sbin/amd/mk-amd-map/Makefile projects/bmake/usr.sbin/amd/pawd/Makefile projects/bmake/usr.sbin/amd/wire-test/Makefile projects/bmake/usr.sbin/auditdistd/Makefile projects/bmake/usr.sbin/bhyve/Makefile projects/bmake/usr.sbin/bhyve/acpi.c projects/bmake/usr.sbin/bhyve/bhyve.8 projects/bmake/usr.sbin/bhyve/bhyverun.c projects/bmake/usr.sbin/bhyve/block_if.c projects/bmake/usr.sbin/bhyve/mem.c projects/bmake/usr.sbin/bhyve/mem.h projects/bmake/usr.sbin/bhyve/pci_ahci.c projects/bmake/usr.sbin/bhyve/pci_emul.c projects/bmake/usr.sbin/bhyve/pci_emul.h projects/bmake/usr.sbin/bhyve/pci_irq.c projects/bmake/usr.sbin/bhyve/pci_virtio_block.c projects/bmake/usr.sbin/bhyve/pci_virtio_net.c projects/bmake/usr.sbin/bhyve/pci_virtio_rnd.c projects/bmake/usr.sbin/bhyve/rtc.c projects/bmake/usr.sbin/bhyve/smbiostbl.c projects/bmake/usr.sbin/bhyve/task_switch.c projects/bmake/usr.sbin/bhyve/virtio.c projects/bmake/usr.sbin/bhyve/virtio.h projects/bmake/usr.sbin/bhyve/xmsr.c projects/bmake/usr.sbin/bhyve/xmsr.h projects/bmake/usr.sbin/bhyvectl/bhyvectl.c projects/bmake/usr.sbin/binmiscctl/binmiscctl.8 projects/bmake/usr.sbin/bsdconfig/Makefile projects/bmake/usr.sbin/bsdconfig/bsdconfig.8 projects/bmake/usr.sbin/bsdconfig/console/Makefile projects/bmake/usr.sbin/bsdconfig/console/include/Makefile projects/bmake/usr.sbin/bsdconfig/diskmgmt/Makefile projects/bmake/usr.sbin/bsdconfig/diskmgmt/include/Makefile projects/bmake/usr.sbin/bsdconfig/docsinstall/Makefile projects/bmake/usr.sbin/bsdconfig/docsinstall/include/Makefile projects/bmake/usr.sbin/bsdconfig/dot/Makefile projects/bmake/usr.sbin/bsdconfig/dot/include/Makefile projects/bmake/usr.sbin/bsdconfig/examples/Makefile projects/bmake/usr.sbin/bsdconfig/include/Makefile projects/bmake/usr.sbin/bsdconfig/includes/Makefile projects/bmake/usr.sbin/bsdconfig/includes/include/Makefile projects/bmake/usr.sbin/bsdconfig/includes/includes projects/bmake/usr.sbin/bsdconfig/mouse/Makefile projects/bmake/usr.sbin/bsdconfig/mouse/include/Makefile projects/bmake/usr.sbin/bsdconfig/networking/Makefile projects/bmake/usr.sbin/bsdconfig/networking/include/Makefile projects/bmake/usr.sbin/bsdconfig/networking/share/Makefile projects/bmake/usr.sbin/bsdconfig/networking/share/device.subr projects/bmake/usr.sbin/bsdconfig/packages/Makefile projects/bmake/usr.sbin/bsdconfig/packages/include/Makefile projects/bmake/usr.sbin/bsdconfig/password/Makefile projects/bmake/usr.sbin/bsdconfig/password/include/Makefile projects/bmake/usr.sbin/bsdconfig/password/share/Makefile projects/bmake/usr.sbin/bsdconfig/security/Makefile projects/bmake/usr.sbin/bsdconfig/security/include/Makefile projects/bmake/usr.sbin/bsdconfig/share/Makefile projects/bmake/usr.sbin/bsdconfig/share/common.subr projects/bmake/usr.sbin/bsdconfig/share/device.subr projects/bmake/usr.sbin/bsdconfig/share/dialog.subr projects/bmake/usr.sbin/bsdconfig/share/media/Makefile projects/bmake/usr.sbin/bsdconfig/share/packages/Makefile projects/bmake/usr.sbin/bsdconfig/share/packages/index.subr projects/bmake/usr.sbin/bsdconfig/share/packages/packages.subr projects/bmake/usr.sbin/bsdconfig/startup/Makefile projects/bmake/usr.sbin/bsdconfig/startup/include/Makefile projects/bmake/usr.sbin/bsdconfig/startup/share/Makefile projects/bmake/usr.sbin/bsdconfig/timezone/Makefile projects/bmake/usr.sbin/bsdconfig/timezone/include/Makefile projects/bmake/usr.sbin/bsdconfig/timezone/share/Makefile projects/bmake/usr.sbin/bsdconfig/timezone/timezone projects/bmake/usr.sbin/bsdconfig/ttys/Makefile projects/bmake/usr.sbin/bsdconfig/ttys/include/Makefile projects/bmake/usr.sbin/bsdconfig/usermgmt/Makefile projects/bmake/usr.sbin/bsdconfig/usermgmt/include/Makefile projects/bmake/usr.sbin/bsdconfig/usermgmt/share/Makefile projects/bmake/usr.sbin/bsdinstall/bsdinstall.8 projects/bmake/usr.sbin/bsdinstall/distextract/distextract.c projects/bmake/usr.sbin/bsdinstall/distfetch/distfetch.c projects/bmake/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/bmake/usr.sbin/bsdinstall/partedit/part_wizard.c projects/bmake/usr.sbin/bsdinstall/partedit/partedit.c projects/bmake/usr.sbin/bsdinstall/partedit/partedit.h projects/bmake/usr.sbin/bsdinstall/partedit/partedit_generic.c projects/bmake/usr.sbin/bsdinstall/partedit/partedit_pc98.c projects/bmake/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/bmake/usr.sbin/bsdinstall/partedit/partedit_sparc64.c projects/bmake/usr.sbin/bsdinstall/partedit/partedit_x86.c projects/bmake/usr.sbin/bsdinstall/partedit/sade.8 projects/bmake/usr.sbin/bsdinstall/partedit/scripted.c projects/bmake/usr.sbin/bsdinstall/scripts/auto projects/bmake/usr.sbin/bsdinstall/scripts/config projects/bmake/usr.sbin/bsdinstall/scripts/jail projects/bmake/usr.sbin/bsdinstall/scripts/services projects/bmake/usr.sbin/bsdinstall/scripts/zfsboot projects/bmake/usr.sbin/btxld/Makefile projects/bmake/usr.sbin/config/config.8 projects/bmake/usr.sbin/cron/cron/Makefile projects/bmake/usr.sbin/cron/cron/do_command.c projects/bmake/usr.sbin/cron/crontab/Makefile projects/bmake/usr.sbin/crunch/crunchgen/Makefile projects/bmake/usr.sbin/crunch/crunchide/Makefile projects/bmake/usr.sbin/ctladm/Makefile projects/bmake/usr.sbin/ctladm/ctladm.8 projects/bmake/usr.sbin/ctladm/ctladm.c projects/bmake/usr.sbin/ctld/Makefile projects/bmake/usr.sbin/ctld/ctl.conf.5 projects/bmake/usr.sbin/ctld/ctld.8 projects/bmake/usr.sbin/ctld/ctld.c projects/bmake/usr.sbin/ctld/ctld.h projects/bmake/usr.sbin/ctld/discovery.c projects/bmake/usr.sbin/ctld/kernel.c projects/bmake/usr.sbin/ctld/keys.c projects/bmake/usr.sbin/ctld/log.c projects/bmake/usr.sbin/ctld/login.c projects/bmake/usr.sbin/ctld/parse.y projects/bmake/usr.sbin/ctld/pdu.c projects/bmake/usr.sbin/ctld/token.l projects/bmake/usr.sbin/editmap/Makefile projects/bmake/usr.sbin/etcupdate/etcupdate.8 projects/bmake/usr.sbin/fdread/fdutil.c projects/bmake/usr.sbin/fifolog/fifolog_create/Makefile projects/bmake/usr.sbin/fifolog/fifolog_reader/Makefile projects/bmake/usr.sbin/fifolog/fifolog_writer/Makefile projects/bmake/usr.sbin/freebsd-update/freebsd-update.sh projects/bmake/usr.sbin/ftp-proxy/Makefile projects/bmake/usr.sbin/gstat/Makefile projects/bmake/usr.sbin/i2c/i2c.c projects/bmake/usr.sbin/inetd/inetd.c projects/bmake/usr.sbin/iscsid/Makefile projects/bmake/usr.sbin/iscsid/discovery.c projects/bmake/usr.sbin/iscsid/iscsid.8 projects/bmake/usr.sbin/iscsid/iscsid.c projects/bmake/usr.sbin/iscsid/iscsid.h projects/bmake/usr.sbin/iscsid/keys.c projects/bmake/usr.sbin/iscsid/log.c projects/bmake/usr.sbin/iscsid/login.c projects/bmake/usr.sbin/iscsid/pdu.c projects/bmake/usr.sbin/jail/command.c projects/bmake/usr.sbin/jail/config.c projects/bmake/usr.sbin/jail/jail.8 projects/bmake/usr.sbin/kbdcontrol/kbdcontrol.1 projects/bmake/usr.sbin/kbdcontrol/kbdcontrol.c projects/bmake/usr.sbin/kbdcontrol/kbdmap.5 projects/bmake/usr.sbin/kbdmap/kbdmap.1 projects/bmake/usr.sbin/kbdmap/kbdmap.c projects/bmake/usr.sbin/kbdmap/kbdmap.h projects/bmake/usr.sbin/lpr/chkprintcap/Makefile projects/bmake/usr.sbin/lpr/lpc/Makefile projects/bmake/usr.sbin/lpr/lpd/Makefile projects/bmake/usr.sbin/lpr/lpd/printjob.c projects/bmake/usr.sbin/lpr/lpq/Makefile projects/bmake/usr.sbin/lpr/lpr/Makefile projects/bmake/usr.sbin/lpr/lprm/Makefile projects/bmake/usr.sbin/lpr/pac/Makefile projects/bmake/usr.sbin/mailstats/Makefile projects/bmake/usr.sbin/mailwrapper/mailwrapper.8 projects/bmake/usr.sbin/mailwrapper/mailwrapper.c projects/bmake/usr.sbin/makefs/Makefile projects/bmake/usr.sbin/makefs/ffs.c projects/bmake/usr.sbin/makemap/Makefile projects/bmake/usr.sbin/mfiutil/mfi_properties.c projects/bmake/usr.sbin/mountd/exports.5 projects/bmake/usr.sbin/mountd/mountd.c projects/bmake/usr.sbin/mtree/Makefile projects/bmake/usr.sbin/newsyslog/newsyslog.8 projects/bmake/usr.sbin/newsyslog/newsyslog.c projects/bmake/usr.sbin/nfsd/nfsd.8 projects/bmake/usr.sbin/nmtree/Makefile projects/bmake/usr.sbin/nscd/query.c projects/bmake/usr.sbin/ntp/ntp-keygen/Makefile projects/bmake/usr.sbin/ntp/ntpd/Makefile projects/bmake/usr.sbin/ntp/ntpdate/Makefile projects/bmake/usr.sbin/ntp/ntpdc/Makefile projects/bmake/usr.sbin/ntp/ntpq/Makefile projects/bmake/usr.sbin/ntp/ntptime/Makefile projects/bmake/usr.sbin/pciconf/pciconf.c projects/bmake/usr.sbin/pkg/Makefile projects/bmake/usr.sbin/pkg/config.c projects/bmake/usr.sbin/pmcstat/pmcstat.8 projects/bmake/usr.sbin/ppp/Makefile projects/bmake/usr.sbin/praliases/Makefile projects/bmake/usr.sbin/pstat/pstat.8 projects/bmake/usr.sbin/pw/Makefile projects/bmake/usr.sbin/pw/pw.c projects/bmake/usr.sbin/pw/pw_group.c projects/bmake/usr.sbin/pw/pw_user.c projects/bmake/usr.sbin/route6d/route6d.c projects/bmake/usr.sbin/rpcbind/Makefile projects/bmake/usr.sbin/rtadvd/advcap.c projects/bmake/usr.sbin/rtadvd/config.c projects/bmake/usr.sbin/rtsold/rtsol.c projects/bmake/usr.sbin/sendmail/Makefile projects/bmake/usr.sbin/smbmsg/smbmsg.8 projects/bmake/usr.sbin/sysrc/sysrc projects/bmake/usr.sbin/sysrc/sysrc.8 projects/bmake/usr.sbin/timed/timedc/timedc.c projects/bmake/usr.sbin/traceroute/Makefile projects/bmake/usr.sbin/tzsetup/tzsetup.c projects/bmake/usr.sbin/unbound/anchor/Makefile projects/bmake/usr.sbin/unbound/checkconf/Makefile projects/bmake/usr.sbin/unbound/control/Makefile projects/bmake/usr.sbin/unbound/daemon/Makefile projects/bmake/usr.sbin/unbound/local-setup/local-unbound-setup.sh projects/bmake/usr.sbin/usbconfig/dump.c projects/bmake/usr.sbin/vidcontrol/vidcontrol.1 projects/bmake/usr.sbin/vidcontrol/vidcontrol.c projects/bmake/usr.sbin/watchdogd/watchdog.8 projects/bmake/usr.sbin/watchdogd/watchdogd.8 projects/bmake/usr.sbin/watchdogd/watchdogd.c projects/bmake/usr.sbin/wlandebug/wlandebug.c projects/bmake/usr.sbin/wpa/wpa_cli/Makefile Directory Properties: projects/bmake/ (props changed) projects/bmake/cddl/ (props changed) projects/bmake/cddl/contrib/opensolaris/ (props changed) projects/bmake/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/bmake/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/bmake/contrib/apr-util/ (props changed) projects/bmake/contrib/atf/ (props changed) projects/bmake/contrib/binutils/ (props changed) projects/bmake/contrib/byacc/ (props changed) projects/bmake/contrib/file/ (props changed) projects/bmake/contrib/gcc/ (props changed) projects/bmake/contrib/ipfilter/ (props changed) projects/bmake/contrib/libarchive/ (props changed) projects/bmake/contrib/libarchive/tar/ (props changed) projects/bmake/contrib/libc++/ (props changed) projects/bmake/contrib/libc-vis/ (props changed) projects/bmake/contrib/libcxxrt/ (props changed) projects/bmake/contrib/libpcap/ (props changed) projects/bmake/contrib/llvm/ (props changed) projects/bmake/contrib/llvm/tools/clang/ (props changed) projects/bmake/contrib/mtree/ (props changed) projects/bmake/contrib/netcat/ (props changed) projects/bmake/contrib/one-true-awk/ (props changed) projects/bmake/contrib/openbsm/ (props changed) projects/bmake/contrib/openpam/ (props changed) projects/bmake/contrib/openpam/bin/Makefile.am (props changed) projects/bmake/contrib/openpam/bin/su/Makefile.am (props changed) projects/bmake/contrib/openpam/bin/su/su.c (props changed) projects/bmake/contrib/openpam/compile (props changed) projects/bmake/contrib/openpam/config.guess (props changed) projects/bmake/contrib/openpam/config.sub (props changed) projects/bmake/contrib/openpam/depcomp (props changed) projects/bmake/contrib/openpam/doc/Makefile.am (props changed) projects/bmake/contrib/openpam/doc/man/Makefile.am (props changed) projects/bmake/contrib/openpam/doc/man/openpam.man (props changed) projects/bmake/contrib/openpam/doc/man/pam.man (props changed) projects/bmake/contrib/openpam/include/Makefile.am (props changed) projects/bmake/contrib/openpam/include/security/Makefile.am (props changed) projects/bmake/contrib/openpam/include/security/openpam.h (props changed) projects/bmake/contrib/openpam/include/security/openpam_attr.h (props changed) projects/bmake/contrib/openpam/include/security/pam_appl.h (props changed) projects/bmake/contrib/openpam/include/security/pam_constants.h (props changed) projects/bmake/contrib/openpam/include/security/pam_modules.h (props changed) projects/bmake/contrib/openpam/include/security/pam_types.h (props changed) projects/bmake/contrib/openpam/install-sh (props changed) projects/bmake/contrib/openpam/misc/gendoc.pl (props changed) projects/bmake/contrib/openpam/missing (props changed) projects/bmake/contrib/openpam/modules/Makefile.am (props changed) projects/bmake/contrib/openpam/modules/pam_deny/Makefile.am (props changed) projects/bmake/contrib/openpam/modules/pam_deny/pam_deny.c (props changed) projects/bmake/contrib/openpam/modules/pam_permit/Makefile.am (props changed) projects/bmake/contrib/openpam/modules/pam_permit/pam_permit.c (props changed) projects/bmake/contrib/openpam/modules/pam_unix/Makefile.am (props changed) projects/bmake/contrib/openpam/modules/pam_unix/pam_unix.c (props changed) projects/bmake/contrib/serf/ (props changed) projects/bmake/contrib/sqlite3/ (props changed) projects/bmake/contrib/subversion/ (props changed) projects/bmake/contrib/tcpdump/ (props changed) projects/bmake/contrib/tnftp/ (props changed) projects/bmake/contrib/tzdata/ (props changed) projects/bmake/contrib/xz/ (props changed) projects/bmake/crypto/heimdal/ (props changed) projects/bmake/crypto/openssl/ (props changed) projects/bmake/etc/ (props changed) projects/bmake/gnu/lib/ (props changed) projects/bmake/gnu/usr.bin/binutils/ (props changed) projects/bmake/gnu/usr.bin/cc/cc_tools/ (props changed) projects/bmake/gnu/usr.bin/gdb/ (props changed) projects/bmake/include/ (props changed) projects/bmake/lib/atf/libatf-c++/tests/detail/ (props changed) projects/bmake/lib/atf/libatf-c/tests/detail/ (props changed) projects/bmake/lib/libc/ (props changed) projects/bmake/lib/libc/stdtime/ (props changed) projects/bmake/lib/libutil/ (props changed) projects/bmake/lib/libz/ (props changed) projects/bmake/sbin/ (props changed) projects/bmake/sbin/dumpon/ (props changed) projects/bmake/sbin/ipfw/ (props changed) projects/bmake/share/ (props changed) projects/bmake/share/man/man4/ (props changed) projects/bmake/share/zoneinfo/ (props changed) projects/bmake/sys/ (props changed) projects/bmake/sys/amd64/include/xen/ (props changed) projects/bmake/sys/amd64/vmm/ (props changed) projects/bmake/sys/boot/ (props changed) projects/bmake/sys/boot/powerpc/ofw/ (props changed) projects/bmake/sys/cddl/contrib/opensolaris/ (props changed) projects/bmake/sys/conf/ (props changed) projects/bmake/sys/contrib/dev/acpica/ (props changed) projects/bmake/sys/contrib/dev/acpica/common/ (props changed) projects/bmake/sys/contrib/dev/acpica/compiler/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/events/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/executer/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/parser/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/resources/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/tables/ (props changed) projects/bmake/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/bmake/sys/contrib/dev/acpica/include/ (props changed) projects/bmake/sys/contrib/dev/acpica/os_specific/ (props changed) projects/bmake/sys/contrib/ipfilter/ (props changed) projects/bmake/sys/dev/hyperv/ (props changed) projects/bmake/sys/dev/usb/controller/ (props changed) projects/bmake/sys/gnu/dts/ (props changed) projects/bmake/sys/gnu/dts/include/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clk/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clk/at91.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clk/exynos-audss-clk.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/efm32-cmu.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/imx5-clock.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/mpc512x-clock.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8660.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/samsung,s3c64xx-clock.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/tegra20-car.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/clock/tegra30-car.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/dma/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/dma/at91.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/gpio/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/gpio/gpio.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/gpio/tegra-gpio.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/input/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/input/input.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/interrupt-controller/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/interrupt-controller/arm-gic.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/interrupt-controller/irq.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/mfd/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/mfd/dbx500-prcmu.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/am33xx.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/at91.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/nomadik.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pinctrl/rockchip.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pwm/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/pwm/pwm.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/reset/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8660.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8974.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8974.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/sound/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/sound/fsl-imx-audmux.h (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/thermal/ (props changed) projects/bmake/sys/gnu/dts/include/dt-bindings/thermal/thermal.h (props changed) projects/bmake/sys/modules/hyperv/ (props changed) projects/bmake/sys/modules/vmm/ (props changed) projects/bmake/usr.bin/calendar/ (props changed) projects/bmake/usr.bin/csup/ (props changed) projects/bmake/usr.bin/mkimg/ (props changed) projects/bmake/usr.sbin/bhyve/ (props changed) projects/bmake/usr.sbin/bhyvectl/ (props changed) projects/bmake/usr.sbin/jail/ (props changed) projects/bmake/usr.sbin/rtadvd/ (props changed) projects/bmake/usr.sbin/rtsold/ (props changed) Modified: projects/bmake/.arcconfig ============================================================================== --- projects/bmake/.arcconfig Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/.arcconfig Wed Nov 19 01:07:58 2014 (r274683) @@ -1,5 +1,5 @@ { "project.name": "S", - "phabricator.uri" : "https://phabric.freebsd.org/", + "phabricator.uri" : "https://reviews.freebsd.org/", "history.immutable" : true } Modified: projects/bmake/MAINTAINERS ============================================================================== --- projects/bmake/MAINTAINERS Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/MAINTAINERS Wed Nov 19 01:07:58 2014 (r274683) @@ -20,7 +20,7 @@ It is not a registry of 'turf' or privat subsystem login notes ----------------------------- -kqueue jmg Pre-commit review requested. +kqueue jmg Pre-commit review requested. Documentation Required. libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. UFS EAs rwatson Pre-commit review requested. @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -bxe(4) davidch Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. @@ -78,10 +77,11 @@ inetd dwmalone Recommends pre-commit re contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. contrib/pf glebius Pre-commit review recommended. -binutils obrien Insists on BU blocked from unapproved commits file obrien Insists to keep file blocked from other's unapproved commits contrib/bzip2 obrien Pre-commit review required. +contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. +contrib/pjdfstest freebsd-testing,ngie Pre-commit review requested. geom_concat pjd Pre-commit review preferred. geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. @@ -132,3 +132,4 @@ release/release.sh gjb Pre-commit review requested. nanobsd imp Pre-commit review requested for coordination. vmm(4) neel,grehan Pre-commit review requested. +opencrypto jmg Pre-commit review requested. Documentation Required. Modified: projects/bmake/Makefile ============================================================================== --- projects/bmake/Makefile Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/Makefile Wed Nov 19 01:07:58 2014 (r274683) @@ -37,6 +37,8 @@ # xdev-build - Build cross-development tools. # xdev-install - Install cross-development tools. # xdev-links - Create traditional links in /usr/bin for cc, etc +# native-xtools - Create host binaries that produce target objects +# for use in qemu user-mode jails. # # "quick" way to test all kernel builds: # _jflag=`sysctl -n hw.ncpu` @@ -111,7 +113,7 @@ TGTS= all all-man buildenv buildenvvars _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ - xdev-links \ + xdev-links native-xtools \ TGTS+= ${SUBDIR_TARGETS} Modified: projects/bmake/Makefile.inc1 ============================================================================== --- projects/bmake/Makefile.inc1 Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/Makefile.inc1 Wed Nov 19 01:07:58 2014 (r274683) @@ -246,7 +246,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - SSP_CFLAGS= MK_PIE=no \ + SSP_CFLAGS= \ MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ @@ -258,7 +258,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - SSP_CFLAGS= MK_PIE=no \ + SSP_CFLAGS= \ -DNO_LINT \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no MK_CLANG_FULL=no MK_LLDB=no MK_TESTS=no @@ -276,7 +276,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOB ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - SSP_CFLAGS= MK_PIE=no \ + SSP_CFLAGS= \ MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no @@ -299,6 +299,10 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METAL WMAKEENV+= MK_CTF=no .endif +.if defined(CROSS_TOOLCHAIN) +LOCALBASE?= /usr/local +.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" +.endif .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} @@ -311,7 +315,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}$ X${COMPILER}?= ${${COMPILER}} .endif .endfor -XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS +XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS .for BINUTIL in ${XBINUTILS} .if defined(CROSS_BINUTILS_PREFIX) X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} @@ -319,10 +323,13 @@ X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${ X${BINUTIL}?= ${${BINUTIL}} .endif .endfor -WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ - CPP="${XCPP} ${XFLAGS}" \ +WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ + DEPFLAGS="${DEPFLAGS}" \ + CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ - OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS} + OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \ + RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \ + SIZE="${XSIZE}" .if ${XCC:M/*} XFLAGS= --sysroot=${WORLDTMP} @@ -336,22 +343,29 @@ XFLAGS+= -B${CROSS_BINUTILS_PREFIX} .else XFLAGS+= -B${WORLDTMP}/usr/bin .endif -.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no" -.if ${TARGET_ARCH:M*eb*} == "" -TARGET_ABI= gnueabi -.elif ${TARGET_ARCH} == "armv6hf" +.if ${TARGET} == "arm" +.if ${TARGET_ARCH:M*hf*} != "" TARGET_ABI= gnueabihf +.else +TARGET_ABI= gnueabi .endif .endif +.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc +XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib +XCXXFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11 -L${WORLDTMP}/../lib/libc++ +DEPFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 +.else TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 -XFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= -target ${TARGET_TRIPLE} +.endif .endif WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" # 32 bit world +LIB32_OBJTREE= ${OBJTREE}${.CURDIR}/world32 LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 .if ${TARGET_ARCH} == "amd64" @@ -387,7 +401,7 @@ LIB32FLAGS+= --sysroot=${WORLDTMP} .endif # Yes, the flags are redundant. -LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ _SHLIBDIRPREFIX=${LIB32TMP} \ _LDSCRIPTROOT=${LIB32TMP} \ VERSION="${VERSION}" \ @@ -395,7 +409,8 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR PATH=${TMPPATH} \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ - LIBPRIVATEDIR=/usr/lib32/private + LIBPRIVATEDIR=/usr/lib32/private \ + DTRACE="${DTRACE} -32" LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ CXX="${XCXX} ${LIB32FLAGS}" \ DESTDIR=${LIB32TMP} \ @@ -559,7 +574,7 @@ _libraries: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ - MK_PROFILE=no MK_TESTS=no libraries + MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -610,7 +625,7 @@ build32: cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ + MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools .endfor @@ -909,7 +924,7 @@ packageworld: # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: +reinstall: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -924,7 +939,7 @@ reinstall: ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif -redistribute: +redistribute: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" @@ -934,7 +949,7 @@ redistribute: DISTRIBUTION=lib32 .endif -distrib-dirs distribution: +distrib-dirs distribution: .MAKE cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} @@ -1207,12 +1222,9 @@ _vtfontcvt= usr.bin/vtfontcvt _sed= usr.bin/sed .endif -.if ${BOOTSTRAPPING} < 900006 -_lex= usr.bin/lex -.endif - .if ${BOOTSTRAPPING} < 1000002 -_m4= usr.bin/m4 +_m4= lib/libohash \ + usr.bin/m4 .endif .if ${BOOTSTRAPPING} < 1000013 @@ -1233,15 +1245,19 @@ _nmtree= lib/libnetbsd \ _cat= bin/cat .endif +.if ${BOOTSTRAPPING} < 1000033 +_lex= usr.bin/lex +.endif + .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 _awk= usr.bin/awk .endif -.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree) +.if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif -# We need to build tlbgen when we're building clang either as +# We need to build tblgen when we're building clang either as # the bootstrap compiler, or as the part of the normal build. .if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" _clang_tblgen= \ @@ -1406,7 +1422,8 @@ cross-tools: .MAKE usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ - ${_kgzip} + ${_kgzip} \ + sys/boot/usb/tools ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ @@ -1415,10 +1432,98 @@ cross-tools: .MAKE ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor +NXBENV= MAKEOBJDIRPREFIX=${OBJTREE}/nxb \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + VERSION="${VERSION}" +NXBMAKE= ${NXBENV} ${MAKE} \ + TBLGEN=${OBJTREE}/nxb-bin/usr/bin/tblgen \ + CLANG_TBLGEN=${OBJTREE}/nxb-bin/usr/bin/clang-tblgen \ + MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \ + MK_GDB=no MK_TESTS=no \ + SSP_CFLAGS= \ + MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \ + -DNO_PIC MK_PROFILE=no -DNO_SHARED \ + -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ + MK_CLANG_FULL=no MK_LLDB=no + +native-xtools: .MAKE + mkdir -p ${OBJTREE}/nxb-bin/bin + mkdir -p ${OBJTREE}/nxb-bin/sbin + mkdir -p ${OBJTREE}/nxb-bin/usr + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${OBJTREE}/nxb-bin/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${OBJTREE}/nxb-bin/usr/include >/dev/null +.for _tool in \ + bin/cat \ + bin/chmod \ + bin/cp \ + bin/csh \ + bin/echo \ + bin/expr \ + bin/hostname \ + bin/ln \ + bin/ls \ + bin/mkdir \ + bin/mv \ + bin/ps \ + bin/realpath \ + bin/rm \ + bin/rmdir \ + bin/sh \ + bin/sleep \ + ${_clang_tblgen} \ + usr.bin/ar \ + ${_binutils} \ + ${_cc} \ + ${_gcc_tools} \ + ${_clang_libs} \ + ${_clang} \ + sbin/md5 \ + sbin/sysctl \ + gnu/usr.bin/diff \ + usr.bin/awk \ + usr.bin/basename \ + usr.bin/bmake \ + usr.bin/bzip2 \ + usr.bin/cmp \ + usr.bin/dirname \ + usr.bin/env \ + usr.bin/fetch \ + usr.bin/find \ + usr.bin/grep \ + usr.bin/gzip \ + usr.bin/id \ + usr.bin/lex \ + usr.bin/lorder \ + usr.bin/mktemp \ + usr.bin/mt \ + usr.bin/patch \ + usr.bin/sed \ + usr.bin/sort \ + usr.bin/tar \ + usr.bin/touch \ + usr.bin/tr \ + usr.bin/true \ + usr.bin/uniq \ + usr.bin/unzip \ + usr.bin/xargs \ + usr.bin/xinstall \ + usr.bin/xz \ + usr.bin/yacc \ + usr.sbin/chown + ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_tool} && \ + ${NXBMAKE} DIRPRFX=${_tool}/ obj && \ + ${NXBMAKE} DIRPRFX=${_tool}/ depend && \ + ${NXBMAKE} DIRPRFX=${_tool}/ all && \ + ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${OBJTREE}/nxb-bin install +.endfor + # # hierarchy - ensure that all the needed directories are present # -hierarchy hier: +hierarchy hier: .MAKE cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs # @@ -1476,35 +1581,32 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - ${_lib_atf} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ + lib/libfigpar \ ${_lib_libgssapi} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ ${_lib_libcapsicum} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ + lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ + ${_cddl_lib_libuutil} \ ${_cddl_lib_libavl} \ ${_cddl_lib_libzfs_core} \ + ${_cddl_lib_libctf} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ - ${_secure_lib_libssh} ${_secure_lib_libssl} + ${_secure_lib_libssh} ${_secure_lib_libssl} \ + gnu/lib/libdialog .if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/lib/libstdc++__L: lib/msun__L gnu/lib/libsupc++__L: gnu/lib/libstdc++__L .endif -.if defined(WITH_ATF) || ${MK_TESTS} != "no" -.if !defined(WITH_ATF) -# Ensure that the ATF libraries will be built during make libraries, even -# though they will have WITHOUT_TESTS -MAKE+= -DWITH_ATF -.endif -_lib_atf= lib/atf -.endif +lib/libgeom__L: lib/libexpat__L .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr @@ -1534,9 +1636,13 @@ lib/libopie__L lib/libtacplus__L: lib/li _cddl_lib_libumem= cddl/lib/libumem _cddl_lib_libnvpair= cddl/lib/libnvpair _cddl_lib_libavl= cddl/lib/libavl +_cddl_lib_libuutil= cddl/lib/libuutil _cddl_lib_libzfs_core= cddl/lib/libzfs_core +_cddl_lib_libctf= cddl/lib/libctf _cddl_lib= cddl/lib cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L +cddl/lib/libzfs__L: lib/libgeom__L +cddl/lib/libctf__L: lib/libz__L .endif .if ${MK_CRYPT} != "no" @@ -1611,6 +1717,8 @@ _lib_libypclnt= lib/libypclnt lib/libradius__L: lib/libmd__L .endif +gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L + .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) @@ -1823,7 +1931,8 @@ check-old: check-old-files check-old-lib # showconfig - show build configuration. # showconfig: - @${MAKE} -n -f src.opts.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort + @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \ + ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u .if !empty(KRNLOBJDIR) && !empty(KERNCONF) DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/ Modified: projects/bmake/ObsoleteFiles.inc ============================================================================== --- projects/bmake/ObsoleteFiles.inc Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/ObsoleteFiles.inc Wed Nov 19 01:07:58 2014 (r274683) @@ -38,6 +38,74 @@ # xargs -n1 | sort | uniq -d; # done +# 20141109: faith/faithd removal +OLD_FILES+=etc/rc.d/faith +OLD_FILES+=usr/share/man/man4/faith.4.gz +OLD_FILES+=usr/share/man/man4/if_faith.4.gz +OLD_FILES+=usr/sbin/faithd +OLD_FILES+=usr/share/man/man8/faithd.8.gz +# 20141102: postrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/postrandom +# 20141031: initrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/initrandom +# 20141028: debug files accidentally installed as directory name +OLD_FILES+=usr/lib/debug/usr/lib/i18n +OLD_FILES+=usr/lib/debug/usr/lib/private +OLD_FILES+=usr/lib/debug/usr/lib32/i18n +OLD_FILES+=usr/lib/debug/usr/lib32/private +# 20141015: OpenSSL 1.0.1j import +OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz +# 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed +OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz +OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz +# 20140917: hv_kvpd rc.d script removed in favor of devd configuration +OLD_FILES+=etc/rc.d/hv_kvpd +# 20140917: libnv was accidentally being installed to /usr/lib instead of /lib +OLD_LIBS+=usr/lib/libnv.so.0 +# 20140829: rc.d/kerberos removed +OLD_FILES+=etc/rc.d/kerberos +# 20140814: libopie version bump +OLD_LIBS+=usr/lib/libopie.so.7 +OLD_LIBS+=usr/lib32/libopie.so.7 +# 20140811: otp-sha renamed to otp-sha1 +OLD_FILES+=usr/bin/otp-sha +OLD_FILES+=usr/share/man/man1/otp-sha.1.gz +# 20140807: Remove private lib files that should not be installed. +OLD_FILES+=usr/lib/private/libatf-c.a +OLD_FILES+=usr/lib/private/libatf-c.so +OLD_FILES+=usr/lib/private/libatf-c_p.a +OLD_FILES+=usr/lib/private/libatf-c++.a +OLD_FILES+=usr/lib/private/libatf-c++.so +OLD_FILES+=usr/lib/private/libatf-c++_p.a +OLD_FILES+=usr/lib/private/libbsdstat.a +OLD_FILES+=usr/lib/private/libbsdstat.so +OLD_FILES+=usr/lib/private/libbsdstat_p.a +OLD_FILES+=usr/lib/private/libheimipcc.a +OLD_FILES+=usr/lib/private/libheimipcc.so +OLD_FILES+=usr/lib/private/libheimipcc_p.a +OLD_FILES+=usr/lib/private/libheimipcs.a +OLD_FILES+=usr/lib/private/libheimipcs.so +OLD_FILES+=usr/lib/private/libheimipcs_p.a +OLD_FILES+=usr/lib/private/libldns.a +OLD_FILES+=usr/lib/private/libldns.so +OLD_FILES+=usr/lib/private/libldns_p.a +OLD_FILES+=usr/lib/private/libssh.a +OLD_FILES+=usr/lib/private/libssh.so +OLD_FILES+=usr/lib/private/libssh.p.a +OLD_FILES+=usr/lib/private/libunbound.a +OLD_FILES+=usr/lib/private/libunbound.so +OLD_FILES+=usr/lib/private/libunbound_p.a +OLD_FILES+=usr/lib/private/libucl.a +OLD_FILES+=usr/lib/private/libucl.so +OLD_FILES+=usr/lib/private/libucl_p.a +# 20140803: Remove an obsolete man page +OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz +# 20140728: libsbuf restored to old version. +OLD_LIBS+=lib/libsbuf.so.7 +# 20140728: Remove an obsolete man page +OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz +OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz +OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz # 20140723: renamed to PCBGROUP.9 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz # 20140718: Remove obsolete man pages @@ -314,7 +382,6 @@ OLD_FILES+=usr/share/man/man1/atf-report OLD_FILES+=usr/share/man/man1/atf-run.1.gz OLD_FILES+=usr/share/man/man1/atf-version.1.gz OLD_FILES+=usr/share/man/man5/atf-formats.5.gz -OLD_FILES+=usr/share/man/man7/atf.7.gz OLD_FILES+=usr/share/xml/atf/tests-results.dtd OLD_FILES+=usr/share/xsl/atf/tests-results.xsl # 20131009: freebsd-version moved from /libexec to /bin @@ -1446,6 +1513,7 @@ OLD_LIBS+=usr/lib/libpanel.so.4 OLD_LIBS+=usr/lib/libpanelw.so.4 OLD_LIBS+=usr/lib/libpmc.so.4 OLD_LIBS+=usr/lib/libproc.so.1 +OLD_LIBS+=usr/lib/libproc.so.2 OLD_LIBS+=usr/lib/libradius.so.3 OLD_LIBS+=usr/lib/librpcsvc.so.4 OLD_LIBS+=usr/lib/libsdp.so.3 @@ -3163,6 +3231,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040728: GCC 3.4.2 +OLD_DIRS+=usr/include/c++/3.3 +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h +OLD_FILES+=usr/include/c++/3.3/algorithm +OLD_FILES+=usr/include/c++/3.3/backward/algo.h +OLD_FILES+=usr/include/c++/3.3/backward/algobase.h +OLD_FILES+=usr/include/c++/3.3/backward/alloc.h +OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.3/backward/bvector.h +OLD_FILES+=usr/include/c++/3.3/backward/complex.h +OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.3/backward/deque.h +OLD_FILES+=usr/include/c++/3.3/backward/fstream.h +OLD_FILES+=usr/include/c++/3.3/backward/function.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.3/backward/heap.h +OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.3/backward/iostream.h +OLD_FILES+=usr/include/c++/3.3/backward/istream.h +OLD_FILES+=usr/include/c++/3.3/backward/iterator.h +OLD_FILES+=usr/include/c++/3.3/backward/list.h +OLD_FILES+=usr/include/c++/3.3/backward/map.h +OLD_FILES+=usr/include/c++/3.3/backward/multimap.h +OLD_FILES+=usr/include/c++/3.3/backward/multiset.h +OLD_FILES+=usr/include/c++/3.3/backward/new.h +OLD_FILES+=usr/include/c++/3.3/backward/ostream.h +OLD_FILES+=usr/include/c++/3.3/backward/pair.h +OLD_FILES+=usr/include/c++/3.3/backward/queue.h +OLD_FILES+=usr/include/c++/3.3/backward/rope.h +OLD_FILES+=usr/include/c++/3.3/backward/set.h +OLD_FILES+=usr/include/c++/3.3/backward/slist.h +OLD_FILES+=usr/include/c++/3.3/backward/stack.h +OLD_FILES+=usr/include/c++/3.3/backward/stream.h +OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.3/backward/strstream +OLD_FILES+=usr/include/c++/3.3/backward/strstream.h +OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.3/backward/tree.h +OLD_FILES+=usr/include/c++/3.3/backward/vector.h +OLD_DIRS+=usr/include/c++/3.3/backward +OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/c++config.h +OLD_FILES+=usr/include/c++/3.3/bits/c++io.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.3/bits/fpos.h +OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr.h +OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/list.tcc +OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h +OLD_FILES+=usr/include/c++/3.3/bits/slice.h +OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h +OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc +OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h +OLD_FILES+=usr/include/c++/3.3/bits/time_members.h +OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h +OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc +OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h +OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc +OLD_DIRS+=usr/include/c++/3.3/bits +OLD_FILES+=usr/include/c++/3.3/bitset +OLD_FILES+=usr/include/c++/3.3/cassert +OLD_FILES+=usr/include/c++/3.3/cctype +OLD_FILES+=usr/include/c++/3.3/cerrno +OLD_FILES+=usr/include/c++/3.3/cfloat +OLD_FILES+=usr/include/c++/3.3/ciso646 +OLD_FILES+=usr/include/c++/3.3/climits +OLD_FILES+=usr/include/c++/3.3/clocale +OLD_FILES+=usr/include/c++/3.3/cmath +OLD_FILES+=usr/include/c++/3.3/complex +OLD_FILES+=usr/include/c++/3.3/csetjmp +OLD_FILES+=usr/include/c++/3.3/csignal +OLD_FILES+=usr/include/c++/3.3/cstdarg +OLD_FILES+=usr/include/c++/3.3/cstddef +OLD_FILES+=usr/include/c++/3.3/cstdio +OLD_FILES+=usr/include/c++/3.3/cstdlib +OLD_FILES+=usr/include/c++/3.3/cstring +OLD_FILES+=usr/include/c++/3.3/ctime +OLD_FILES+=usr/include/c++/3.3/cwchar +OLD_FILES+=usr/include/c++/3.3/cwctype +OLD_FILES+=usr/include/c++/3.3/cxxabi.h +OLD_FILES+=usr/include/c++/3.3/deque +OLD_FILES+=usr/include/c++/3.3/exception +OLD_FILES+=usr/include/c++/3.3/exception_defines.h +OLD_FILES+=usr/include/c++/3.3/ext/algorithm +OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h +OLD_FILES+=usr/include/c++/3.3/ext/functional +OLD_FILES+=usr/include/c++/3.3/ext/hash_map +OLD_FILES+=usr/include/c++/3.3/ext/hash_set +OLD_FILES+=usr/include/c++/3.3/ext/iterator +OLD_FILES+=usr/include/c++/3.3/ext/memory +OLD_FILES+=usr/include/c++/3.3/ext/numeric +OLD_FILES+=usr/include/c++/3.3/ext/rb_tree +OLD_FILES+=usr/include/c++/3.3/ext/rope +OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h +OLD_FILES+=usr/include/c++/3.3/ext/slist +OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h +OLD_DIRS+=usr/include/c++/3.3/ext +OLD_FILES+=usr/include/c++/3.3/fstream +OLD_FILES+=usr/include/c++/3.3/functional +OLD_FILES+=usr/include/c++/3.3/iomanip +OLD_FILES+=usr/include/c++/3.3/ios +OLD_FILES+=usr/include/c++/3.3/iosfwd +OLD_FILES+=usr/include/c++/3.3/iostream +OLD_FILES+=usr/include/c++/3.3/istream +OLD_FILES+=usr/include/c++/3.3/iterator +OLD_FILES+=usr/include/c++/3.3/limits +OLD_FILES+=usr/include/c++/3.3/list +OLD_FILES+=usr/include/c++/3.3/locale +OLD_FILES+=usr/include/c++/3.3/map +OLD_FILES+=usr/include/c++/3.3/memory +OLD_FILES+=usr/include/c++/3.3/new +OLD_FILES+=usr/include/c++/3.3/numeric +OLD_FILES+=usr/include/c++/3.3/ostream +OLD_FILES+=usr/include/c++/3.3/queue +OLD_FILES+=usr/include/c++/3.3/set +OLD_FILES+=usr/include/c++/3.3/sstream +OLD_FILES+=usr/include/c++/3.3/stack +OLD_FILES+=usr/include/c++/3.3/stdexcept +OLD_FILES+=usr/include/c++/3.3/streambuf +OLD_FILES+=usr/include/c++/3.3/string +OLD_FILES+=usr/include/c++/3.3/typeinfo +OLD_FILES+=usr/include/c++/3.3/utility +OLD_FILES+=usr/include/c++/3.3/valarray +OLD_FILES+=usr/include/c++/3.3/vector # 20040713: fla(4) removed. OLD_FILES+=usr/share/man/man4/fla.4.gz # 200407XX Modified: projects/bmake/UPDATING ============================================================================== --- projects/bmake/UPDATING Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/UPDATING Wed Nov 19 01:07:58 2014 (r274683) @@ -31,6 +31,57 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141109: + faith(4) and faithd(8) has been removed from base system. It + has been obsolete for a very long time. + +20141104: + vt(4), the new console driver, is enabled by default. It brings + support for Unicode and double-width characters, as well as + support for UEFI and integration with the KMS kernel video + drivers. + + You may need to update your console settings in /etc/rc.conf, + most probably the keymap. During boot, /etc/rc.d/syscons will + indicate what you need to do. + + vt(4) still has issues and lacks some features compared to + syscons(4). See the wiki for up-to-date information: + https://wiki.freebsd.org/Newcons + + If you want to keep using syscons(4), you can do so by adding + the following line to /boot/loader.conf: + kern.vty=sc + +20141102: + pjdfstest has been integrated into kyua as an opt-in test suite. + Please see share/doc/pjdfstest/README for a more details on how to + execute it. + +20141009: + gperf has been removed from the base system for architectures + that use clang. Ports that require gperf will obtain it from the + devel/gperf port. + +20140923: + pjdfstest has been moved from tools/regression/pjdfstest to + contrib/pjdfstest . + +20140922: + At svn r271982, The default linux compat kernel ABI has been adjusted + to 2.6.18 in support of the linux-c6 compat ports infrastructure + update. If you wish to continue using the linux-f10 compat ports, + add compat.linux.osrelease=2.6.16 to your local sysctl.conf. Users are + encouraged to update their linux-compat packages to linux-c6 during + their next update cycle. + +20140729: + The ofwfb driver, used to provide a graphics console on PowerPC when + using vt(4), no longer allows mmap() of all of physical memory. This + will prevent Xorg on PowerPC with some ATI graphics cards from + initializing properly unless x11-servers/xorg-server is updated to + 1.12.4_8 or newer. + 20140723: The xdev targets have been converted to using TARGET and TARGET_ARCH instead of XDEV and XDEV_ARCH. @@ -786,8 +837,8 @@ COMMON ITEMS: 2.) update the ZFS boot block on your boot drive The following example updates the ZFS boot block on the first - partition (freebsd-boot) of a GPT partitioned drive ad0: - "gpart bootcode -p /boot/gptzfsboot -i 1 ad0" + partition (freebsd-boot) of a GPT partitioned drive ada0: + "gpart bootcode -p /boot/gptzfsboot -i 1 ada0" Non-boot pools do not need these updates. Modified: projects/bmake/bin/csh/Makefile ============================================================================== --- projects/bmake/bin/csh/Makefile Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/bin/csh/Makefile Wed Nov 19 01:07:58 2014 (r274683) @@ -94,7 +94,7 @@ GENHDRS+= iconv.h SRCS+= iconv_stub.c iconv.h: ${.CURDIR}/iconv_stub.h - cp ${.CURDIR}/iconv_stub.h ${.TARGET} + cp -f ${.CURDIR}/iconv_stub.h ${.TARGET} .endif .endif Modified: projects/bmake/bin/date/tests/Makefile ============================================================================== --- projects/bmake/bin/date/tests/Makefile Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/bin/date/tests/Makefile Wed Nov 19 01:07:58 2014 (r274683) @@ -4,6 +4,6 @@ TESTSDIR= ${TESTSBASE}/bin/date -TAP_TESTS_SH= legacy_test +ATF_TESTS_SH= format_string_test .include Copied: projects/bmake/bin/date/tests/format_string_test.sh (from r274682, head/bin/date/tests/format_string_test.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/bin/date/tests/format_string_test.sh Wed Nov 19 01:07:58 2014 (r274683, copy of r274682, head/bin/date/tests/format_string_test.sh) @@ -0,0 +1,92 @@ +# +# Regression tests for date(1) +# +# Submitted by Edwin Groothuis +# +# $FreeBSD$ +# + +# +# These two date/times have been chosen carefully -- they +# create both the single digit and double/multidigit version of +# the values. +# +# To create a new one, make sure you are using the UTC timezone! +# + +TEST1=3222243 # 1970-02-07 07:04:03 +TEST2=1005600000 # 2001-11-12 21:11:12 + +check() +{ + local format_string exp_output_1 exp_output_2 + + format_string=${1} + exp_output_1=${2} + exp_output_2=${3} + + atf_check -o "inline:${exp_output_1}\n" \ + date -r ${TEST1} +%${format_string} + atf_check -o "inline:${exp_output_2}\n" \ + date -r ${TEST2} +%${format_string} +} + +format_string_test() +{ + local desc exp_output_1 exp_output_2 flag + + desc=${1} + flag=${2} + exp_output_1=${3} + exp_output_2=${4} + + atf_test_case ${desc}_test + eval " +${desc}_test_body() { + check ${flag} '${exp_output_1}' '${exp_output_2}'; +}" + atf_add_test_case ${desc}_test +} + +atf_init_test_cases() +{ + format_string_test A A Saturday Monday + format_string_test a a Sat Mon + format_string_test B B February November + format_string_test b b Feb Nov + format_string_test C C 19 20 + format_string_test c c "Sat Feb 7 07:04:03 1970" "Mon Nov 12 21:20:00 2001" + format_string_test D D 02/07/70 11/12/01 + format_string_test d d 07 12 + format_string_test e e " 7" 12 + format_string_test F F "1970-02-07" "2001-11-12" + format_string_test G G 1970 2001 + format_string_test g g 70 01 + format_string_test H H 07 21 + format_string_test h h Feb Nov + format_string_test I I 07 09 + format_string_test j j 038 316 + format_string_test k k " 7" 21 + format_string_test l l " 7" " 9" + format_string_test M M 04 20 + format_string_test m m 02 11 + format_string_test p p AM PM + format_string_test R R 07:04 21:20 + format_string_test r r "07:04:03 AM" "09:20:00 PM" + format_string_test S S 03 00 + format_string_test s s ${TEST1} ${TEST2} + format_string_test U U 05 45 + format_string_test u u 6 1 + format_string_test V V 06 46 + format_string_test v v " 7-Feb-1970" "12-Nov-2001" + format_string_test W W 05 46 + format_string_test w w 6 1 + format_string_test X X "07:04:03" "21:20:00" + format_string_test x x "02/07/70" "11/12/01" + format_string_test Y Y 1970 2001 + format_string_test y y 70 01 + format_string_test Z Z UTC UTC + format_string_test z z +0000 +0000 + format_string_test percent % % % + format_string_test plus + "Sat Feb 7 07:04:03 UTC 1970" "Mon Nov 12 21:20:00 UTC 2001" +} Modified: projects/bmake/bin/dd/dd.1 ============================================================================== --- projects/bmake/bin/dd/dd.1 Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/bin/dd/dd.1 Wed Nov 19 01:07:58 2014 (r274683) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd April 2, 2014 +.Dd August 28, 2014 .Dt DD 1 .Os .Sh NAME @@ -408,6 +408,11 @@ To create an image of a Mode-1 CD-ROM, w for data CD-ROM disks, use a block size of 2048 bytes: .Pp .Dl "dd if=/dev/acd0 of=filename.iso bs=2048" +.Pp +Write a filesystem image to a memory stick, padding the end with zeros, +if necessary, to a 1MiB boundary: +.Pp +.Dl "dd if=memstick.img of=/dev/da0 bs=1m conv=noerror,sync" .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , Modified: projects/bmake/bin/df/Makefile ============================================================================== --- projects/bmake/bin/df/Makefile Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/bin/df/Makefile Wed Nov 19 01:07:58 2014 (r274683) @@ -9,7 +9,7 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBUTIL} ${LIBXO} +LDADD= -lutil -lxo .include Modified: projects/bmake/bin/df/df.1 ============================================================================== --- projects/bmake/bin/df/df.1 Wed Nov 19 00:44:21 2014 (r274682) +++ projects/bmake/bin/df/df.1 Wed Nov 19 01:07:58 2014 (r274683) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd January 16, 2014 +.Dd November 6, 2014 .Dt DF 1 .Os .Sh NAME @@ -37,6 +37,7 @@ .Nd display free disk space .Sh SYNOPSIS .Nm +.Op Fl -libxo .Op Fl b | g | H | h | k | m | P .Op Fl acilnT .Op Fl \&, @@ -193,7 +194,9 @@ If the value is outside, it will be set .Xr statfs 2 , .Xr getbsize 3 , .Xr getmntinfo 3 , +.Xr libxo 3 , .Xr localeconv 3 , +.Xr xo_parse_args 3 , .Xr fstab 5 , .Xr mount 8 , *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 05:43:32 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CE2594E; Wed, 19 Nov 2014 05:43:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69C2FDE7; Wed, 19 Nov 2014 05:43:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ5hWWH009432; Wed, 19 Nov 2014 05:43:32 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ5hW8S009431; Wed, 19 Nov 2014 05:43:32 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411190543.sAJ5hW8S009431@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 05:43:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274685 - projects/sendfile/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 05:43:32 -0000 Author: glebius Date: Wed Nov 19 05:43:31 2014 New Revision: 274685 URL: https://svnweb.freebsd.org/changeset/base/274685 Log: In tcp_usr_send() if the pcb appears to be dropped, avoid freeing M_NOTREADY mbufs. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/netinet/tcp_usrreq.c Modified: projects/sendfile/sys/netinet/tcp_usrreq.c ============================================================================== --- projects/sendfile/sys/netinet/tcp_usrreq.c Wed Nov 19 05:38:45 2014 (r274684) +++ projects/sendfile/sys/netinet/tcp_usrreq.c Wed Nov 19 05:43:31 2014 (r274685) @@ -821,7 +821,11 @@ tcp_usr_send(struct socket *so, int flag if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) { if (control) m_freem(control); - if (m) + /* + * In case of PRUS_NOTREADY, tcp_usr_ready() is responsible + * for freeing memory. + */ + if (m && (flags & PRUS_NOTREADY) == 0) m_freem(m); error = ECONNRESET; goto out; From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 05:46:29 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAA8DA5A; Wed, 19 Nov 2014 05:46:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C737BDF6; Wed, 19 Nov 2014 05:46:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ5kSD6009886; Wed, 19 Nov 2014 05:46:28 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ5kS4m009883; Wed, 19 Nov 2014 05:46:28 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411190546.sAJ5kS4m009883@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 05:46:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274686 - in projects/sendfile/sys: kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 05:46:29 -0000 Author: glebius Date: Wed Nov 19 05:46:27 2014 New Revision: 274686 URL: https://svnweb.freebsd.org/changeset/base/274686 Log: Revert M_SBCUT changes, the flag isn't actually needed. If sf_iodone() does soisdisconnected() in case of I/O error, then PCB would be marked dropped and if any more I/Os are pending on this socket, they will free their mbufs in tcp_usr_ready(). Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_sockbuf.c projects/sendfile/sys/kern/uipc_syscalls.c projects/sendfile/sys/sys/sockbuf.h Modified: projects/sendfile/sys/kern/uipc_sockbuf.c ============================================================================== --- projects/sendfile/sys/kern/uipc_sockbuf.c Wed Nov 19 05:43:31 2014 (r274685) +++ projects/sendfile/sys/kern/uipc_sockbuf.c Wed Nov 19 05:46:27 2014 (r274686) @@ -77,21 +77,6 @@ sbready(struct sockbuf *sb, struct mbuf u_int blocker; SOCKBUF_LOCK_ASSERT(sb); - - if (m->m_flags & M_SBCUT) { - /* - * Oops, something bad happened to the socket buffer while - * we were working on the data. Our mbufs are detached from - * the sockbuf, and all what we can do is free them. - */ - for (int i = 0; i < count; i++) { - KASSERT(m->m_flags & M_SBCUT, - ("%s: m %p !M_SBCUT", __func__, m)); - m = m_free(m); - } - return (EPIPE); - } - KASSERT(sb->sb_fnrdy != NULL, ("%s: sb %p NULL fnrdy", __func__, sb)); blocker = (sb->sb_fnrdy == m) ? M_BLOCKED : 0; @@ -1032,7 +1017,7 @@ sbflush(struct sockbuf *sb) static struct mbuf * sbcut_internal(struct sockbuf *sb, int len) { - struct mbuf *m, *n, *next, *mfree; + struct mbuf *m, *next, *mfree; next = (m = sb->sb_mb) ? m->m_nextpkt : 0; mfree = NULL; @@ -1058,14 +1043,20 @@ sbcut_internal(struct sockbuf *sb, int l } len -= m->m_len; sbfree(sb, m); - n = m->m_next; + /* + * Do not put M_NOTREADY buffers to the free list, they + * are referenced from outside. + */ if (m->m_flags & M_NOTREADY) - m->m_flags |= M_SBCUT; + m = m->m_next; else { + struct mbuf *n; + + n = m->m_next; m->m_next = mfree; mfree = m; + m = n; } - m = n; } if (m) { sb->sb_mb = m; Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Wed Nov 19 05:43:31 2014 (r274685) +++ projects/sendfile/sys/kern/uipc_syscalls.c Wed Nov 19 05:46:27 2014 (r274686) @@ -2092,10 +2092,8 @@ sf_iodone(void *arg, vm_page_t *pg, int * for read, so that application receives EIO on next * syscall and eventually closes the socket. */ - SOCKBUF_LOCK(&(so)->so_snd); - sbflush_locked(&so->so_snd); so->so_error = EIO; - sowakeup((so), &(so)->so_snd); + soisdisconnected(so); m = sfio->m; for (int i = 0; i < sfio->npages; i++) Modified: projects/sendfile/sys/sys/sockbuf.h ============================================================================== --- projects/sendfile/sys/sys/sockbuf.h Wed Nov 19 05:43:31 2014 (r274685) +++ projects/sendfile/sys/sys/sockbuf.h Wed Nov 19 05:46:27 2014 (r274686) @@ -128,7 +128,6 @@ struct sockbuf { #define M_NOTREADY M_PROTO1 /* m_data not populated yet */ #define M_BLOCKED M_PROTO2 /* M_NOTREADY in front of m */ #define M_NOTAVAIL (M_NOTREADY | M_BLOCKED) -#define M_SBCUT M_PROTO3 /* mbuf was sbcut out */ void sbappend(struct sockbuf *sb, struct mbuf *m); void sbappend_locked(struct sockbuf *sb, struct mbuf *m); From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 05:58:35 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B5AADB5; Wed, 19 Nov 2014 05:58:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67D97EFD; Wed, 19 Nov 2014 05:58:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ5wZ7c014702; Wed, 19 Nov 2014 05:58:35 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ5wZGQ014701; Wed, 19 Nov 2014 05:58:35 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411190558.sAJ5wZGQ014701@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 05:58:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274687 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 05:58:35 -0000 Author: glebius Date: Wed Nov 19 05:58:34 2014 New Revision: 274687 URL: https://svnweb.freebsd.org/changeset/base/274687 Log: Set B_ASYNC on asynchronous buf. Submitted by: kib Modified: projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 05:46:27 2014 (r274686) +++ projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 05:58:34 2014 (r274687) @@ -1028,6 +1028,7 @@ vnode_pager_generic_getpages(struct vnod bp->b_iodone = vnode_pager_generic_getpages_done_async; bp->b_caller1 = d; + bp->b_flags |= B_ASYNC; BUF_KERNPROC(bp); bstrategy(bp); /* Good bye! */ From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 06:13:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BFEA222; Wed, 19 Nov 2014 06:13:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6D029F3; Wed, 19 Nov 2014 06:13:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ6Du4G023515; Wed, 19 Nov 2014 06:13:56 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ6DuCS023513; Wed, 19 Nov 2014 06:13:56 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411190613.sAJ6DuCS023513@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 06:13:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274688 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 06:13:56 -0000 Author: glebius Date: Wed Nov 19 06:13:55 2014 New Revision: 274688 URL: https://svnweb.freebsd.org/changeset/base/274688 Log: Provide emulation of asynchronous operation in swap_pager.c itself, not in the vm_pager.h inliner. Suggested by: kib Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/vm/swap_pager.c projects/sendfile/sys/vm/vm_pager.h Modified: projects/sendfile/sys/vm/swap_pager.c ============================================================================== --- projects/sendfile/sys/vm/swap_pager.c Wed Nov 19 05:58:34 2014 (r274687) +++ projects/sendfile/sys/vm/swap_pager.c Wed Nov 19 06:13:55 2014 (r274688) @@ -361,6 +361,8 @@ static vm_object_t vm_prot_t prot, vm_ooffset_t offset, struct ucred *); static void swap_pager_dealloc(vm_object_t object); static int swap_pager_getpages(vm_object_t, vm_page_t *, int, int); +static int swap_pager_getpages_async(vm_object_t, vm_page_t *, int, int, + void(*)(void *, vm_page_t *, int, int), void *); static void swap_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *); static boolean_t swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, int *after); @@ -373,6 +375,7 @@ struct pagerops swappagerops = { .pgo_alloc = swap_pager_alloc, /* allocate an OBJT_SWAP object */ .pgo_dealloc = swap_pager_dealloc, /* deallocate an OBJT_SWAP object */ .pgo_getpages = swap_pager_getpages, /* pagein */ + .pgo_getpages_async = swap_pager_getpages_async, /* pagein (async) */ .pgo_putpages = swap_pager_putpages, /* pageout */ .pgo_haspage = swap_pager_haspage, /* get backing store status for page */ .pgo_pageunswapped = swap_pager_unswapped, /* remove swap related to page */ @@ -1257,6 +1260,26 @@ swap_pager_getpages(vm_object_t object, } /* + * swap_pager_getpages_async(): + * + * Right now this is emulation of asynchronous operation on top of + * swap_pager_getpages(). + */ +static int +swap_pager_getpages_async(vm_object_t object, vm_page_t *m, int count, + int reqpage, void(*iodone)(void *, vm_page_t *, int, int), void *arg) +{ + int r; + + r = swap_pager_getpages(object, m, count, reqpage); + VM_OBJECT_WUNLOCK(object); + (iodone)(arg, m, count, r); + VM_OBJECT_WLOCK(object); + + return (r); +} + +/* * swap_pager_putpages: * * Assign swap (if necessary) and initiate I/O on the specified pages. Modified: projects/sendfile/sys/vm/vm_pager.h ============================================================================== --- projects/sendfile/sys/vm/vm_pager.h Wed Nov 19 05:58:34 2014 (r274687) +++ projects/sendfile/sys/vm/vm_pager.h Wed Nov 19 06:13:55 2014 (r274688) @@ -145,17 +145,8 @@ vm_pager_get_pages_async(vm_object_t obj int r; VM_OBJECT_ASSERT_WLOCKED(object); - - if (*pagertab[object->type]->pgo_getpages_async == NULL) { - /* Emulate async operation. */ - r = vm_pager_get_pages(object, m, count, reqpage); - VM_OBJECT_WUNLOCK(object); - (iodone)(arg, m, count, r); - VM_OBJECT_WLOCK(object); - } else - r = (*pagertab[object->type]->pgo_getpages_async)(object, m, - count, reqpage, iodone, arg); - + r = (*pagertab[object->type]->pgo_getpages_async)(object, m, count, + reqpage, iodone, arg); return (r); } From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 06:14:55 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5F2C3E3; Wed, 19 Nov 2014 06:14:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2A5CFD; Wed, 19 Nov 2014 06:14:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ6EtiL023692; Wed, 19 Nov 2014 06:14:55 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ6EtfV023690; Wed, 19 Nov 2014 06:14:55 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411190614.sAJ6EtfV023690@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 06:14:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274689 - in projects/sendfile/sys: kern vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 06:14:55 -0000 Author: glebius Date: Wed Nov 19 06:14:54 2014 New Revision: 274689 URL: https://svnweb.freebsd.org/changeset/base/274689 Log: Make the iodone callback responsible on unbusying the reqpage. Suggested by: kib Sponsored by: Nginx, Inc. Sponsored by: Netflix Modified: projects/sendfile/sys/kern/uipc_syscalls.c projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Wed Nov 19 06:13:55 2014 (r274688) +++ projects/sendfile/sys/kern/uipc_syscalls.c Wed Nov 19 06:14:54 2014 (r274689) @@ -2070,8 +2070,11 @@ sf_iodone(void *arg, vm_page_t *pg, int struct sf_io *sfio = arg; struct socket *so; - if (error) - sfio->error = error; + if (pg) { + vm_page_xunbusy(pg[reqpage]); + if (error) + sfio->error = error; + } if (!refcount_release(&sfio->nios)) return; Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 06:13:55 2014 (r274688) +++ projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 06:14:54 2014 (r274689) @@ -1061,7 +1061,6 @@ vnode_pager_generic_getpages_done_async( int error; error = vnode_pager_generic_getpages_done(d); - vm_page_xunbusy(d->m[d->reqpage]); d->iodone(d->arg, d->m, d->reqpage, error); free(d, M_TEMP); } From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 06:37:29 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0E04C8D1; Wed, 19 Nov 2014 06:37:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA6BC306; Wed, 19 Nov 2014 06:37:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ6bSMG033851; Wed, 19 Nov 2014 06:37:28 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ6bJDV033746; Wed, 19 Nov 2014 06:37:19 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411190637.sAJ6bJDV033746@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 06:37:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274690 - in projects/sendfile: . cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/tools/ctf/cvt contrib/libxo contrib/libxo/libxo contrib/libxo/xolint contrib/net... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 06:37:29 -0000 Author: glebius Date: Wed Nov 19 06:37:18 2014 New Revision: 274690 URL: https://svnweb.freebsd.org/changeset/base/274690 Log: Merge head r258543 through r274689. Added: projects/sendfile/lib/libc/tests/gen/arc4random_test.c - copied unchanged from r274689, head/lib/libc/tests/gen/arc4random_test.c projects/sendfile/lib/libc/tests/gen/fpclassify2_test.c - copied unchanged from r274689, head/lib/libc/tests/gen/fpclassify2_test.c projects/sendfile/lib/libc/tests/stdio/fmemopen2_test.c - copied unchanged from r274689, head/lib/libc/tests/stdio/fmemopen2_test.c projects/sendfile/lib/librt/Makefile.amd64 - copied unchanged from r274689, head/lib/librt/Makefile.amd64 projects/sendfile/lib/librt/Makefile.i386 - copied unchanged from r274689, head/lib/librt/Makefile.i386 projects/sendfile/lib/librt/tests/ - copied from r274689, head/lib/librt/tests/ projects/sendfile/lib/libthr/Makefile.amd64 - copied unchanged from r274689, head/lib/libthr/Makefile.amd64 projects/sendfile/lib/libthr/Makefile.i386 - copied unchanged from r274689, head/lib/libthr/Makefile.i386 projects/sendfile/lib/libthr/tests/ - copied from r274689, head/lib/libthr/tests/ projects/sendfile/lib/msun/Makefile.amd64 - copied unchanged from r274689, head/lib/msun/Makefile.amd64 projects/sendfile/lib/msun/Makefile.i386 - copied unchanged from r274689, head/lib/msun/Makefile.i386 projects/sendfile/lib/msun/tests/ - copied from r274689, head/lib/msun/tests/ projects/sendfile/sys/dev/altera/pio/ - copied from r274689, head/sys/dev/altera/pio/ projects/sendfile/sys/dev/virtio/mmio/ - copied from r274689, head/sys/dev/virtio/mmio/ projects/sendfile/tools/build/options/WITHOUT_INCLUDES - copied unchanged from r274689, head/tools/build/options/WITHOUT_INCLUDES projects/sendfile/tools/build/options/WITHOUT_TESTS_SUPPORT - copied unchanged from r274689, head/tools/build/options/WITHOUT_TESTS_SUPPORT projects/sendfile/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES - copied unchanged from r274689, head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES projects/sendfile/usr.sbin/pw/tests/pw_lock.sh - copied unchanged from r274689, head/usr.sbin/pw/tests/pw_lock.sh Deleted: projects/sendfile/tools/regression/lib/libc/gen/test-arc4random.c projects/sendfile/tools/regression/lib/libc/gen/test-fpclassify.c projects/sendfile/tools/regression/lib/libc/stdio/test-fmemopen.c Modified: projects/sendfile/MAINTAINERS (contents, props changed) projects/sendfile/Makefile.inc1 projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c projects/sendfile/contrib/libxo/configure.ac projects/sendfile/contrib/libxo/libxo/libxo.c projects/sendfile/contrib/libxo/libxo/xoconfig.h projects/sendfile/contrib/libxo/libxo/xoversion.h projects/sendfile/contrib/libxo/xolint/xolint.pl projects/sendfile/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_glob.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_nice.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_raise.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_time.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c projects/sendfile/contrib/netbsd-tests/lib/libc/regex/debug.c projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c projects/sendfile/contrib/netbsd-tests/lib/libc/string/t_memcpy.c projects/sendfile/contrib/netbsd-tests/lib/libc/string/t_strerror.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_access.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_clock_gettime.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getgroups.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_listen.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_pipe2.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_poll.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_revoke.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_stat.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_unlink.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_write.c projects/sendfile/contrib/netbsd-tests/lib/libc/time/t_strptime.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/dso/h_tls_dlopen.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/t_tls_dlopen.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/t_tls_dynamic.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/t_tls_static.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/t_tls_static_helper.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls_dso/h_tls_dynamic.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_cbrt.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_exp.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_pow.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_precision.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_scalbn.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/h_atexit.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/h_cancel.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_condwait.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_detach.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_fork.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_join.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_once.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_sem.c projects/sendfile/contrib/netbsd-tests/lib/librt/t_sem.c projects/sendfile/contrib/tzdata/africa projects/sendfile/contrib/tzdata/asia projects/sendfile/contrib/tzdata/australasia projects/sendfile/contrib/tzdata/europe projects/sendfile/contrib/tzdata/northamerica projects/sendfile/contrib/tzdata/southamerica projects/sendfile/etc/devd/apple.conf projects/sendfile/etc/mtree/BSD.tests.dist projects/sendfile/lib/libc/tests/gen/Makefile projects/sendfile/lib/libc/tests/stdio/Makefile projects/sendfile/lib/librt/Makefile projects/sendfile/lib/libthr/Makefile projects/sendfile/lib/msun/Makefile projects/sendfile/sbin/geom/core/geom.c projects/sendfile/sbin/reboot/boot_i386.8 projects/sendfile/sbin/route/route.c projects/sendfile/share/man/man4/acpi.4 projects/sendfile/share/man/man4/rsu.4 projects/sendfile/share/mk/bsd.incs.mk projects/sendfile/share/mk/bsd.opts.mk projects/sendfile/share/mk/src.opts.mk projects/sendfile/sys/amd64/amd64/pmap.c projects/sendfile/sys/amd64/amd64/support.S projects/sendfile/sys/arm/allwinner/a10_gpio.c projects/sendfile/sys/arm/arm/busdma_machdep-v6.c projects/sendfile/sys/arm/arm/stdatomic.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/sendfile/sys/arm/freescale/imx/imx_common.c projects/sendfile/sys/arm/freescale/imx/imx_gpio.c projects/sendfile/sys/arm/freescale/imx/imx_i2c.c projects/sendfile/sys/arm/freescale/vybrid/vf_gpio.c projects/sendfile/sys/arm/include/asmacros.h projects/sendfile/sys/arm/mv/mv_common.c projects/sendfile/sys/arm/rockchip/rk30xx_gpio.c projects/sendfile/sys/arm/samsung/exynos/exynos5_pad.c projects/sendfile/sys/arm/ti/ti_common.c projects/sendfile/sys/arm/ti/ti_gpio.c projects/sendfile/sys/arm/ti/ti_i2c.c projects/sendfile/sys/arm/versatile/versatile_common.c projects/sendfile/sys/arm/versatile/versatile_machdep.c projects/sendfile/sys/arm/xilinx/uart_dev_cdnc.c projects/sendfile/sys/arm/xilinx/zy7_machdep.c projects/sendfile/sys/arm/xscale/ixp425/avila_gpio.c projects/sendfile/sys/arm/xscale/ixp425/cambria_gpio.c projects/sendfile/sys/boot/ficl/amd64/sysdep.c projects/sendfile/sys/boot/ficl/arm/sysdep.c projects/sendfile/sys/boot/ficl/i386/sysdep.c projects/sendfile/sys/boot/ficl/mips/sysdep.c projects/sendfile/sys/boot/ficl/mips64/sysdep.c projects/sendfile/sys/boot/ficl/powerpc/sysdep.c projects/sendfile/sys/boot/ficl/sparc64/sysdep.c projects/sendfile/sys/boot/pc98/loader/conf.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/sendfile/sys/conf/files projects/sendfile/sys/conf/kern.opts.mk projects/sendfile/sys/conf/newvers.sh projects/sendfile/sys/dev/ath/if_ath.c projects/sendfile/sys/dev/drm2/radeon/radeon_connectors.c projects/sendfile/sys/dev/gpio/gpio_if.m projects/sendfile/sys/dev/gpio/gpiobus.c projects/sendfile/sys/dev/gpio/gpiobusvar.h projects/sendfile/sys/dev/gpio/gpioc.c projects/sendfile/sys/dev/gpio/ofw_gpiobus.c projects/sendfile/sys/dev/iicbus/iicbus.c projects/sendfile/sys/dev/iicbus/iicbus.h projects/sendfile/sys/dev/iicbus/iicbus_if.m projects/sendfile/sys/dev/isp/isp_freebsd.c projects/sendfile/sys/dev/isp/isp_freebsd.h projects/sendfile/sys/dev/ixgbe/ixgbe.c projects/sendfile/sys/dev/mcd/mcd.c projects/sendfile/sys/dev/mcd/mcd_isa.c projects/sendfile/sys/dev/mcd/mcdvar.h projects/sendfile/sys/dev/mly/mly.c projects/sendfile/sys/dev/mly/mlyvar.h projects/sendfile/sys/dev/ofw/ofw_iicbus.c projects/sendfile/sys/dev/pccbb/pccbb.c projects/sendfile/sys/dev/pci/pci.c projects/sendfile/sys/dev/pst/pst-pci.c projects/sendfile/sys/dev/pst/pst-raid.c projects/sendfile/sys/dev/scd/scd.c projects/sendfile/sys/dev/scd/scd_isa.c projects/sendfile/sys/dev/scd/scdvar.h projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/dev/usb/wlan/if_rsu.c projects/sendfile/sys/dev/virtio/block/virtio_blk.c projects/sendfile/sys/dev/wds/wd7000.c projects/sendfile/sys/dev/xen/netback/netback.c projects/sendfile/sys/geom/part/g_part.c projects/sendfile/sys/geom/part/g_part_bsd.c projects/sendfile/sys/geom/part/g_part_if.m projects/sendfile/sys/i386/i386/pmap.c projects/sendfile/sys/i386/include/vmparam.h projects/sendfile/sys/i386/xen/locore.s projects/sendfile/sys/kern/kern_event.c projects/sendfile/sys/kern/kern_mutex.c projects/sendfile/sys/libkern/strncmp.c projects/sendfile/sys/mips/atheros/ar71xx_gpio.c projects/sendfile/sys/mips/cavium/octeon_gpio.c projects/sendfile/sys/mips/mips/stdatomic.c projects/sendfile/sys/mips/mips/trap.c projects/sendfile/sys/mips/rt305x/rt305x_gpio.c projects/sendfile/sys/modules/cxgb/tom/Makefile projects/sendfile/sys/modules/geom/geom_part/geom_part_bsd/Makefile projects/sendfile/sys/modules/if_gif/Makefile projects/sendfile/sys/modules/if_gre/Makefile projects/sendfile/sys/modules/lmc/Makefile projects/sendfile/sys/net/if.c projects/sendfile/sys/net/route.c projects/sendfile/sys/net/route.h projects/sendfile/sys/netinet/ip_output.c projects/sendfile/sys/netinet/tcp_var.h projects/sendfile/sys/netinet6/ip6_output.c projects/sendfile/sys/powerpc/wii/wii_gpio.c projects/sendfile/sys/sys/event.h projects/sendfile/sys/vm/vm_page.c projects/sendfile/sys/vm/vm_phys.c projects/sendfile/sys/vm/vm_phys.h projects/sendfile/sys/vm/vnode_pager.c projects/sendfile/sys/xen/gnttab.c projects/sendfile/tools/build/options/WITHOUT_LIB32 projects/sendfile/tools/regression/lib/libc/gen/Makefile projects/sendfile/tools/regression/lib/libc/stdio/Makefile projects/sendfile/tools/regression/zfs/zpool/add/files.t projects/sendfile/usr.bin/iscsictl/iscsictl.c projects/sendfile/usr.bin/sort/Makefile projects/sendfile/usr.sbin/autofs/auto_master.5 projects/sendfile/usr.sbin/freebsd-update/freebsd-update.sh projects/sendfile/usr.sbin/pw/tests/Makefile projects/sendfile/usr.sbin/pw/tests/pw_delete.sh projects/sendfile/usr.sbin/pw/tests/pw_etcdir.sh projects/sendfile/usr.sbin/watchdogd/watchdogd.8 projects/sendfile/usr.sbin/watchdogd/watchdogd.c projects/sendfile/usr.sbin/wpa/wpa_cli/Makefile Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/contrib/tzdata/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) Modified: projects/sendfile/MAINTAINERS ============================================================================== --- projects/sendfile/MAINTAINERS Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/MAINTAINERS Wed Nov 19 06:37:18 2014 (r274690) @@ -80,6 +80,8 @@ contrib/pf glebius Pre-commit review rec file obrien Insists to keep file blocked from other's unapproved commits contrib/bzip2 obrien Pre-commit review required. +contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. +contrib/pjdfstest freebsd-testing,ngie Pre-commit review requested. geom_concat pjd Pre-commit review preferred. geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/Makefile.inc1 Wed Nov 19 06:37:18 2014 (r274690) @@ -1455,8 +1455,23 @@ native-xtools: .MAKE mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${OBJTREE}/nxb-bin/usr/include >/dev/null .for _tool in \ + bin/cat \ + bin/chmod \ + bin/cp \ bin/csh \ + bin/echo \ + bin/expr \ + bin/hostname \ + bin/ln \ + bin/ls \ + bin/mkdir \ + bin/mv \ + bin/ps \ + bin/realpath \ + bin/rm \ + bin/rmdir \ bin/sh \ + bin/sleep \ ${_clang_tblgen} \ usr.bin/ar \ ${_binutils} \ @@ -1465,18 +1480,38 @@ native-xtools: .MAKE ${_clang_libs} \ ${_clang} \ sbin/md5 \ + sbin/sysctl \ + gnu/usr.bin/diff \ usr.bin/awk \ + usr.bin/basename \ usr.bin/bmake \ usr.bin/bzip2 \ + usr.bin/cmp \ + usr.bin/dirname \ + usr.bin/env \ usr.bin/fetch \ + usr.bin/find \ + usr.bin/grep \ usr.bin/gzip \ + usr.bin/id \ usr.bin/lex \ usr.bin/lorder \ + usr.bin/mktemp \ + usr.bin/mt \ + usr.bin/patch \ usr.bin/sed \ + usr.bin/sort \ usr.bin/tar \ + usr.bin/touch \ + usr.bin/tr \ + usr.bin/true \ + usr.bin/uniq \ usr.bin/unzip \ + usr.bin/xargs \ + usr.bin/xinstall \ usr.bin/xz \ - usr.bin/yacc + usr.bin/yacc \ + usr.sbin/chown ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${NXBMAKE} DIRPRFX=${_tool}/ obj && \ Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Wed Nov 19 06:37:18 2014 (r274690) @@ -469,7 +469,7 @@ dof_add_probe(dt_idhash_t *dhp, dt_ident * locally so an alternate symbol is added for the purpose * of this relocation. */ - if (pip->pi_rname[0] == '\0') + if (pip->pi_rname == NULL) dofr.dofr_name = dofpr.dofpr_func; else dofr.dofr_name = dof_add_string(ddo, pip->pi_rname); Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Wed Nov 19 06:37:18 2014 (r274690) @@ -520,6 +520,8 @@ dt_probe_destroy(dt_probe_t *prp) for (pip = prp->pr_inst; pip != NULL; pip = pip_next) { pip_next = pip->pi_next; + dt_free(dtp, pip->pi_rname); + dt_free(dtp, pip->pi_fname); dt_free(dtp, pip->pi_offs); dt_free(dtp, pip->pi_enoffs); dt_free(dtp, pip); @@ -552,28 +554,18 @@ dt_probe_define(dt_provider_t *pvp, dt_p if ((pip = dt_zalloc(dtp, sizeof (*pip))) == NULL) return (-1); - if ((pip->pi_offs = dt_zalloc(dtp, - sizeof (uint32_t))) == NULL) { - dt_free(dtp, pip); - return (-1); - } + if ((pip->pi_offs = dt_zalloc(dtp, sizeof (uint32_t))) == NULL) + goto nomem; if ((pip->pi_enoffs = dt_zalloc(dtp, - sizeof (uint32_t))) == NULL) { - dt_free(dtp, pip->pi_offs); - dt_free(dtp, pip); - return (-1); - } + sizeof (uint32_t))) == NULL) + goto nomem; - (void) strlcpy(pip->pi_fname, fname, sizeof (pip->pi_fname)); - if (rname != NULL) { - if (strlen(rname) + 1 > sizeof (pip->pi_rname)) { - dt_free(dtp, pip->pi_offs); - dt_free(dtp, pip); - return (dt_set_errno(dtp, EDT_COMPILER)); - } - (void) strcpy(pip->pi_rname, rname); - } + if ((pip->pi_fname = strdup(fname)) == NULL) + goto nomem; + + if (rname != NULL && (pip->pi_rname = strdup(rname)) == NULL) + goto nomem; pip->pi_noffs = 0; pip->pi_maxoffs = 1; @@ -618,6 +610,13 @@ dt_probe_define(dt_provider_t *pvp, dt_p (*offs)[(*noffs)++] = offset; return (0); + +nomem: + dt_free(dtp, pip->pi_fname); + dt_free(dtp, pip->pi_enoffs); + dt_free(dtp, pip->pi_offs); + dt_free(dtp, pip); + return (dt_set_errno(dtp, EDT_NOMEM)); } /* Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h Wed Nov 19 06:37:18 2014 (r274690) @@ -64,8 +64,8 @@ typedef struct dt_probe_iter { } dt_probe_iter_t; typedef struct dt_probe_instance { - char pi_fname[DTRACE_FUNCNAMELEN]; /* function name */ - char pi_rname[DTRACE_FUNCNAMELEN + 20]; /* mangled relocation name */ + char *pi_fname; /* function name */ + char *pi_rname; /* mangled relocation name */ uint32_t *pi_offs; /* offsets into the function */ uint32_t *pi_enoffs; /* is-enabled offsets */ uint_t pi_noffs; /* number of offsets */ Modified: projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Wed Nov 19 06:37:18 2014 (r274690) @@ -766,7 +766,8 @@ die_array_resolve(tdesc_t *tdp, tdesc_t debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id, tdp->t_ardef->ad_contents->t_id); - if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0) { + if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 && + (tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) { debug(3, "unable to resolve array %s (%d) contents %d\n", tdesc_name(tdp), tdp->t_id, tdp->t_ardef->ad_contents->t_id); @@ -1138,12 +1139,17 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t ** /* * For empty members, or GCC/C99 flexible array - * members, a size of 0 is correct. + * members, a size of 0 is correct. Structs and unions + * consisting of flexible array members will also have + * size 0. */ if (mt->t_members == NULL) continue; if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0) continue; + if ((mt->t_flags & TDESC_F_RESOLVED) != 0 && + (mt->t_type == STRUCT || mt->t_type == UNION)) + continue; dw->dw_nunres++; return (1); Modified: projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Wed Nov 19 06:37:18 2014 (r274690) @@ -287,19 +287,11 @@ equiv_su(tdesc_t *stdp, tdesc_t *ttdp, e while (ml1 && ml2) { if (ml1->ml_offset != ml2->ml_offset || - strcmp(ml1->ml_name, ml2->ml_name) != 0) + strcmp(ml1->ml_name, ml2->ml_name) != 0 || + ml1->ml_size != ml2->ml_size || + !equiv_node(ml1->ml_type, ml2->ml_type, ed)) return (0); - /* - * Don't do the recursive equivalency checking more than - * we have to. - */ - if (olm1 == NULL || olm1->ml_type->t_id != ml1->ml_type->t_id) { - if (ml1->ml_size != ml2->ml_size || - !equiv_node(ml1->ml_type, ml2->ml_type, ed)) - return (0); - } - olm1 = ml1; ml1 = ml1->ml_next; ml2 = ml2->ml_next; @@ -357,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; - if (ctdp->t_emark > ed->ed_clear_mark || + if (ctdp->t_emark > ed->ed_clear_mark && mtdp->t_emark > ed->ed_clear_mark) return (ctdp->t_emark == mtdp->t_emark); Modified: projects/sendfile/contrib/libxo/configure.ac ============================================================================== --- projects/sendfile/contrib/libxo/configure.ac Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/configure.ac Wed Nov 19 06:37:18 2014 (r274690) @@ -12,7 +12,7 @@ # AC_PREREQ(2.2) -AC_INIT([libxo], [0.1.5], [phil@juniper.net]) +AC_INIT([libxo], [0.1.6], [phil@juniper.net]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) # Support silent build rules. Requires at least automake-1.11. Modified: projects/sendfile/contrib/libxo/libxo/libxo.c ============================================================================== --- projects/sendfile/contrib/libxo/libxo/libxo.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/libxo/libxo.c Wed Nov 19 06:37:18 2014 (r274690) @@ -317,7 +317,7 @@ xo_init_handle (xo_handle_t *xop) cp = getenv("LC_ALL"); if (cp == NULL) cp = "UTF-8"; /* Optimistic? */ - cp = setlocale(LC_CTYPE, cp); + (void) setlocale(LC_CTYPE, cp); } /* @@ -607,8 +607,10 @@ xo_vsnprintf (xo_handle_t *xop, xo_buffe rc = vsnprintf(xbp->xb_curp, left, fmt, va_local); if (rc > xbp->xb_size) { - if (!xo_buf_has_room(xbp, rc)) + if (!xo_buf_has_room(xbp, rc)) { + va_end(va_local); return -1; + } /* * After we call vsnprintf(), the stage of vap is not defined. @@ -648,8 +650,10 @@ xo_printf_v (xo_handle_t *xop, const cha rc = vsnprintf(xbp->xb_curp, left, fmt, va_local); if (rc > xbp->xb_size) { - if (!xo_buf_has_room(xbp, rc)) + if (!xo_buf_has_room(xbp, rc)) { + va_end(va_local); return -1; + } va_end(va_local); /* Reset vap to the start */ va_copy(va_local, vap); @@ -974,8 +978,10 @@ xo_warn_hcv (xo_handle_t *xop, int code, int left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp); int rc = vsnprintf(xbp->xb_curp, left, newfmt, vap); if (rc > xbp->xb_size) { - if (!xo_buf_has_room(xbp, rc)) + if (!xo_buf_has_room(xbp, rc)) { + va_end(va_local); return; + } va_end(vap); /* Reset vap to the start */ va_copy(vap, va_local); @@ -1118,8 +1124,10 @@ xo_message_hcv (xo_handle_t *xop, int co int left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp); rc = vsnprintf(xbp->xb_curp, left, fmt, vap); if (rc > xbp->xb_size) { - if (!xo_buf_has_room(xbp, rc)) + if (!xo_buf_has_room(xbp, rc)) { + va_end(va_local); return; + } va_end(vap); /* Reset vap to the start */ va_copy(vap, va_local); @@ -1154,14 +1162,15 @@ xo_message_hcv (xo_handle_t *xop, int co va_copy(va_local, vap); - rc = vsnprintf(buf, bufsiz, fmt, va_local); + rc = vsnprintf(bp, bufsiz, fmt, va_local); if (rc > bufsiz) { bufsiz = rc + BUFSIZ; bp = alloca(bufsiz); va_end(va_local); va_copy(va_local, vap); - rc = vsnprintf(buf, bufsiz, fmt, va_local); + rc = vsnprintf(bp, bufsiz, fmt, va_local); } + va_end(va_local); cp = bp + rc; if (need_nl) { @@ -1302,9 +1311,9 @@ xo_create_to_file (FILE *fp, xo_style_t * @xop XO handle to alter (or NULL for default handle) */ void -xo_destroy (xo_handle_t *xop) +xo_destroy (xo_handle_t *xop_arg) { - xop = xo_default(xop); + xo_handle_t *xop = xo_default(xop_arg); if (xop->xo_close && (xop->xo_flags & XOF_CLOSE_FP)) xop->xo_close(xop->xo_opaque); @@ -1315,7 +1324,7 @@ xo_destroy (xo_handle_t *xop) xo_buf_cleanup(&xop->xo_predicate); xo_buf_cleanup(&xop->xo_attrs); - if (xop == &xo_default_handle) { + if (xop_arg == NULL) { bzero(&xo_default_handle, sizeof(&xo_default_handle)); xo_default_inited = 0; } else @@ -1743,7 +1752,7 @@ xo_format_string_direct (xo_handle_t *xo int need_enc, int have_enc) { int cols = 0; - wchar_t wc; + wchar_t wc = 0; int ilen, olen, width; int attr = (flags & XFF_ATTR); const char *sp; Modified: projects/sendfile/contrib/libxo/libxo/xoconfig.h ============================================================================== --- projects/sendfile/contrib/libxo/libxo/xoconfig.h Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/libxo/xoconfig.h Wed Nov 19 06:37:18 2014 (r274690) @@ -158,7 +158,7 @@ #define PACKAGE_NAME "libxo" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxo 0.1.5" +#define PACKAGE_STRING "libxo 0.1.6" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libxo" @@ -167,7 +167,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.1.5" +#define PACKAGE_VERSION "0.1.6" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -181,7 +181,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.1.5" +#define VERSION "0.1.6" /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ Modified: projects/sendfile/contrib/libxo/libxo/xoversion.h ============================================================================== --- projects/sendfile/contrib/libxo/libxo/xoversion.h Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/libxo/xoversion.h Wed Nov 19 06:37:18 2014 (r274690) @@ -18,17 +18,17 @@ /** * The version string */ -#define LIBXO_VERSION "0.1.5" +#define LIBXO_VERSION "0.1.6" /** * The version number */ -#define LIBXO_VERSION_NUMBER 1004 +#define LIBXO_VERSION_NUMBER 1006 /** * The version number as a string */ -#define LIBXO_VERSION_STRING "1004" +#define LIBXO_VERSION_STRING "1006" /** * The version number extra info as a string Modified: projects/sendfile/contrib/libxo/xolint/xolint.pl ============================================================================== --- projects/sendfile/contrib/libxo/xolint/xolint.pl Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/xolint/xolint.pl Wed Nov 19 06:37:18 2014 (r274690) @@ -28,6 +28,19 @@ sub main { extract_samples() if /^-X/; } + if ($#ARGV < 0) { + print STDERR "xolint [options] files ...\n"; + print STDERR " -c invoke 'cpp' on input\n"; + print STDERR " -C flags Pass flags to cpp\n"; + print STDERR " -d Show debug output\n"; + print STDERR " -D Extract xolint documentation\n"; + print STDERR " -I Print xo_info_t data\n"; + print STDERR " -p Print input data on errors\n"; + print STDERR " -V Print vocabulary (list of tags)\n"; + print STDERR " -X Print examples of invalid use\n"; + exit(1); + } + for $file (@ARGV) { parse_file($file); } @@ -269,9 +282,9 @@ sub check_format { $last = $prev; next; } + $prev = $ch; } - $prev = $ch; $build[$phase] .= $ch; } @@ -346,18 +359,6 @@ sub check_field { info("potential missing slash after N, L, or T with format") if $field[1] =~ /%/; - #@ Format cannot be given when content is present (roles: DNLT) - #@ xo_emit("{T:Max/%6.6s}", "Max"); - #@ Fields with the D, N, L, or T roles can't have both - #@ static literal content ("{T:Title}") and a - #@ format ("{T:/%s}"). - #@ This error will also occur when the content has a backslash - #@ in it, like "{N:Type of I/O}"; backslashes should be escaped, - #@ like "{N:Type of I\\/O}". Note the double backslash, one for - #@ handling 'C' strings, and one for libxo. - error("format cannot be given when content is present") - if $field[1] && $field[2]; - #@ An encoding format cannot be given (roles: DNLT) #@ xo_emit("{T:Max//%s}", "Max"); #@ Fields with the D, N, L, and T roles are not emitted in @@ -367,6 +368,21 @@ sub check_field { if $field[3]; } + # Field is a decoration, label, or title + if ($field[0] =~ /DLN/) { + #@ Format cannot be given when content is present (roles: DLN) + #@ xo_emit("{N:Max/%6.6s}", "Max"); + #@ Fields with the D, L, or N roles can't have both + #@ static literal content ("{L:Label}") and a + #@ format ("{L:/%s}"). + #@ This error will also occur when the content has a backslash + #@ in it, like "{N:Type of I/O}"; backslashes should be escaped, + #@ like "{N:Type of I\\/O}". Note the double backslash, one for + #@ handling 'C' strings, and one for libxo. + error("format cannot be given when content is present") + if $field[1] && $field[2]; + } + # A value field if (length($field[0]) == 0 || $field[0] =~ /V/) { @@ -527,7 +543,7 @@ sub check_field_format { #@ for non-strings. This error may occur from a typo, #@ like "{:tag/%6..6d}" where only one period should be used. error("max width only valid for strings") - if $#chunks >= 2 && $fc =~ /[sS]/; + if $#chunks >= 2 && $fc !~ /[sS]/; } sub error { Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c Wed Nov 19 06:37:18 2014 (r274690) @@ -31,7 +31,7 @@ */ -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include #endif #include @@ -251,7 +251,7 @@ ATF_TC_BODY(t_spawn_open_nonexistent, tc posix_spawn_file_actions_destroy(&fa); } -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_TC(t_spawn_open_nonexistent_diag); ATF_TC_HEAD(t_spawn_open_nonexistent_diag, tc) @@ -381,7 +381,7 @@ ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, t_spawn_fileactions); ATF_TP_ADD_TC(tp, t_spawn_open_nonexistent); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_TP_ADD_TC(tp, t_spawn_open_nonexistent_diag); #endif ATF_TP_ADD_TC(tp, t_spawn_reopen); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c Wed Nov 19 06:37:18 2014 (r274690) @@ -56,7 +56,7 @@ ATF_TC_BODY(getcwd_err, tc) ATF_REQUIRE(getcwd(buf, 0) == NULL); ATF_REQUIRE(errno == EINVAL); -#if defined(__NetBSD__) +#ifdef __NetBSD__ errno = 0; ATF_REQUIRE(getcwd((void *)-1, sizeof(buf)) == NULL); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_glob.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_glob.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_glob.c Wed Nov 19 06:37:18 2014 (r274690) @@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_glob.c,v 1.3 2013/01 #include #include -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include "h_macros.h" #define __gl_stat_t struct stat #define _S_IFDIR S_IFDIR @@ -138,7 +138,7 @@ gl_readdir(void *v) dir.d_ino = dd->pos; dir.d_type = f->dir ? DT_DIR : DT_REG; DPRINTF(("readdir %s %d\n", dir.d_name, dir.d_type)); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ dir.d_reclen = -1; /* Does not have _DIRENT_RECLEN */ #else dir.d_reclen = _DIRENT_RECLEN(&dir, dir.d_namlen); @@ -223,7 +223,7 @@ run(const char *p, int flags, const char } -#if !defined(__FreeBSD__) +#ifndef __FreeBSD__ ATF_TC(glob_star); ATF_TC_HEAD(glob_star, tc) { @@ -272,7 +272,7 @@ ATF_TC_BODY(glob_nocheck, tc) ATF_TP_ADD_TCS(tp) { -#if !defined(__FreeBSD__) +#ifndef __FreeBSD__ ATF_TP_ADD_TC(tp, glob_star); #endif ATF_TP_ADD_TC(tp, glob_star_not); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c Wed Nov 19 06:37:18 2014 (r274690) @@ -34,7 +34,7 @@ #include #include #include -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include #else #include @@ -82,7 +82,7 @@ const struct hnopts { /* * Truncated output. Rev. 1.7 produces "1.0 K". */ -#if !defined(__FreeBSD__) +#ifndef __FreeBSD__ { 6, 1000, "A", HN_AUTOSCALE, HN_DECIMAL, -1, "" }, /* Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_nice.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_nice.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_nice.c Wed Nov 19 06:37:18 2014 (r274690) @@ -72,7 +72,7 @@ ATF_TC_BODY(nice_err, tc) { int i; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("nice(incr) with incr < 0 fails with unprivileged " "users and sets errno == EPERM; see PR # 189821 for more details"); #endif @@ -98,7 +98,7 @@ ATF_TC_HEAD(nice_priority, tc) ATF_TC_BODY(nice_priority, tc) { -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ int i, pri, pri2, nic; #else int i, pri, nic; @@ -115,7 +115,7 @@ ATF_TC_BODY(nice_priority, tc) pri = getpriority(PRIO_PROCESS, 0); ATF_REQUIRE(errno == 0); -#if defined(__NetBSD__) +#ifdef __NetBSD__ if (nic != pri) atf_tc_fail("nice(3) and getpriority(2) conflict"); #endif @@ -130,14 +130,14 @@ ATF_TC_BODY(nice_priority, tc) if (pid == 0) { errno = 0; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ pri = getpriority(PRIO_PROCESS, 0); #else pri2 = getpriority(PRIO_PROCESS, 0); #endif ATF_REQUIRE(errno == 0); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ if (pri != pri2) #else if (nic != pri) @@ -180,7 +180,7 @@ ATF_TC_HEAD(nice_thread, tc) ATF_TC_BODY(nice_thread, tc) { pthread_t tid[5]; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ int pri, rv, val; #else int rv, val; @@ -196,7 +196,7 @@ ATF_TC_BODY(nice_thread, tc) val = nice(i); ATF_REQUIRE(val != -1); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ pri = getpriority(PRIO_PROCESS, 0); rv = pthread_create(&tid[i], NULL, threadfunc, &pri); #else Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_raise.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_raise.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_raise.c Wed Nov 19 06:37:18 2014 (r274690) @@ -43,7 +43,7 @@ static int count; static void handler_err(int); static void handler_ret(int); static void handler_stress(int); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ static int sig[] = { SIGALRM, SIGIO, SIGUSR1, SIGUSR2 }; #else static int sig[] = { SIGALRM, SIGIO, SIGUSR1, SIGUSR2, SIGPWR }; Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c Wed Nov 19 06:37:18 2014 (r274690) @@ -63,7 +63,7 @@ ATF_TC_BODY(setdomainname_basic, tc) (void)memset(name, 0, sizeof(name)); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ /* * Sanity checks to ensure that the wrong invariant isn't being * tested for per PR # 181127 @@ -101,7 +101,7 @@ ATF_TC_BODY(setdomainname_limit, tc) (void)memset(name, 0, sizeof(name)); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN - 1 ) == 0); ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN) == -1); #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Wed Nov 19 06:37:18 2014 (r274690) @@ -28,7 +28,7 @@ #include -#if defined(__NetBSD__) +#ifdef __NetBSD__ #include #endif #include @@ -87,7 +87,7 @@ sig_debug(int signo, siginfo_t *info, uc printf("uc_stack %p %lu 0x%x\n", ctx->uc_stack.ss_sp, (unsigned long)ctx->uc_stack.ss_size, ctx->uc_stack.ss_flags); -#if defined(__NetBSD__) +#ifdef __NetBSD__ for (i = 0; i < __arraycount(ctx->uc_mcontext.__gregs); i++) printf("uc_mcontext.greg[%d] 0x%lx\n", i, (long)ctx->uc_mcontext.__gregs[i]); @@ -144,7 +144,7 @@ sigchild_action(int signo, siginfo_t *in printf("si_uid=%d\n", info->si_uid); printf("si_pid=%d\n", info->si_pid); printf("si_status=%d\n", info->si_status); -#if defined(__NetBSD__) +#ifdef __NetBSD__ printf("si_utime=%lu\n", (unsigned long int)info->si_utime); printf("si_stime=%lu\n", (unsigned long int)info->si_stime); #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_time.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_time.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_time.c Wed Nov 19 06:37:18 2014 (r274690) @@ -31,7 +31,7 @@ #include __RCSID("$NetBSD: t_time.c,v 1.2 2011/11/11 05:03:38 jruoho Exp $"); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include #endif #include Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Wed Nov 19 06:37:18 2014 (r274690) @@ -107,7 +107,7 @@ ATF_TC_BODY(ttyname_r_err, tc) ATF_REQUIRE(rv == ERANGE); } -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936"); #endif rv = ttyname_r(-1, buf, ttymax); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c Wed Nov 19 06:37:18 2014 (r274690) @@ -132,7 +132,7 @@ h_ctype2(const struct test *t, bool use_ size_t n; ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C"); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL); #else if (setlocale(LC_CTYPE, t->locale) == NULL) { @@ -245,7 +245,7 @@ ATF_TC_BODY(mbrtowc_internal, tc) { struct test *t; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("ja_* locale fails"); #endif for (t = &tests[0]; t->data != NULL; ++t) Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Wed Nov 19 06:37:18 2014 (r274690) @@ -150,7 +150,7 @@ ATF_TC_BODY(mbstowcs_basic, tc) int i; ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C"); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL); #else if (setlocale(LC_CTYPE, t->locale) == NULL) { Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c Wed Nov 19 06:37:18 2014 (r274690) @@ -76,7 +76,7 @@ h_mbtowc(const char *locale, const char char *str; ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C"); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_REQUIRE(setlocale(LC_CTYPE, locale) != NULL); #else if (setlocale(LC_CTYPE, locale) == NULL) { @@ -137,13 +137,13 @@ ATF_TC_BODY(mbtowc, tc) h_mbtowc("ja_JP.ISO2022-JP", "\033$B", "\033$B$\"\033(B"); h_mbtowc("ja_JP.SJIS", "\202", "\202\240"); h_mbtowc("ja_JP.eucJP", "\244", "\244\242"); -#if !defined(__FreeBSD__) +#ifndef __FreeBSD__ /* Moved last as it fails */ h_mbtowc("zh_CN.GB18030", "\241", "\241\241"); #endif h_mbtowc("zh_TW.Big5", "\241", "\241@"); h_mbtowc("zh_TW.eucTW", "\241", "\241\241"); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("zh_CN.GB18030"); h_mbtowc("zh_CN.GB18030", "\241", "\241\241"); #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c Wed Nov 19 06:37:18 2014 (r274690) @@ -66,7 +66,7 @@ __RCSID("$NetBSD: t_wcstod.c,v 1.3 2011/ #include -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c Wed Nov 19 06:37:18 2014 (r274690) @@ -109,7 +109,7 @@ h_wctomb(const struct test *t, char tc) size_t sz, ret, i; ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C"); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL); #else if (setlocale(LC_CTYPE, t->locale) == NULL) { Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c Wed Nov 19 06:37:18 2014 (r274690) @@ -46,14 +46,14 @@ __RCSID("$NetBSD: t_ether_aton.c,v 1.1 2 #include #include -#if !defined(__NetBSD__) -#if defined(__linux__) +#ifndef __NetBSD__ +#ifdef __linux__ #include #endif #include #endif -#if defined(__NetBSD__) +#ifdef __NetBSD__ #define ETHER_ADDR_LEN 6 int ether_aton_r(u_char *dest, size_t len, const char *str); @@ -65,7 +65,7 @@ static const struct { int error; } tests[] = { { { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }, "01:23:45:67:89:ab", 0 }, -#if defined(__NetBSD__) +#ifdef __NetBSD__ { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, "0:1:22-3:14:05", 0 }, { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, "000122031405", 0 }, { { 0x0a, 0x0B, 0xcc, 0xdD, 0xEE, 0x0f }, "0a0BccdDEE0f", 0 }, @@ -86,13 +86,13 @@ ATF_TC_HEAD(tc_ether_aton, tc) ATF_TC_BODY(tc_ether_aton, tc) { -#if defined(__NetBSD__) +#ifdef __NetBSD__ u_char dest[ETHER_ADDR_LEN]; #else struct ether_addr dest; #endif size_t t; -#if defined(__NetBSD__) +#ifdef __NetBSD__ int e, r; #else int e; @@ -103,7 +103,7 @@ ATF_TC_BODY(tc_ether_aton, tc) for (t = 0; tests[t].str; t++) { s = tests[t].str; if ((e = tests[t].error) == 0) { -#if defined(__NetBSD__) +#ifdef __NetBSD__ if (ether_aton_r(dest, sizeof(dest), s) != e) atf_tc_fail("failed on `%s'", s); if (memcmp(dest, tests[t].res, sizeof(dest)) != 0) @@ -115,7 +115,7 @@ ATF_TC_BODY(tc_ether_aton, tc) atf_tc_fail("unexpected result on `%s'", s); #endif } else { -#if defined(__NetBSD__) +#ifdef __NetBSD__ if ((r = ether_aton_r(dest, sizeof(dest), s)) != e) atf_tc_fail("unexpectedly succeeded on `%s' " "(%d != %d)", s, r, e); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/regex/debug.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/regex/debug.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/regex/debug.c Wed Nov 19 06:37:18 2014 (r274690) @@ -34,7 +34,7 @@ #include #include -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include #include #endif @@ -54,7 +54,7 @@ static char *regchar(int); void regprint(regex_t *r, FILE *d) { -#if defined(__NetBSD__) +#ifdef __NetBSD__ struct re_guts *g = r->re_g; int c; int last; @@ -177,7 +177,7 @@ s_print(struct re_guts *g, FILE *d) break; case OANYOF: fprintf(d, "[(%ld)", (long)opnd); -#if defined(__NetBSD__) +#ifdef __NetBSD__ cs = &g->sets[opnd]; last = -1; for (size_t i = 0; i < g->csetsize+1; i++) /* +1 flushes */ @@ -250,7 +250,7 @@ s_print(struct re_guts *g, FILE *d) fprintf(d, ">"); break; default: -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ fprintf(d, "!%ld(%ld)!", OP(*s), opnd); #else fprintf(d, "!%d(%d)!", OP(*s), opnd); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c Wed Nov 19 06:37:18 2014 (r274690) @@ -45,7 +45,7 @@ __RCSID("$NetBSD: t_exhaust.c,v 1.7 2011 #include #include #include -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include #endif @@ -179,7 +179,7 @@ ATF_TC_HEAD(regcomp_too_big, tc) " crash, but return a proper error code"); // libtre needs it. atf_tc_set_md_var(tc, "timeout", "600"); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_set_md_var(tc, "require.memory", "64M"); #else atf_tc_set_md_var(tc, "require.memory", "120M"); @@ -189,12 +189,12 @@ ATF_TC_HEAD(regcomp_too_big, tc) ATF_TC_BODY(regcomp_too_big, tc) { regex_t re; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ struct rlimit limit; #endif int e; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ limit.rlim_cur = limit.rlim_max = 64 * 1024 * 1024; ATF_REQUIRE(setrlimit(RLIMIT_VMEM, &limit) != -1); #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c Wed Nov 19 06:37:18 2014 (r274690) @@ -48,7 +48,7 @@ __RCSID("$NetBSD: t_regex_att.c,v 1.1 20 #include #include #include -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include #endif @@ -377,7 +377,7 @@ checkmatches(const char *matches, size_t " cur=%d, max=%zu", res, l, len - off); off += l; } -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ ATF_CHECK_STREQ_MSG(res, matches, " at line %zu", lineno); #else ATF_REQUIRE_STREQ_MSG(res, matches, " at line %zu", lineno); @@ -580,7 +580,7 @@ ATF_TC_BODY(leftassoc, tc) * any explation. Mark as broken here, but I don't know why. */ atf_tc_expect_fail("Reason for breakage unknown"); #endif -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("The expected and matched groups are mismatched on FreeBSD"); #endif att_test(tc, "leftassoc"); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c Wed Nov 19 06:37:18 2014 (r274690) @@ -42,7 +42,7 @@ __RCSID("$NetBSD: h_atexit.c,v 1.1 2011/ extern int __cxa_atexit(void (*func)(void *), void *, void *); extern void __cxa_finalize(void *); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ /* * On shared object unload, in __cxa_finalize, call and clear all installed * atexit and __cxa_atexit handlers that are either installed by unloaded @@ -191,7 +191,7 @@ main(int argc, char *argv[]) ASSERT(0 == atexit(normal_handler_0)); ASSERT(0 == atexit(normal_handler_1)); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ ASSERT(0 == __cxa_atexit(cxa_handler_4, &arg_1, dso_handle_1)); ASSERT(0 == __cxa_atexit(cxa_handler_5, &arg_1, dso_handle_1)); ASSERT(0 == __cxa_atexit(cxa_handler_3, &arg_2, dso_handle_2)); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c Wed Nov 19 06:37:18 2014 (r274690) @@ -34,7 +34,7 @@ #include #include #include -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 06:57:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD377B5B; Wed, 19 Nov 2014 06:57:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6D2276E3; Wed, 19 Nov 2014 06:57:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ6vpHO043200; Wed, 19 Nov 2014 06:57:51 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ6vpnO043199; Wed, 19 Nov 2014 06:57:51 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411190657.sAJ6vpnO043199@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 06:57:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274691 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 06:57:51 -0000 Author: glebius Date: Wed Nov 19 06:57:50 2014 New Revision: 274691 URL: https://svnweb.freebsd.org/changeset/base/274691 Log: Change type of unmapped local variable to bootlean_t. Modified: projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 06:37:18 2014 (r274690) +++ projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 06:57:50 2014 (r274691) @@ -780,7 +780,7 @@ vnode_pager_generic_getpages(struct vnod struct mount *mp; int count; int error; - int unmapped; + boolean_t unmapped; object = vp->v_object; count = bytecount / PAGE_SIZE; From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 07:09:15 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 891F3DE6; Wed, 19 Nov 2014 07:09:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7630C86B; Wed, 19 Nov 2014 07:09:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ79FIj048146; Wed, 19 Nov 2014 07:09:15 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ79FMD048145; Wed, 19 Nov 2014 07:09:15 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411190709.sAJ79FMD048145@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 19 Nov 2014 07:09:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274692 - projects/bmake/lib/libpam/libpam X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 07:09:15 -0000 Author: sjg Date: Wed Nov 19 07:09:14 2014 New Revision: 274692 URL: https://svnweb.freebsd.org/changeset/base/274692 Log: Include src.opts.mk since we don't include modules.inc here. Modified: projects/bmake/lib/libpam/libpam/Makefile Modified: projects/bmake/lib/libpam/libpam/Makefile ============================================================================== --- projects/bmake/lib/libpam/libpam/Makefile Wed Nov 19 06:57:50 2014 (r274691) +++ projects/bmake/lib/libpam/libpam/Makefile Wed Nov 19 07:09:14 2014 (r274692) @@ -176,6 +176,8 @@ ADD_HEADERS= security/pam_mod_misc.h INCS= ${HEADERS} ${ADD_HEADERS} INCSDIR= ${INCLUDEDIR}/security +.include + .if ${MK_TESTS} != "no" SUBDIR+= tests .endif From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 07:09:44 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FDB7ED0; Wed, 19 Nov 2014 07:09:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D227873; Wed, 19 Nov 2014 07:09:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ79iBh048245; Wed, 19 Nov 2014 07:09:44 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ79iRi048244; Wed, 19 Nov 2014 07:09:44 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411190709.sAJ79iRi048244@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 19 Nov 2014 07:09:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274693 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 07:09:44 -0000 Author: sjg Date: Wed Nov 19 07:09:43 2014 New Revision: 274693 URL: https://svnweb.freebsd.org/changeset/base/274693 Log: Use OBJTOP if defined Modified: projects/bmake/share/mk/src.libnames.mk Modified: projects/bmake/share/mk/src.libnames.mk ============================================================================== --- projects/bmake/share/mk/src.libnames.mk Wed Nov 19 07:09:14 2014 (r274692) +++ projects/bmake/share/mk/src.libnames.mk Wed Nov 19 07:09:43 2014 (r274693) @@ -7,7 +7,11 @@ .error src.libnames.mk cannot be included directly. .endif +.if defined(OBJTOP) +ROOTOBJDIR= ${OBJTOP} +.else ROOTOBJDIR= ${.OBJDIR:S/${.CURDIR}//}${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H} +.endif LIBATF_CDIR= ${ROOTOBJDIR}/lib/atf/libatf-c LDATF_C?= ${LIBATF_CDIR}/libatf-c.so From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 07:10:52 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45E91FC1; Wed, 19 Nov 2014 07:10:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2F8F787E; Wed, 19 Nov 2014 07:10:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ7AqUs049191; Wed, 19 Nov 2014 07:10:52 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ7AdF4049082; Wed, 19 Nov 2014 07:10:39 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411190710.sAJ7AdF4049082@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 19 Nov 2014 07:10:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274694 - in projects/bmake: bin/df cddl/lib/libzfs cddl/lib/libzpool lib/libevent lib/libohash lib/libpam/modules/pam_chroot lib/libpam/modules/pam_deny lib/libpam/modules/pam_echo lib... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 07:10:52 -0000 Author: sjg Date: Wed Nov 19 07:10:38 2014 New Revision: 274694 URL: https://svnweb.freebsd.org/changeset/base/274694 Log: Updated/new dependencies Added: projects/bmake/lib/libevent/Makefile.depend (contents, props changed) projects/bmake/lib/libohash/Makefile.depend (contents, props changed) projects/bmake/lib/libxo/Makefile.depend (contents, props changed) Modified: projects/bmake/bin/df/Makefile.depend projects/bmake/cddl/lib/libzfs/Makefile.depend projects/bmake/cddl/lib/libzpool/Makefile.depend projects/bmake/lib/libpam/modules/pam_chroot/Makefile.depend projects/bmake/lib/libpam/modules/pam_deny/Makefile.depend projects/bmake/lib/libpam/modules/pam_echo/Makefile.depend projects/bmake/lib/libpam/modules/pam_exec/Makefile.depend projects/bmake/lib/libpam/modules/pam_ftpusers/Makefile.depend projects/bmake/lib/libpam/modules/pam_group/Makefile.depend projects/bmake/lib/libpam/modules/pam_guest/Makefile.depend projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend projects/bmake/lib/libpam/modules/pam_lastlog/Makefile.depend projects/bmake/lib/libpam/modules/pam_login_access/Makefile.depend projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend projects/bmake/lib/libpam/modules/pam_permit/Makefile.depend projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend projects/bmake/lib/libpam/modules/pam_rhosts/Makefile.depend projects/bmake/lib/libpam/modules/pam_rootok/Makefile.depend projects/bmake/lib/libpam/modules/pam_securetty/Makefile.depend projects/bmake/lib/libpam/modules/pam_self/Makefile.depend projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend projects/bmake/pkgs/pseudo/usr.sbin/Makefile.depend projects/bmake/sbin/fsirand/Makefile.depend projects/bmake/sbin/ifconfig/Makefile.depend projects/bmake/usr.bin/bc/Makefile.depend projects/bmake/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend projects/bmake/usr.bin/ftp/Makefile.depend projects/bmake/usr.bin/id/Makefile.depend projects/bmake/usr.bin/m4/Makefile.depend projects/bmake/usr.bin/w/Makefile.depend projects/bmake/usr.bin/wc/Makefile.depend projects/bmake/usr.sbin/acpi/iasl/Makefile.depend projects/bmake/usr.sbin/fifolog/fifolog_reader/Makefile.depend projects/bmake/usr.sbin/fifolog/fifolog_writer/Makefile.depend projects/bmake/usr.sbin/gstat/Makefile.depend projects/bmake/usr.sbin/pkg/Makefile.depend projects/bmake/usr.sbin/wpa/wpa_cli/Makefile.depend Modified: projects/bmake/bin/df/Makefile.depend ============================================================================== --- projects/bmake/bin/df/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/bin/df/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -11,6 +11,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libutil \ + lib/libxo \ .include Modified: projects/bmake/cddl/lib/libzfs/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libzfs/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/cddl/lib/libzfs/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -6,6 +6,7 @@ DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ cddl/lib/libumem \ + cddl/lib/libuutil \ cddl/lib/libzfs_core \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -14,6 +15,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libexpat \ lib/libgeom \ lib/libmd \ lib/libthr \ Modified: projects/bmake/cddl/lib/libzpool/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libzpool/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/cddl/lib/libzpool/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -3,6 +3,9 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + cddl/lib/libavl \ + cddl/lib/libnvpair \ + cddl/lib/libumem \ gnu/lib/csu \ gnu/lib/libgcc \ include \ Added: projects/bmake/lib/libevent/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libevent/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Added: projects/bmake/lib/libohash/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libohash/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: projects/bmake/lib/libpam/modules/pam_chroot/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_chroot/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_chroot/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_deny/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_deny/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_deny/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_echo/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_echo/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_echo/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_exec/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_exec/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_exec/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_ftpusers/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_ftpusers/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_ftpusers/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_group/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_group/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_group/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_guest/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_guest/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_guest/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -16,7 +16,6 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libpam/libpam \ secure/lib/libcrypto \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -16,7 +16,6 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libpam/libpam \ secure/lib/libcrypto \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_lastlog/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_lastlog/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_lastlog/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_login_access/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_login_access/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_login_access/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ lib/libutil \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libopie \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libopie \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_permit/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_permit/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_permit/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ lib/libradius \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_rhosts/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_rhosts/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_rhosts/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_rootok/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_rootok/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_rootok/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_securetty/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_securetty/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_securetty/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_self/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_self/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_self/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -12,7 +12,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libpam/libpam \ lib/libutil \ secure/lib/libcrypto \ secure/lib/libssh \ Modified: projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libpam/libpam \ lib/libtacplus \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -12,7 +12,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libpam/libpam \ lib/libutil \ lib/libypclnt \ usr.bin/xinstall.host \ Added: projects/bmake/lib/libxo/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/lib/libxo/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -0,0 +1,20 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + usr.bin/xinstall.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: projects/bmake/pkgs/pseudo/usr.sbin/Makefile.depend ============================================================================== --- projects/bmake/pkgs/pseudo/usr.sbin/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/pkgs/pseudo/usr.sbin/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -101,7 +101,6 @@ DIRDEPS = \ usr.sbin/etcupdate \ usr.sbin/extattr \ usr.sbin/extattrctl \ - usr.sbin/faithd \ usr.sbin/fdcontrol \ usr.sbin/fdformat \ usr.sbin/fdread \ @@ -112,8 +111,6 @@ DIRDEPS = \ usr.sbin/fifolog/fifolog_reader \ usr.sbin/flowctl \ usr.sbin/freebsd-update \ - usr.sbin/ftp-proxy/libevent \ - usr.sbin/ftp-proxy/ftp-proxy \ usr.sbin/fwcontrol \ usr.sbin/genrandom \ usr.sbin/getfmac \ Modified: projects/bmake/sbin/fsirand/Makefile.depend ============================================================================== --- projects/bmake/sbin/fsirand/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/sbin/fsirand/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libutil \ .include Modified: projects/bmake/sbin/ifconfig/Makefile.depend ============================================================================== --- projects/bmake/sbin/ifconfig/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/sbin/ifconfig/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -14,6 +14,7 @@ DIRDEPS = \ lib/libexpat \ lib/libjail \ lib/libsbuf \ + lib/msun \ .include Modified: projects/bmake/usr.bin/bc/Makefile.depend ============================================================================== --- projects/bmake/usr.bin/bc/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.bin/bc/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libedit \ - lib/ncurses/ncurses \ lib/ncurses/ncursesw \ Modified: projects/bmake/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend ============================================================================== --- projects/bmake/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libsdp \ + lib/libutil \ .include Modified: projects/bmake/usr.bin/ftp/Makefile.depend ============================================================================== --- projects/bmake/usr.bin/ftp/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.bin/ftp/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -12,7 +12,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libedit \ - lib/libutil \ lib/ncurses/ncursesw \ Modified: projects/bmake/usr.bin/id/Makefile.depend ============================================================================== --- projects/bmake/usr.bin/id/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.bin/id/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -8,7 +8,6 @@ DIRDEPS = \ include \ include/xlocale \ lib/${CSU_DIR} \ - lib/libbsm \ lib/libc \ lib/libcompiler_rt \ Modified: projects/bmake/usr.bin/m4/Makefile.depend ============================================================================== --- projects/bmake/usr.bin/m4/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.bin/m4/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libohash \ lib/liby \ lib/msun \ usr.bin/lex/lib \ Modified: projects/bmake/usr.bin/w/Makefile.depend ============================================================================== --- projects/bmake/usr.bin/w/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.bin/w/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -13,6 +13,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libkvm \ lib/libutil \ + lib/libxo \ .include Modified: projects/bmake/usr.bin/wc/Makefile.depend ============================================================================== --- projects/bmake/usr.bin/wc/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.bin/wc/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libxo \ .include Modified: projects/bmake/usr.sbin/acpi/iasl/Makefile.depend ============================================================================== --- projects/bmake/usr.sbin/acpi/iasl/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.sbin/acpi/iasl/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -40,6 +40,10 @@ aslload.o: aslcompiler.y.h aslload.po: aslcompiler.y.h asllookup.o: aslcompiler.y.h asllookup.po: aslcompiler.y.h +aslmapoutput.o: aslcompiler.y.h +aslmapoutput.po: aslcompiler.y.h +aslmaputils.o: aslcompiler.y.h +aslmaputils.po: aslcompiler.y.h aslmethod.o: aslcompiler.y.h aslmethod.po: aslcompiler.y.h aslnamesp.o: aslcompiler.y.h Modified: projects/bmake/usr.sbin/fifolog/fifolog_reader/Makefile.depend ============================================================================== --- projects/bmake/usr.sbin/fifolog/fifolog_reader/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.sbin/fifolog/fifolog_reader/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libutil \ lib/libz \ usr.sbin/fifolog/lib \ Modified: projects/bmake/usr.sbin/fifolog/fifolog_writer/Makefile.depend ============================================================================== --- projects/bmake/usr.sbin/fifolog/fifolog_writer/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.sbin/fifolog/fifolog_writer/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libutil \ lib/libz \ usr.sbin/fifolog/lib \ Modified: projects/bmake/usr.sbin/gstat/Makefile.depend ============================================================================== --- projects/bmake/usr.sbin/gstat/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.sbin/gstat/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -16,7 +16,6 @@ DIRDEPS = \ lib/libgeom \ lib/libkvm \ lib/libsbuf \ - lib/ncurses/ncurses \ lib/ncurses/ncursesw \ Modified: projects/bmake/usr.sbin/pkg/Makefile.depend ============================================================================== --- projects/bmake/usr.sbin/pkg/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.sbin/pkg/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -13,7 +13,6 @@ DIRDEPS = \ lib/libbz2 \ lib/libc \ lib/libcompiler_rt \ - lib/libelf \ lib/libexpat \ lib/libfetch \ lib/liblzma \ Modified: projects/bmake/usr.sbin/wpa/wpa_cli/Makefile.depend ============================================================================== --- projects/bmake/usr.sbin/wpa/wpa_cli/Makefile.depend Wed Nov 19 07:09:43 2014 (r274693) +++ projects/bmake/usr.sbin/wpa/wpa_cli/Makefile.depend Wed Nov 19 07:10:38 2014 (r274694) @@ -11,9 +11,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libedit \ lib/libutil \ - lib/ncurses/ncursesw \ .include From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 07:11:29 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E54A4137; Wed, 19 Nov 2014 07:11:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7DFE889; Wed, 19 Nov 2014 07:11:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ7BTr9049812; Wed, 19 Nov 2014 07:11:29 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ7BTFn049811; Wed, 19 Nov 2014 07:11:29 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411190711.sAJ7BTFn049811@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 19 Nov 2014 07:11:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274695 - in projects/bmake/usr.sbin: faithd ftp-proxy/ftp-proxy ftp-proxy/libevent X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 07:11:30 -0000 Author: sjg Date: Wed Nov 19 07:11:29 2014 New Revision: 274695 URL: https://svnweb.freebsd.org/changeset/base/274695 Log: Removed from head Deleted: projects/bmake/usr.sbin/faithd/ projects/bmake/usr.sbin/ftp-proxy/ftp-proxy/ projects/bmake/usr.sbin/ftp-proxy/libevent/ From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 14:47:45 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9BC86516; Wed, 19 Nov 2014 14:47:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8926F8F; Wed, 19 Nov 2014 14:47:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJEljA2028308; Wed, 19 Nov 2014 14:47:45 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJEljwT028307; Wed, 19 Nov 2014 14:47:45 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411191447.sAJEljwT028307@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 14:47:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274713 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 14:47:45 -0000 Author: glebius Date: Wed Nov 19 14:47:44 2014 New Revision: 274713 URL: https://svnweb.freebsd.org/changeset/base/274713 Log: Add check to sbcheck() for empty mbufs on buffer. Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_sockbuf.c Modified: projects/sendfile/sys/kern/uipc_sockbuf.c ============================================================================== --- projects/sendfile/sys/kern/uipc_sockbuf.c Wed Nov 19 14:27:38 2014 (r274712) +++ projects/sendfile/sys/kern/uipc_sockbuf.c Wed Nov 19 14:47:44 2014 (r274713) @@ -683,6 +683,10 @@ sbcheck(struct sockbuf *sb, const char * for (m = sb->sb_mb; m; m = n) { n = m->m_nextpkt; for (; m; m = m->m_next) { + if (m->m_len == 0) { + printf("sb %p empty mbuf %p\n", sb, m); + goto fail; + } if ((m->m_flags & M_NOTREADY) && fnrdy == NULL) { if (m != sb->sb_fnrdy) { printf("sb %p: fnrdy %p != m %p\n", From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 16:18:55 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1AAD6134; Wed, 19 Nov 2014 16:18:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EFAA7D7D; Wed, 19 Nov 2014 16:18:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJGIsXN072107; Wed, 19 Nov 2014 16:18:54 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJGIsYE072106; Wed, 19 Nov 2014 16:18:54 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411191618.sAJGIsYE072106@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 16:18:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274716 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 16:18:55 -0000 Author: glebius Date: Wed Nov 19 16:18:54 2014 New Revision: 274716 URL: https://svnweb.freebsd.org/changeset/base/274716 Log: Put getpages_data on a diet, and store all the important information in the buf. Suggested by: kib Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 15:17:19 2014 (r274715) +++ projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 16:18:54 2014 (r274716) @@ -79,19 +79,9 @@ __FBSDID("$FreeBSD$"); /* * Structure to pass state from vnode_pager_generic_getpages() - * to vnode_pager_generic_getpages_done() either to - * vnode_pager_generic_getpages_done_async(). + * to vnode_pager_generic_getpages_done_async(). */ struct getpages_data { - vm_page_t *m; - struct buf *bp; - vm_object_t object; - vm_offset_t kva; - off_t foff; - boolean_t unmapped; - int size; - int count; - int reqpage; void (*iodone)(void *, vm_page_t *, int, int); void *arg; }; @@ -110,7 +100,7 @@ static void vnode_pager_putpages(vm_obje static boolean_t vnode_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); static vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t, struct ucred *cred); -static int vnode_pager_generic_getpages_done(struct getpages_data *); +static int vnode_pager_generic_getpages_done(struct buf *); static void vnode_pager_generic_getpages_done_async(struct buf *); struct pagerops vnodepagerops = { @@ -769,7 +759,6 @@ vnode_pager_generic_getpages(struct vnod int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) { vm_object_t object; - vm_offset_t kva; off_t foff; int i, j, size, bsize, first; daddr_t firstaddr, reqblock; @@ -777,10 +766,8 @@ vnode_pager_generic_getpages(struct vnod int runpg; int runend; struct buf *bp; - struct mount *mp; int count; int error; - boolean_t unmapped; object = vp->v_object; count = bytecount / PAGE_SIZE; @@ -964,24 +951,20 @@ vnode_pager_generic_getpages(struct vnod } bp = getpbuf(&vnode_pbuf_freecnt); - kva = (vm_offset_t)bp->b_data; + bp->b_kvaalloc = bp->b_data; /* * and map the pages to be read into the kva, if the filesystem * requires mapped buffers. */ - mp = vp->v_mount; - unmapped = (mp != NULL && (mp->mnt_kern_flag & MNTK_UNMAPPED_BUFS)); - if (unmapped && unmapped_buf_allowed) { + if ((vp->v_mount->mnt_kern_flag & MNTK_UNMAPPED_BUFS) && + unmapped_buf_allowed) { bp->b_data = unmapped_buf; bp->b_kvabase = unmapped_buf; bp->b_offset = 0; bp->b_flags |= B_UNMAPPED; - bp->b_npages = count; - for (i = 0; i < count; i++) - bp->b_pages[i] = m[i]; } else - pmap_qenter(kva, m, count); + pmap_qenter((vm_offset_t)bp->b_kvaalloc, m, count); /* build a minimal buffer header */ bp->b_iocmd = BIO_READ; @@ -995,6 +978,10 @@ vnode_pager_generic_getpages(struct vnod bp->b_bcount = size; bp->b_bufsize = size; bp->b_runningbufspace = bp->b_bufsize; + for (i = 0; i < count; i++) + bp->b_pages[i] = m[i]; + bp->b_npages = count; + bp->b_pager.pg_reqpage = reqpage; atomic_add_long(&runningbufspace, bp->b_runningbufspace); PCPU_INC(cnt.v_vnodein); @@ -1007,43 +994,24 @@ vnode_pager_generic_getpages(struct vnod struct getpages_data *d; d = malloc(sizeof(*d), M_TEMP, M_WAITOK); - - d->m = m; - d->bp = bp; - d->object = object; - d->foff = foff; - d->size = size; - d->count = count; - d->unmapped = unmapped; - d->reqpage = reqpage; - d->kva = kva; - d->iodone = iodone; d->arg = arg; - - bp->b_iodone = vnode_pager_generic_getpages_done_async; bp->b_caller1 = d; + bp->b_iodone = vnode_pager_generic_getpages_done_async; bp->b_flags |= B_ASYNC; BUF_KERNPROC(bp); bstrategy(bp); /* Good bye! */ } else { - struct getpages_data d; - - d.m = m; - d.bp = bp; - d.object = object; - d.foff = foff; - d.size = size; - d.count = count; - d.unmapped = unmapped; - d.reqpage = reqpage; - d.kva = kva; - bp->b_iodone = bdone; bstrategy(bp); bwait(bp, PVM, "vnread"); - error = vnode_pager_generic_getpages_done(&d); + error = vnode_pager_generic_getpages_done(bp); + for (int i = 0; i < bp->b_npages; i++) + bp->b_pages[i] = NULL; + bp->b_vp = NULL; + pbrelbo(bp); + relpbuf(bp, &vnode_pbuf_freecnt); } return (error ? VM_PAGER_ERROR : VM_PAGER_OK); @@ -1055,65 +1023,62 @@ vnode_pager_generic_getpages_done_async( struct getpages_data *d = bp->b_caller1; int error; - error = vnode_pager_generic_getpages_done(d); - d->iodone(d->arg, d->m, d->reqpage, error); + error = vnode_pager_generic_getpages_done(bp); + d->iodone(d->arg, bp->b_pages, bp->b_pager.pg_reqpage, error); + for (int i = 0; i < bp->b_npages; i++) + bp->b_pages[i] = NULL; + bp->b_vp = NULL; + pbrelbo(bp); + relpbuf(bp, &vnode_pbuf_freecnt); free(d, M_TEMP); } static int -vnode_pager_generic_getpages_done(struct getpages_data *d) +vnode_pager_generic_getpages_done(struct buf *bp) { + vm_object_t object = bp->b_vp->v_object; off_t tfoff, nextoff; int i, error; - if ((d->bp->b_ioflags & BIO_ERROR) != 0) + if ((bp->b_ioflags & BIO_ERROR) != 0) error = EIO; else error = 0; - if (error == 0 && d->size != d->count * PAGE_SIZE) { - if ((d->bp->b_flags & B_UNMAPPED) != 0) { - d->bp->b_flags &= ~B_UNMAPPED; - pmap_qenter(d->kva, d->m, d->count); + if (error == 0 && bp->b_bcount != bp->b_npages * PAGE_SIZE) { + if ((bp->b_flags & B_UNMAPPED) != 0) { + bp->b_flags &= ~B_UNMAPPED; + pmap_qenter((vm_offset_t)bp->b_kvaalloc, bp->b_pages, + bp->b_npages); } - bzero((caddr_t)d->kva + d->size, - PAGE_SIZE * d->count - d->size); + bzero(bp->b_kvaalloc + bp->b_bcount, + PAGE_SIZE * bp->b_npages - bp->b_bcount); } - if ((d->bp->b_flags & B_UNMAPPED) == 0) - pmap_qremove(d->kva, d->count); - if (d->unmapped) { - d->bp->b_data = (caddr_t)d->kva; - d->bp->b_kvabase = (caddr_t)d->kva; - d->bp->b_flags &= ~B_UNMAPPED; - for (i = 0; i < d->count; i++) - d->bp->b_pages[i] = NULL; + if ((bp->b_flags & B_UNMAPPED) == 0) + pmap_qremove((vm_offset_t)bp->b_kvaalloc, bp->b_npages); + if ((bp->b_vp->v_mount->mnt_kern_flag & MNTK_UNMAPPED_BUFS) != 0) { + bp->b_data = bp->b_kvaalloc; + bp->b_kvabase = bp->b_kvaalloc; + bp->b_flags &= ~B_UNMAPPED; } - /* - * free the buffer header back to the swap buffer pool - */ - d->bp->b_vp = NULL; - pbrelbo(d->bp); - relpbuf(d->bp, &vnode_pbuf_freecnt); - - VM_OBJECT_WLOCK(d->object); - for (i = 0, tfoff = d->foff; i < d->count; i++, tfoff = nextoff) { + VM_OBJECT_WLOCK(object); + for (i = 0, tfoff = IDX_TO_OFF(bp->b_pages[0]->pindex); + i < bp->b_npages; i++, tfoff = nextoff) { vm_page_t mt; nextoff = tfoff + PAGE_SIZE; - mt = d->m[i]; + mt = bp->b_pages[i]; - if (nextoff <= d->object->un_pager.vnp.vnp_size) { + if (nextoff <= object->un_pager.vnp.vnp_size) { /* * Read filled up entire page. */ mt->valid = VM_PAGE_BITS_ALL; KASSERT(mt->dirty == 0, - ("vnode_pager_generic_getpages: page %p is dirty", - mt)); + ("%s: page %p is dirty", __func__, mt)); KASSERT(!pmap_page_is_mapped(mt), - ("vnode_pager_generic_getpages: page %p is mapped", - mt)); + ("%s: page %p is mapped", __func__, mt)); } else { /* * Read did not fill up entire page. @@ -1123,17 +1088,16 @@ vnode_pager_generic_getpages_done(struct * read. */ vm_page_set_valid_range(mt, 0, - d->object->un_pager.vnp.vnp_size - tfoff); + object->un_pager.vnp.vnp_size - tfoff); KASSERT((mt->dirty & vm_page_bits(0, - d->object->un_pager.vnp.vnp_size - tfoff)) == 0, - ("vnode_pager_generic_getpages: page %p is dirty", - mt)); + object->un_pager.vnp.vnp_size - tfoff)) == 0, + ("%s: page %p is dirty", __func__, mt)); } - if (i != d->reqpage) + if (i != bp->b_pager.pg_reqpage) vm_page_readahead_finish(mt); } - VM_OBJECT_WUNLOCK(d->object); + VM_OBJECT_WUNLOCK(object); if (error) { printf("vnode_pager_getpages: I/O read error\n"); } From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 16:24:00 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CED266EB; Wed, 19 Nov 2014 16:24:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B88C4E6C; Wed, 19 Nov 2014 16:24:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJGO0OJ076207; Wed, 19 Nov 2014 16:24:00 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJGNvrd076181; Wed, 19 Nov 2014 16:23:57 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411191623.sAJGNvrd076181@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 16:23:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274717 - in projects/sendfile: sbin/ifconfig sys/cam/ctl sys/cddl/contrib/opensolaris/uts/common/sys sys/contrib/ngatm/netnatm/saal sys/dev/beri/virtio sys/dev/isp sys/dev/pci sys/kern... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 16:24:00 -0000 Author: glebius Date: Wed Nov 19 16:23:57 2014 New Revision: 274717 URL: https://svnweb.freebsd.org/changeset/base/274717 Log: Merge head. Added: projects/sendfile/sys/dev/beri/virtio/ - copied from r274716, head/sys/dev/beri/virtio/ Modified: projects/sendfile/sbin/ifconfig/ifgroup.c projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/sendfile/sys/contrib/ngatm/netnatm/saal/saal_sscop.c projects/sendfile/sys/dev/isp/isp_freebsd.c projects/sendfile/sys/dev/isp/isp_freebsd.h projects/sendfile/sys/dev/pci/pci.c projects/sendfile/sys/kern/kern_cons.c projects/sendfile/sys/kern/uipc_socket.c projects/sendfile/sys/netpfil/pf/pf_ioctl.c projects/sendfile/sys/vm/vnode_pager.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/sendfile/sbin/ifconfig/ifgroup.c ============================================================================== --- projects/sendfile/sbin/ifconfig/ifgroup.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sbin/ifconfig/ifgroup.c Wed Nov 19 16:23:57 2014 (r274717) @@ -86,9 +86,6 @@ getifgroups(int s) struct ifgroupreq ifgr; struct ifg_req *ifg; - if (!verbose) - return; - memset(&ifgr, 0, sizeof(ifgr)); strlcpy(ifgr.ifgr_name, name, IFNAMSIZ); @@ -121,6 +118,8 @@ getifgroups(int s) } if (cnt) printf("\n"); + + free(ifgr.ifgr_groups); } static void Modified: projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c Wed Nov 19 16:23:57 2014 (r274717) @@ -1982,7 +1982,7 @@ cfiscsi_ioctl_port_create(struct ctl_req if (ct->ct_state == CFISCSI_TARGET_STATE_ACTIVE) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "target \"%s\" already exist", target); + "target \"%s\" already exists", target); cfiscsi_target_release(ct); ctl_free_opts(&opts); return; Modified: projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h ============================================================================== --- projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h Wed Nov 19 16:23:57 2014 (r274717) @@ -331,7 +331,9 @@ extern "C" { /* * Define the appropriate "implementation choices". */ +#if !defined(_ILP32) #define _ILP32 +#endif #if !defined(_I32LPx) && defined(_KERNEL) #define _I32LPx #endif Modified: projects/sendfile/sys/contrib/ngatm/netnatm/saal/saal_sscop.c ============================================================================== --- projects/sendfile/sys/contrib/ngatm/netnatm/saal/saal_sscop.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/contrib/ngatm/netnatm/saal/saal_sscop.c Wed Nov 19 16:23:57 2014 (r274717) @@ -163,18 +163,17 @@ static void sscop_set_state(struct sscop } \ } while(0) - -#define QFIND(Q,RN) \ - ({ \ - struct sscop_msg *_msg = NULL, *_m; \ - MSGQ_FOREACH(_m, (Q)) { \ - if(_m->seqno == (RN)) { \ - _msg = _m; \ - break; \ - } \ - } \ - _msg; \ - }) +static inline struct sscop_msg *QFIND(sscop_msgq_head_t *q, u_int rn) +{ + struct sscop_msg *msg = NULL, *m; + MSGQ_FOREACH(m, q) { + if(m->seqno == rn) { + msg = m; + break; + } + } + return msg; +} #define QINSERT(Q,M) \ do { \ Modified: projects/sendfile/sys/dev/isp/isp_freebsd.c ============================================================================== --- projects/sendfile/sys/dev/isp/isp_freebsd.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/dev/isp/isp_freebsd.c Wed Nov 19 16:23:57 2014 (r274717) @@ -2136,9 +2136,8 @@ static void isp_refire_putback_atio(void *arg) { union ccb *ccb = arg; - ispsoftc_t *isp = XS_ISP(ccb); - ISP_ASSERT_LOCKED(isp); + ISP_ASSERT_LOCKED((ispsoftc_t *)XS_ISP(ccb)); isp_target_putback_atio(ccb); } Modified: projects/sendfile/sys/dev/isp/isp_freebsd.h ============================================================================== --- projects/sendfile/sys/dev/isp/isp_freebsd.h Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/dev/isp/isp_freebsd.h Wed Nov 19 16:23:57 2014 (r274717) @@ -400,9 +400,9 @@ struct isposinfo { /* * Locking macros... */ -#define ISP_LOCK(isp) mtx_lock(&isp->isp_osinfo.lock) -#define ISP_UNLOCK(isp) mtx_unlock(&isp->isp_osinfo.lock) -#define ISP_ASSERT_LOCKED(isp) mtx_assert(&isp->isp_osinfo.lock, MA_OWNED) +#define ISP_LOCK(isp) mtx_lock(&(isp)->isp_osinfo.lock) +#define ISP_UNLOCK(isp) mtx_unlock(&(isp)->isp_osinfo.lock) +#define ISP_ASSERT_LOCKED(isp) mtx_assert(&(isp)->isp_osinfo.lock, MA_OWNED) /* * Required Macros/Defines Modified: projects/sendfile/sys/dev/pci/pci.c ============================================================================== --- projects/sendfile/sys/dev/pci/pci.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/dev/pci/pci.c Wed Nov 19 16:23:57 2014 (r274717) @@ -3637,6 +3637,7 @@ static void pci_set_power_child(device_t dev, device_t child, int state) { struct pci_devinfo *dinfo; + device_t pcib; int dstate; /* @@ -3646,10 +3647,11 @@ pci_set_power_child(device_t dev, device * device power. Skip children who aren't attached since they * are handled separately. */ + pcib = device_get_parent(dev); dinfo = device_get_ivars(child); dstate = state; if (device_is_attached(child) && - PCIB_POWER_FOR_SLEEP(dev, child, &dstate) == 0) + PCIB_POWER_FOR_SLEEP(pcib, child, &dstate) == 0) pci_set_powerstate(child, dstate); } Modified: projects/sendfile/sys/kern/kern_cons.c ============================================================================== --- projects/sendfile/sys/kern/kern_cons.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/kern/kern_cons.c Wed Nov 19 16:23:57 2014 (r274717) @@ -156,6 +156,13 @@ cninit(void) * Make the best console the preferred console. */ cnselect(best_cn); + +#ifdef EARLY_PRINTF + /* + * Release early console. + */ + early_putc = NULL; +#endif } void Modified: projects/sendfile/sys/kern/uipc_socket.c ============================================================================== --- projects/sendfile/sys/kern/uipc_socket.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/kern/uipc_socket.c Wed Nov 19 16:23:57 2014 (r274717) @@ -1310,7 +1310,7 @@ restart: resid = 0; if (flags & MSG_EOR) top->m_flags |= M_EOR; - } else { + } else if (resid > 0) { /* * Copy the data from userland into a mbuf * chain. If no data is to be copied in, Modified: projects/sendfile/sys/netpfil/pf/pf_ioctl.c ============================================================================== --- projects/sendfile/sys/netpfil/pf/pf_ioctl.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/netpfil/pf/pf_ioctl.c Wed Nov 19 16:23:57 2014 (r274717) @@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #ifdef INET6 @@ -3619,12 +3620,11 @@ pf_check6_out(void *arg, struct mbuf **m int chk; /* We need a proper CSUM before we start (s. OpenBSD ip_output) */ - if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { -#ifdef INET - /* XXX-BZ copy&paste error from r126261? */ - in_delayed_cksum(*m); -#endif - (*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; + if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) { + in6_delayed_cksum(*m, + (*m)->m_pkthdr.len - sizeof(struct ip6_hdr), + sizeof(struct ip6_hdr)); + (*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6; } CURVNET_SET(ifp->if_vnet); chk = pf_test6(PF_OUT, ifp, m, inp); Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 16:23:57 2014 (r274717) @@ -957,7 +957,7 @@ vnode_pager_generic_getpages(struct vnod * and map the pages to be read into the kva, if the filesystem * requires mapped buffers. */ - if ((vp->v_mount->mnt_kern_flag & MNTK_UNMAPPED_BUFS) && + if ((vp->v_mount->mnt_kern_flag & MNTK_UNMAPPED_BUFS) != 0 && unmapped_buf_allowed) { bp->b_data = unmapped_buf; bp->b_kvabase = unmapped_buf; From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 16:33:08 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B13C19FF; Wed, 19 Nov 2014 16:33:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84997F73; Wed, 19 Nov 2014 16:33:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJGX8du080922; Wed, 19 Nov 2014 16:33:08 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJGX8at080921; Wed, 19 Nov 2014 16:33:08 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411191633.sAJGX8at080921@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 16:33:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274719 - in projects/sendfile: . sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 16:33:08 -0000 Author: glebius Date: Wed Nov 19 16:33:07 2014 New Revision: 274719 URL: https://svnweb.freebsd.org/changeset/base/274719 Log: Merge head up to r274718. Modified: Directory Properties: projects/sendfile/ (props changed) projects/sendfile/sys/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 20:19:54 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2DC72E1; Wed, 19 Nov 2014 20:19:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6484DC6; Wed, 19 Nov 2014 20:19:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJKJs3K087428; Wed, 19 Nov 2014 20:19:54 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJKJsCC087424; Wed, 19 Nov 2014 20:19:54 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411192019.sAJKJsCC087424@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 19 Nov 2014 20:19:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274725 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 20:19:54 -0000 Author: gjb Date: Wed Nov 19 20:19:53 2014 New Revision: 274725 URL: https://svnweb.freebsd.org/changeset/base/274725 Log: In vm_install_base(), copy the host resolv.conf into the build chroot before attempting to do anything that requires working DNS (i.e., pkg bootstrap). In vm_extra_pre_umount(), remove the resolv.conf before the disk image is unmounted from the backing md(4). Reported by: cperciva Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/azure.conf projects/release-vmimage/release/tools/openstack.conf projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/azure.conf ============================================================================== --- projects/release-vmimage/release/tools/azure.conf Wed Nov 19 20:16:56 2014 (r274724) +++ projects/release-vmimage/release/tools/azure.conf Wed Nov 19 20:19:53 2014 (r274725) @@ -33,6 +33,8 @@ vm_extra_pre_umount() { echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } Modified: projects/release-vmimage/release/tools/openstack.conf ============================================================================== --- projects/release-vmimage/release/tools/openstack.conf Wed Nov 19 20:16:56 2014 (r274724) +++ projects/release-vmimage/release/tools/openstack.conf Wed Nov 19 20:19:53 2014 (r274725) @@ -22,5 +22,7 @@ vm_extra_pre_umount() { echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Wed Nov 19 20:16:56 2014 (r274724) +++ projects/release-vmimage/release/tools/vmimage.subr Wed Nov 19 20:19:53 2014 (r274725) @@ -85,6 +85,8 @@ vm_install_base() { chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart umount ${DESTDIR}/dev + cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf + return 0 } @@ -131,6 +133,8 @@ vm_extra_pre_umount() { # Prototype. When overridden, installs additional ports within the # virtual machine environment. + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 22:17:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B706C747; Wed, 19 Nov 2014 22:17:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3902E22; Wed, 19 Nov 2014 22:17:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJMHNRJ044919; Wed, 19 Nov 2014 22:17:23 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJMHNbX044918; Wed, 19 Nov 2014 22:17:23 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201411192217.sAJMHNbX044918@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Wed, 19 Nov 2014 22:17:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274726 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 22:17:23 -0000 Author: cperciva Date: Wed Nov 19 22:17:22 2014 New Revision: 274726 URL: https://svnweb.freebsd.org/changeset/base/274726 Log: Silence errors when umounting the chroot's /dev, since it probably doesn't exist when we're running this. Unmount filesystems before attempting to destroy the md which holds them. Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Wed Nov 19 20:19:53 2014 (r274725) +++ projects/release-vmimage/release/tools/vmimage.subr Wed Nov 19 22:17:22 2014 (r274726) @@ -42,11 +42,11 @@ err() { } cleanup() { + umount ${DESTDIR}/dev 2>/dev/null + umount ${DESTDIR} if [ ! -z "${mddev}" ]; then mdconfig -d -u ${mddev} fi - umount ${DESTDIR}/dev - umount ${DESTDIR} return 0 } From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 23:19:38 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from hub.FreeBSD.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 672B9B48; Wed, 19 Nov 2014 23:19:37 +0000 (UTC) Date: Wed, 19 Nov 2014 23:19:33 +0000 From: Glen Barber To: Colin Percival Subject: Re: svn commit: r274726 - projects/release-vmimage/release/tools Message-ID: <20141119231933.GF27149@hub.FreeBSD.org> References: <201411192217.sAJMHNbX044918@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="OzxllxdKGCiKxUZM" Content-Disposition: inline In-Reply-To: <201411192217.sAJMHNbX044918@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 23:19:38 -0000 --OzxllxdKGCiKxUZM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 19, 2014 at 10:17:23PM +0000, Colin Percival wrote: > Author: cperciva > Date: Wed Nov 19 22:17:22 2014 > New Revision: 274726 > URL: https://svnweb.freebsd.org/changeset/base/274726 >=20 > Log: > Silence errors when umounting the chroot's /dev, since it probably does= n't > exist when we're running this. > =20 > Unmount filesystems before attempting to destroy the md which holds the= m. >=20 > Modified: > projects/release-vmimage/release/tools/vmimage.subr >=20 > Modified: projects/release-vmimage/release/tools/vmimage.subr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- projects/release-vmimage/release/tools/vmimage.subr Wed Nov 19 20:19:= 53 2014 (r274725) > +++ projects/release-vmimage/release/tools/vmimage.subr Wed Nov 19 22:17:= 22 2014 (r274726) > @@ -42,11 +42,11 @@ err() { > } > =20 > cleanup() { > + umount ${DESTDIR}/dev 2>/dev/null > + umount ${DESTDIR} > if [ ! -z "${mddev}" ]; then > mdconfig -d -u ${mddev} > fi > - umount ${DESTDIR}/dev > - umount ${DESTDIR} > =20 > return 0 > } >=20 Thanks! Glen --OzxllxdKGCiKxUZM Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUbSWFAAoJEAMUWKVHj+KTXxsP/0DzZcvp1R8IqxY+Ob3PE7Bi gVThMUCc/LtGILSRUrc/QDrVqLYeZD4Vjykub1cfXZddJ8tOHBzfYI1flb7sOsfy /jvm/rvH3wyp6iMO4pHMCuNEiXJrdhrQQamS+NHmi6Wm/+xH1HPtA9Oqd5yPLkBL /1fn1JzK+jK7ODdPjA/U0oxD8nRuOewk/heQFeHbZN+/VqnSaVlA6+hv2wTIX8ML EhNlQrYihRSy7bT0PB51H/+0uiohIhGEDQEQIu3HB0Nk3G09R9aNYKxyhDXh//at ASviL5OCd6x8ygNNymg7H04xeWIosXElUS41lgZ3XQkjAPNSHWN3VmCoMAiZPXWz 1xKfLv8PKad5DQL+7C4U96HzdM1gworbzkwdj+gNZ0ZkQhGD+4fY1BYS7wyi1em0 21XWPJjIHyIbIDUCDPHAmCrXwpQhbdblXREtC3YLMuEsgAvfMuje+9LDmIj8RKwv k034MbTrBNrxhxxX/R2/CBhnHFSvKoq0OTOshKixQNUGskDIKdCfG0DUdNShxTU1 UaoixG3vKhmugRR4YF1Pvd7uxIsi+Vp8Jm9AUnIrtWsq2AAKXG1jv4WlRF706qzE lSx2bf1COz/sNdKVYBfetwkU6VT7b7SgkvBDK9dmsXXemutuVWnP7NqD8JIt1HBT 0mCXbcvqaA5NQZ+Oq880 =kKKf -----END PGP SIGNATURE----- --OzxllxdKGCiKxUZM-- From owner-svn-src-projects@FreeBSD.ORG Wed Nov 19 23:32:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DFD7EEA; Wed, 19 Nov 2014 23:32:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CCD728B9; Wed, 19 Nov 2014 23:32:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJNW9u5081550; Wed, 19 Nov 2014 23:32:09 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJNW9nk081549; Wed, 19 Nov 2014 23:32:09 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411192332.sAJNW9nk081549@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 19 Nov 2014 23:32:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274728 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 23:32:10 -0000 Author: glebius Date: Wed Nov 19 23:32:09 2014 New Revision: 274728 URL: https://svnweb.freebsd.org/changeset/base/274728 Log: Minor style(9) nit. Submitted by: kib Modified: projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 23:07:46 2014 (r274727) +++ projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 23:32:09 2014 (r274728) @@ -1014,7 +1014,7 @@ vnode_pager_generic_getpages(struct vnod relpbuf(bp, &vnode_pbuf_freecnt); } - return (error ? VM_PAGER_ERROR : VM_PAGER_OK); + return (error != 0 ? VM_PAGER_ERROR : VM_PAGER_OK); } static void From owner-svn-src-projects@FreeBSD.ORG Thu Nov 20 00:16:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C215CFF; Thu, 20 Nov 2014 00:16:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38B68D0B; Thu, 20 Nov 2014 00:16:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAK0Guep002401; Thu, 20 Nov 2014 00:16:56 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAK0GuRi002399; Thu, 20 Nov 2014 00:16:56 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201411200016.sAK0GuRi002399@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Thu, 20 Nov 2014 00:16:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274729 - projects/release-vmimage/release/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 00:16:56 -0000 Author: cperciva Date: Thu Nov 20 00:16:55 2014 New Revision: 274729 URL: https://svnweb.freebsd.org/changeset/base/274729 Log: Unmount filesystem and destroy md before we read the vnode from disk and package it into a disk image. Otherwise we end up packaging an unclean filesystem. Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh ============================================================================== --- projects/release-vmimage/release/scripts/mk-vmimage.sh Wed Nov 19 23:32:09 2014 (r274728) +++ projects/release-vmimage/release/scripts/mk-vmimage.sh Thu Nov 20 00:16:55 2014 (r274729) @@ -100,9 +100,9 @@ main() { vm_extra_install_ports vm_extra_enable_services vm_extra_pre_umount + cleanup vm_create_disk || return 0 vm_extra_create_disk - cleanup return 0 } From owner-svn-src-projects@FreeBSD.ORG Thu Nov 20 03:46:36 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 052A8EE8; Thu, 20 Nov 2014 03:46:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CC155356; Thu, 20 Nov 2014 03:46:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAK3kZcE002365; Thu, 20 Nov 2014 03:46:35 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAK3kZsQ002364; Thu, 20 Nov 2014 03:46:35 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201411200346.sAK3kZsQ002364@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Thu, 20 Nov 2014 03:46:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274734 - projects/release-vmimage/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 03:46:36 -0000 Author: cperciva Date: Thu Nov 20 03:46:35 2014 New Revision: 274734 URL: https://svnweb.freebsd.org/changeset/base/274734 Log: Merge duplicative vm-CLOUDTYPE targets before additional duplication gets added by the impending arrival of ec2 and gcloud. Modified: projects/release-vmimage/release/Makefile.vm Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Thu Nov 20 03:23:33 2014 (r274733) +++ projects/release-vmimage/release/Makefile.vm Thu Nov 20 03:46:35 2014 (r274734) @@ -26,6 +26,15 @@ ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FO . if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF) ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf . endif + +vm-${_CW:tl}: + mkdir -p ${.OBJDIR}/${.TARGET} + env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + ${.CURDIR}/scripts/mk-vmimage.sh \ + -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ + -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW}_FORMAT} \ + -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW}IMAGE} -c ${${_CW}CONF} + touch ${.TARGET} . endfor .endif @@ -53,21 +62,3 @@ vm-image: touch ${.TARGET} vm-cloudware: ${CLOUDTARGETS} - -vm-azure: - mkdir -p ${.OBJDIR}/${.TARGET} - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ - -i ${.OBJDIR}/azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${AZUREIMAGE} -c ${AZURECONF} - touch ${.TARGET} - -vm-openstack: - mkdir -p ${.OBJDIR}/${.TARGET} - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ - -i ${.OBJDIR}/openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${OPENSTACKIMAGE} -c ${OPENSTACKCONF} - touch ${.TARGET} From owner-svn-src-projects@FreeBSD.ORG Thu Nov 20 17:36:26 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D10C7AA; Thu, 20 Nov 2014 17:36:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59B78CBA; Thu, 20 Nov 2014 17:36:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKHaQXf048652; Thu, 20 Nov 2014 17:36:26 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKHaPVD048634; Thu, 20 Nov 2014 17:36:25 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411201736.sAKHaPVD048634@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 20 Nov 2014 17:36:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274754 - in projects/sendfile/sys: sys vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 17:36:26 -0000 Author: glebius Date: Thu Nov 20 17:36:25 2014 New Revision: 274754 URL: https://svnweb.freebsd.org/changeset/base/274754 Log: o Since pager bufs are never put on freelist, share the space in the structure in union. o Add iodone callback pointer to the b_pager. o In vnode_pager use new b_pager.pg_iodone to store iodone pointer, eliminating the getpages_data structure and need to allocate it. Suggested by: kib Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/sys/buf.h projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/sys/buf.h ============================================================================== --- projects/sendfile/sys/sys/buf.h Thu Nov 20 17:31:25 2014 (r274753) +++ projects/sendfile/sys/sys/buf.h Thu Nov 20 17:36:25 2014 (r274754) @@ -107,7 +107,6 @@ struct buf { off_t b_offset; /* Offset into file. */ TAILQ_ENTRY(buf) b_bobufs; /* (V) Buffer's associated vnode. */ uint32_t b_vflags; /* (V) BV_* flags */ - TAILQ_ENTRY(buf) b_freelist; /* (Q) Free list position inactive. */ unsigned short b_qindex; /* (Q) buffer queue index */ uint32_t b_flags; /* B_* flags. */ b_xflags_t b_xflags; /* extra flags */ @@ -124,9 +123,15 @@ struct buf { struct ucred *b_rcred; /* Read credentials reference. */ struct ucred *b_wcred; /* Write credentials reference. */ void *b_saveaddr; /* Original b_addr for physio. */ - union pager_info { - int pg_reqpage; - } b_pager; + union { + TAILQ_ENTRY(buf) bu_freelist; /* (Q) */ + struct { + void (*pg_iodone)(void *, vm_page_t *, int, int); + int pg_reqpage; + } bu_pager; + } b_union; +#define b_freelist b_union.bu_freelist +#define b_pager b_union.bu_pager union cluster_info { TAILQ_HEAD(cluster_list_head, buf) cluster_head; TAILQ_ENTRY(buf) cluster_entry; Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Thu Nov 20 17:31:25 2014 (r274753) +++ projects/sendfile/sys/vm/vnode_pager.c Thu Nov 20 17:36:25 2014 (r274754) @@ -77,15 +77,6 @@ __FBSDID("$FreeBSD$"); #include #include -/* - * Structure to pass state from vnode_pager_generic_getpages() - * to vnode_pager_generic_getpages_done_async(). - */ -struct getpages_data { - void (*iodone)(void *, vm_page_t *, int, int); - void *arg; -}; - static int vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, daddr_t *rtaddress, int *run); static int vnode_pager_input_smlfs(vm_object_t object, vm_page_t m); @@ -991,12 +982,8 @@ vnode_pager_generic_getpages(struct vnod bp->b_iooffset = dbtob(bp->b_blkno); if (iodone) { /* async */ - struct getpages_data *d; - - d = malloc(sizeof(*d), M_TEMP, M_WAITOK); - d->iodone = iodone; - d->arg = arg; - bp->b_caller1 = d; + bp->b_pager.pg_iodone = iodone; + bp->b_caller1 = arg; bp->b_iodone = vnode_pager_generic_getpages_done_async; bp->b_flags |= B_ASYNC; BUF_KERNPROC(bp); @@ -1020,17 +1007,16 @@ vnode_pager_generic_getpages(struct vnod static void vnode_pager_generic_getpages_done_async(struct buf *bp) { - struct getpages_data *d = bp->b_caller1; int error; error = vnode_pager_generic_getpages_done(bp); - d->iodone(d->arg, bp->b_pages, bp->b_pager.pg_reqpage, error); + bp->b_pager.pg_iodone(bp->b_caller1, bp->b_pages, + bp->b_pager.pg_reqpage, error); for (int i = 0; i < bp->b_npages; i++) bp->b_pages[i] = NULL; bp->b_vp = NULL; pbrelbo(bp); relpbuf(bp, &vnode_pbuf_freecnt); - free(d, M_TEMP); } static int From owner-svn-src-projects@FreeBSD.ORG Thu Nov 20 21:54:37 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D67CD34; Thu, 20 Nov 2014 21:54:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 369AA270; Thu, 20 Nov 2014 21:54:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKLsb6T031609; Thu, 20 Nov 2014 21:54:37 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKLsWs8031514; Thu, 20 Nov 2014 21:54:32 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411202154.sAKLsWs8031514@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 20 Nov 2014 21:54:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274762 - in projects/sendfile: lib/libc/posix1e libexec/fingerd sbin/fsck sbin/growfs share/man/man4 share/man/man9 sys/contrib/ipfilter/netinet sys/dev/cxgbe sys/dev/cxgbe/common sys/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 21:54:37 -0000 Author: glebius Date: Thu Nov 20 21:54:32 2014 New Revision: 274762 URL: https://svnweb.freebsd.org/changeset/base/274762 Log: Merge head r258543 through r274754. Added: projects/sendfile/share/man/man9/vnet.9 - copied unchanged from r274754, head/share/man/man9/vnet.9 Deleted: projects/sendfile/lib/libc/posix1e/acl_size.c Modified: projects/sendfile/libexec/fingerd/fingerd.8 projects/sendfile/sbin/fsck/fsck.c projects/sendfile/sbin/growfs/growfs.8 projects/sendfile/share/man/man4/splash.4 projects/sendfile/share/man/man9/Makefile projects/sendfile/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/sendfile/sys/dev/cxgbe/common/common.h projects/sendfile/sys/dev/cxgbe/t4_main.c projects/sendfile/sys/dev/fdt/fdt_common.c projects/sendfile/sys/mips/conf/MALTA projects/sendfile/sys/mips/conf/MALTA64 projects/sendfile/sys/mips/include/cache_mipsNN.h projects/sendfile/sys/mips/include/cpuinfo.h projects/sendfile/sys/mips/include/cpuregs.h projects/sendfile/sys/mips/mips/cache.c projects/sendfile/sys/mips/mips/cache_mipsNN.c projects/sendfile/sys/mips/mips/cpu.c projects/sendfile/sys/powerpc/aim/trap_subr32.S projects/sendfile/sys/powerpc/aim/trap_subr64.S projects/sendfile/sys/powerpc/powermac/pmu.c projects/sendfile/sys/powerpc/powermac/pmuvar.h projects/sendfile/sys/powerpc/powerpc/db_trace.c projects/sendfile/usr.bin/man/man.1 projects/sendfile/usr.sbin/autofs/auto_master.5 projects/sendfile/usr.sbin/bhyve/bhyve.8 projects/sendfile/usr.sbin/pw/tests/helper_functions.shin projects/sendfile/usr.sbin/pw/tests/pw_delete.sh projects/sendfile/usr.sbin/pw/tests/pw_lock.sh projects/sendfile/usr.sbin/pw/tests/pw_modify.sh Directory Properties: projects/sendfile/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/contrib/ipfilter/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) Modified: projects/sendfile/libexec/fingerd/fingerd.8 ============================================================================== --- projects/sendfile/libexec/fingerd/fingerd.8 Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/libexec/fingerd/fingerd.8 Thu Nov 20 21:54:32 2014 (r274762) @@ -28,7 +28,7 @@ .\" @(#)fingerd.8 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd April 1, 2010 +.Dd November 19, 2014 .Dt FINGERD 8 .Os .Sh NAME @@ -86,7 +86,7 @@ returns a report that lists all people logged into the system at that moment. .Pp -If a user name is specified (e.g.\& +If a user name is specified (e.g.,\& .Pf eric Aq Tn CRLF ) then the response lists more extended information for only that particular user, @@ -159,19 +159,3 @@ The .Nm utility appeared in .Bx 4.3 . -.Sh BUGS -Connecting directly to the server from a -.Tn TIP -or an equally narrow-minded -.Tn TELNET Ns \-protocol -user program can result -in meaningless attempts at option negotiation being sent to the -server, which will foul up the command line interpretation. -The -.Nm -utility should be taught to filter out -.Tn IAC Ns \'s -and perhaps even respond -negatively -.Pq Tn IAC WON'T -to all option commands received. Modified: projects/sendfile/sbin/fsck/fsck.c ============================================================================== --- projects/sendfile/sbin/fsck/fsck.c Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sbin/fsck/fsck.c Thu Nov 20 21:54:32 2014 (r274762) @@ -41,8 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#define FSTYPENAMES -#include +#include #include #include @@ -81,10 +80,21 @@ static void addentry(struct fstypelist * static void maketypelist(char *); static void catopt(char **, const char *); static void mangle(char *, int *, const char ** volatile *, int *); -static const char *getfslab(const char *); +static const char *getfstype(const char *); static void usage(void) __dead2; static int isok(struct fstab *); +static struct { + const char *ptype; + const char *name; +} ptype_map[] = { + { "ufs", "ffs" }, + { "ffs", "ffs" }, + { "fat", "msdosfs" }, + { "efi", "msdosfs" }, + { NULL, NULL }, +}; + int main(int argc, char *argv[]) { @@ -203,7 +213,7 @@ main(int argc, char *argv[]) if ((fs = getfsfile(spec)) == NULL && (fs = getfsspec(spec)) == NULL) { if (vfstype == NULL) - vfstype = getfslab(spec); + vfstype = getfstype(spec); if (vfstype == NULL) errx(1, "Could not determine filesystem type"); type = vfstype; @@ -535,41 +545,27 @@ mangle(char *opts, int *argcp, const cha *maxargcp = maxargc; } - static const char * -getfslab(const char *str) +getfstype(const char *str) { - struct disklabel dl; - int fd; - char p; - const char *vfstype; - u_char t; + struct diocgattr_arg attr; + int fd, i; - /* deduce the file system type from the disk label */ if ((fd = open(str, O_RDONLY)) == -1) err(1, "cannot open `%s'", str); - if (ioctl(fd, DIOCGDINFO, &dl) == -1) { + strncpy(attr.name, "PART::type", sizeof(attr.name)); + memset(&attr.value, 0, sizeof(attr.value)); + attr.len = sizeof(attr.value); + if (ioctl(fd, DIOCGATTR, &attr) == -1) { (void) close(fd); return(NULL); } - (void) close(fd); - - p = str[strlen(str) - 1]; - - if ((p - 'a') >= dl.d_npartitions) - errx(1, "partition `%s' is not defined on disk", str); - - if ((t = dl.d_partitions[p - 'a'].p_fstype) >= FSMAXTYPES) - errx(1, "partition `%s' is not of a legal vfstype", - str); - - if ((vfstype = fstypenames[t]) == NULL) - errx(1, "vfstype `%s' on partition `%s' is not supported", - fstypenames[t], str); - - return vfstype; + for (i = 0; ptype_map[i].ptype != NULL; i++) + if (strstr(attr.value.str, ptype_map[i].ptype) != NULL) + return (ptype_map[i].name); + return (NULL); } Modified: projects/sendfile/sbin/growfs/growfs.8 ============================================================================== --- projects/sendfile/sbin/growfs/growfs.8 Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sbin/growfs/growfs.8 Thu Nov 20 21:54:32 2014 (r274762) @@ -37,7 +37,7 @@ .\" $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $ .\" $FreeBSD$ .\" -.Dd November 26, 2013 +.Dd November 20, 2014 .Dt GROWFS 8 .Os .Sh NAME @@ -96,12 +96,14 @@ This value defaults to the size of the r will enlarge the file system to the size of the entire partition). .El .Sh EXAMPLES -.Dl growfs -s 2G /dev/ada0p1 +Expand root file system to fill up available space: +.Dl growfs / .Pp -will enlarge +Resize .Pa /dev/ada0p1 -up to 2GB if there is enough space in -.Pa /dev/ada0p1 . +partition to 2GB and expand the file system: +.Dl gpart resize -i 1 -s 2G ada0 +.Dl growfs -s 2G /dev/ada0p1 .Sh SEE ALSO .Xr dumpfs 8 , .Xr ffsinfo 8 , @@ -115,7 +117,7 @@ The .Nm utility first appeared in .Fx 4.4 . -The ability to resize mounted filesystems was added in +The ability to resize mounted file systems was added in .Fx 10.0 . .Sh AUTHORS .An Christoph Herrmann Aq Mt chm@FreeBSD.org Modified: projects/sendfile/share/man/man4/splash.4 ============================================================================== --- projects/sendfile/share/man/man4/splash.4 Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/share/man/man4/splash.4 Thu Nov 20 21:54:32 2014 (r274762) @@ -66,7 +66,7 @@ Currently the following decoder modules .Pp .Bl -tag -width splash_decoder -compact .It Pa splash_bmp.ko -W*ndows BMP file decoder. +Windows BMP file decoder. While the BMP file format allows images of various color depths, this decoder currently only handles 256 color bitmaps. Bitmaps of other color depths will not be displayed. Modified: projects/sendfile/share/man/man9/Makefile ============================================================================== --- projects/sendfile/share/man/man9/Makefile Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/share/man/man9/Makefile Thu Nov 20 21:54:32 2014 (r274762) @@ -345,6 +345,7 @@ MAN= accept_filter.9 \ vmem.9 \ vn_fullpath.9 \ vn_isdisk.9 \ + vnet.9 \ vnode.9 \ VOP_ACCESS.9 \ VOP_ACLCHECK.9 \ Copied: projects/sendfile/share/man/man9/vnet.9 (from r274754, head/share/man/man9/vnet.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/share/man/man9/vnet.9 Thu Nov 20 21:54:32 2014 (r274762, copy of r274754, head/share/man/man9/vnet.9) @@ -0,0 +1,502 @@ +.\"- +.\" Copyright (c) 2010 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written by CK Software GmbH under sponsorship from +.\" the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd November 20, 2014 +.Dt VNET 9 +.Os +.Sh NAME +.Nm VNET +.Nd "network subsystem virtualization infrastructure" +.Sh SYNOPSIS +.Cd "options VIMAGE" +.Cd "options VNET_DEBUG" +.Pp +.In sys/vnet.h +.Pp +.\"------------------------------------------------------------ +.Ss "Constants and Global Variables" +.\" +.Dv VNET_SETNAME +.\" "set_vnet" +.Dv VNET_SYMPREFIX +.\" "vnet_entry_" +.Vt extern struct vnet *vnet0; +.\"------------------------------------------------------------ +.Ss "Variable Declaration" +.Fo VNET +.Fa "name" +.Fc +.\" +.Fo VNET_NAME +.Fa "name" +.Fc +.\" +.Fo VNET_DECLARE +.Fa "type" "name" +.Fc +.\" +.Fo VNET_DEFINE +.Fa "type" "name" +.Fc +.\" +.Bd -literal +#define V_name VNET(name) +.Ed +.\" ------------------------------------------------------------ +.Ss "Virtual Instance Selection" +.\" +.Fo CRED_TO_VNET +.Fa "struct ucred *" +.Fc +.\" +.Fo TD_TO_VNET +.Fa "struct thread *" +.Fc +.\" +.Fo P_TO_VNET +.Fa "struct proc *" +.Fc +.\" +.Fo IS_DEFAULT_VNET +.Fa "struct vnet *" +.Fc +.\" +.Fo VNET_ASSERT +.Fa exp msg +.Fc +.\" +.Fo CURVNET_SET +.Fa "struct vnet *" +.Fc +.\" +.Fo CURVNET_SET_QUIET +.Fa "struct vnet *" +.Fc +.\" +.Fo CURVNET_RESTORE +.Fc +.\" +.Fo VNET_ITERATOR_DECL +.Fa "struct vnet *" +.Fc +.\" +.Fo VNET_FOREACH +.Fa "struct vnet *" +.Fc +.\" ------------------------------------------------------------ +.Ss "Locking" +.\" +.Fo VNET_LIST_RLOCK +.Fc +.Fo VNET_LIST_RUNLOCK +.Fc +.Fo VNET_LIST_RLOCK_NOSLEEP +.Fc +.Fo VNET_LIST_RUNLOCK_NOSLEEP +.Fc +.\" ------------------------------------------------------------ +.Ss "Startup and Teardown Functions" +.\" +.Ft "struct vnet *" +.Fo vnet_alloc +.Fa void +.Fc +.\" +.Ft void +.Fo vnet_destroy +.Fa "struct vnet *" +.Fc +.\" +.Fo VNET_SYSINIT +.Fa ident +.Fa "enum sysinit_sub_id subsystem" +.Fa "enum sysinit_elem_order order" +.Fa "sysinit_cfunc_t func" +.Fa "const void *arg" +.Fc +.\" +.Fo VNET_SYSUNINIT +.Fa ident +.Fa "enum sysinit_sub_id subsystem" +.Fa "enum sysinit_elem_order order" +.Fa "sysinit_cfunc_t func" +.Fa "const void *arg" +.Fc +.\" ------------------------------------------------------------ +.Ss "Eventhandlers" +.\" +.Fo VNET_GLOBAL_EVENTHANDLER_REGISTER +.Fa "const char *name" +.Fa "void *func" +.Fa "void *arg" +.Fa "int priority" +.Fc +.\" +.Fo VNET_GLOBAL_EVENTHANDLER_REGISTER_TAG +.Fa "eventhandler_tag tag" +.Fa "const char *name" +.Fa "void *func" +.Fa "void *arg" +.Fa "int priority" +.Fc +.\" ------------------------------------------------------------ +.Ss "Sysctl Handling" +.Fo SYSCTL_VNET_INT +.Fa parent nbr name access ptr val descr +.Fc +.Fo SYSCTL_VNET_PROC +.Fa parent nbr name access ptr arg handler fmt descr +.Fc +.Fo SYSCTL_VNET_STRING +.Fa parent nbr name access arg len descr +.Fc +.Fo SYSCTL_VNET_STRUCT +.Fa parent nbr name access ptr type descr +.Fc +.Fo SYSCTL_VNET_UINT +.Fa parent nbr name access ptr val descr +.Fc +.Fo VNET_SYSCTL_ARG +.Fa req arg1 +.Fc +.\" ------------------------------------------------------------ +.Sh DESCRIPTION +.Nm +is the name of a technique to virtualize the network stack. +The basic idea is to change global resources most notably variables into +per network stack resources and have functions, sysctls, eventhandlers, +etc. access and handle them in the context of the correct instance. +Each (virtual) network stack is attached to a +.Em prison , +with +.Vt vnet0 +being the unrestricted default network stack of the base system. +.Pp +The global defines for +.Dv VNET_SETNAME +and +.Dv VNET_SYMPREFIX +are shared with +.Xr kvm 3 +to access internals for debugging reasons. +.\" ------------------------------------------------------------ +.Ss "Variable Declaration" +.\" +Variables are virtualized by using the +.Fn VNET_DEFINE +macro rather than writing them out as +.Em type name . +One can still use static initialization or storage class specifiers, e.g., +.Pp +.Dl Li static VNET_DEFINE(int, foo) = 1; +or +.Dl Li static VNET_DEFINE(SLIST_HEAD(, bar), bars); +.Pp +Static initialization is not possible when the virtualized variable +would need to be referenced, e.g., with +.Dq TAILQ_HEAD_INITIALIZER() . +In that case a +.Fn VNET_SYSINIT +based initialization function must be used. +.Pp +External variables have to be declared using the +.Fn VNET_DECLARE +macro. +In either case the convention is to define another macro, +that is then used throughout the implementation to access that variable. +The variable name is usually prefixed by +.Em V_ +to express that it is virtualized. +The +.Fn VNET +macro will then translate accesses to that variable to the copy of the +currently selected instance (see the +.Sx "Virtual instance selection" +section): +.Pp +.Dl Li #define V_name VNET(name) +.Pp +.Em NOTE: +Do not confuse this with the convention used by +.Xr VFS 9 . +.Pp +The +.Fn VNET_NAME +macro returns the offset within the memory region of the virtual network +stack instance. +It is usually only used with +.Fn SYSCTL_VNET_* +macros. +.\" ------------------------------------------------------------ +.Ss "Virtual Instance Selection" +.\" +There are three different places where the current virtual +network stack pointer is stored and can be taken from: +.Bl -enum -offset indent +.It +a +.Em prison : +.Dl "(struct prison *)->pr_vnet" +.Pp +For convenience the following macros are provided: +.Bd -literal -compact -offset indent +.Fn CRED_TO_VNET "struct ucred *" +.Fn TD_TO_VNET "struct thread *" +.Fn P_TO_VNET "struct proc *" +.Ed +.It +a +.Em socket : +.Dl "(struct socket *)->so_vnet" +.It +an +.Em interface : +.Dl "(struct ifnet *)->if_vnet" +.El +.Pp +.\" +In addition the currently active instance is cached in +.Dq "curthread->td_vnet" +which is usually only accessed through the +.Dv curvnet +macro. +.Pp +.\" +To set the correct context of the current virtual network instance, use the +.Fn CURVNET_SET +or +.Fn CURVNET_SET_QUIET +macros. +The +.Fn CURVNET_SET_QUIET +version will not record vnet recursions in case the kernel was compiled +with +.Cd "options VNET_DEBUG" +and should thus only be used in well known cases, where recursion is +unavoidable. +Both macros will save the previous state on the stack and it must be restored +with the +.Fn CURVNET_RESTORE +macro. +.Pp +.Em NOTE: +As the previous state is saved on the stack, you cannot have multiple +.Fn CURVNET_SET +calls in the same block. +.Pp +.Em NOTE: +As the previous state is saved on the stack, a +.Fn CURVNET_RESTORE +call has to be in the same block as the +.Fn CURVNET_SET +call or in a subblock with the same idea of the saved instances as the +outer block. +.Pp +.Em NOTE: +As each macro is a set of operations and, as previously explained, cannot +be put into its own block when defined, one cannot conditionally set +the current vnet context. +The following will +.Em not +work: +.Bd -literal -offset indent +if (condition) + CURVNET_SET(vnet); +.Ed +.Pp +nor would this work: +.Bd -literal -offset indent +if (condition) { + CURVNET_SET(vnet); +} +CURVNET_RESTORE(); +.Ed +.Pp +.\" +Sometimes one needs to loop over all virtual instances, for example to update +virtual from global state, to run a function from a +.Xr callout 9 +for each instance, etc. +For those cases the +.Fn VNET_ITERATOR_DECL +and +.Fn VNET_FOREACH +macros are provided. +The former macro defines the variable that iterates over the loop, +and the latter loops over all of the virtual network stack instances. +See +.Sx "Locking" +for how to savely traverse the list of all virtual instances. +.Pp +.\" +The +.Fn IS_DEFAULT_VNET +macro provides a safe way to check whether the currently active instance is the +unrestricted default network stack of the base system +.Pq Vt vnet0 . +.Pp +.\" +The +.Fn VNET_ASSERT +macro provides a way to conditionally add assertions that are only active with +.Cd "options VIMAGE" +compiled in and either +.Cd "options VNET_DEBUG" +or +.Cd "options INVARIANTS" +enabled as well. +It uses the same semantics as +.Xr KASSERT 9 . +.\" ------------------------------------------------------------ +.Ss "Locking" +.\" +For public access to the list of virtual network stack instances +e.g., by the +.Fn VNET_FOREACH +macro, read locks are provided. +Macros are used to abstract from the actual type of the locks. +If a caller may sleep while traversing the list, it must use the +.Fn VNET_LIST_RLOCK +and +.Fn VNET_LIST_RUNLOCK +macros. +Otherwise, the caller can use +.Fn VNET_LIST_RLOCK_NOSLEEP +and +.Fn VNET_LIST_RUNLOCK_NOSLEEP . +.\" ------------------------------------------------------------ +.Ss "Startup and Teardown Functions" +.\" +To start or tear down a virtual network stack instance the internal +functions +.Fn vnet_alloc +and +.Fn vnet_destroy +are provided and called from the jail framework. +They run the publicly provided methods to handle network stack +startup and teardown. +.Pp +For public control, the system startup interface has been enhanced +to not only handle a system boot but to also handle a virtual +network stack startup and teardown. +To the base system the +.Fn VNET_SYSINIT +and +.Fn VNET_SYSUNINIT +macros look exactly as if there were no virtual network stack. +In fact, if +.Cd "options VIMAGE" +is not compiled in they are compiled to the standard +.Fn SYSINIT +macros. +In addition to that they are run for each virtual network stack +when starting or, in reverse order, when shutting down. +.\" ------------------------------------------------------------ +.Ss "Eventhandlers" +.\" +Eventhandlers can be handled in two ways: +.Pp +.Bl -enum -offset indent -compact +.It +save the +.Em tags +returned in each virtual instance and properly free the eventhandlers +on teardown using those, or +.It +use one eventhandler that will iterate over all virtual network +stack instances. +.El +.Pp +For the first case one can just use the normal +.Xr EVENTHANDLER 9 +functions, while for the second case the +.Fn VNET_GLOBAL_EVENTHANDLER_REGISTER +and +.Fn VNET_GLOBAL_EVENTHANDLER_REGISTER_TAG +macros are provided. +These differ in that +.Fn VNET_GLOBAL_EVENTHANDLER_REGISTER_TAG +takes an extra first argument that will carry the +.Fa "tag" +upon return. +Eventhandlers registered with either of these will not run +.Fa func +directly but +.Fa func +will be called from an internal iterator function for each vnet. +Both macros can only be used for eventhandlers that do not take +additional arguments, as the variadic arguments from an +.Xr EVENTHANDLER_INVOKE 9 +call will be ignored. +.\" ------------------------------------------------------------ +.Ss "Sysctl Handling" +.\" +A +.Xr sysctl 9 +can be virtualized by using one of the +.Fn SYSCTL_VNET_* +macros. +.Pp +They take the same arguments as the standard +.Xr sysctl 9 +functions, with the only difference, that the +.Fa ptr +argument has to be passed as +.Ql &VNET_NAME(foo) +instead of +.Ql &foo +so that the variable can be selected from the correct memory +region of the virtual network stack instance of the caller. +.Pp +For the very rare case a sysctl handler function would want to +handle +.Fa arg1 +itself the +.Fn VNET_SYSCTL_ARG req arg1 +is provided that will translate the +.Fa arg1 +argument to the correct memory address in the virtual network stack +context of the caller. +.\" ------------------------------------------------------------ +.Sh SEE ALSO +.Xr jail 2 , +.Xr kvm 3 , +.Xr EVENTHANDLER 9 , +.\" .Xr pcpu 9 , +.Xr KASSERT 9 , +.Xr sysctl 9 +.\" .Xr SYSINIT 9 +.Sh HISTORY +The virtual network stack implementation first appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Bjoern A. Zeeb, CK Software GmbH, +under sponsorship from the FreeBSD Foundation. Modified: projects/sendfile/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- projects/sendfile/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Nov 20 21:54:32 2014 (r274762) @@ -33,6 +33,9 @@ static const char rcsid[] = "@(#)$Id$"; #include #include # include +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) +#include +#endif # include # include #if !defined(__hpux) @@ -52,6 +55,12 @@ static const char rcsid[] = "@(#)$Id$"; #include #include #include +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) +#include +#else +#define CURVNET_SET(arg) +#define CURVNET_RESTORE() +#endif #if defined(__osf__) # include #endif @@ -323,7 +332,9 @@ ipfioctl(dev, cmd, data, mode SPL_NET(s); + CURVNET_SET(TD_TO_VNET(p)); error = ipf_ioctlswitch(&ipfmain, unit, data, cmd, mode, p->p_uid, p); + CURVNET_RESTORE(); if (error != -1) { SPL_X(s); return error; Modified: projects/sendfile/sys/dev/cxgbe/common/common.h ============================================================================== --- projects/sendfile/sys/dev/cxgbe/common/common.h Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/dev/cxgbe/common/common.h Thu Nov 20 21:54:32 2014 (r274762) @@ -238,6 +238,7 @@ struct vpd_params { struct pci_params { unsigned int vpd_cap_addr; + unsigned int mps; unsigned short speed; unsigned short width; }; Modified: projects/sendfile/sys/dev/cxgbe/t4_main.c ============================================================================== --- projects/sendfile/sys/dev/cxgbe/t4_main.c Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/dev/cxgbe/t4_main.c Thu Nov 20 21:54:32 2014 (r274762) @@ -594,6 +594,8 @@ t4_attach(device_t dev) v = pci_read_config(dev, i + PCIER_DEVICE_CTL, 2); v |= PCIEM_CTL_RELAXED_ORD_ENABLE; pci_write_config(dev, i + PCIER_DEVICE_CTL, v, 2); + + sc->params.pci.mps = 128 << ((v & PCIEM_CTL_MAX_PAYLOAD) >> 5); } sc->traceq = -1; Modified: projects/sendfile/sys/dev/fdt/fdt_common.c ============================================================================== --- projects/sendfile/sys/dev/fdt/fdt_common.c Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/dev/fdt/fdt_common.c Thu Nov 20 21:54:32 2014 (r274762) @@ -1,7 +1,9 @@ /*- - * Copyright (c) 2009-2010 The FreeBSD Foundation + * Copyright (c) 2009-2014 The FreeBSD Foundation * All rights reserved. * + * This software was developed by Andrew Turner under sponsorship from + * the FreeBSD Foundation. * This software was developed by Semihalf under sponsorship from * the FreeBSD Foundation. * @@ -64,12 +66,84 @@ vm_offset_t fdt_immr_size; struct fdt_ic_list fdt_ic_list_head = SLIST_HEAD_INITIALIZER(fdt_ic_list_head); +static int +fdt_get_range_by_busaddr(phandle_t node, u_long addr, u_long *base, + u_long *size) +{ + pcell_t ranges[32], *rangesptr; + pcell_t addr_cells, size_cells, par_addr_cells; + u_long bus_addr, par_bus_addr, pbase, psize; + int err, i, len, tuple_size, tuples; + + if ((fdt_addrsize_cells(node, &addr_cells, &size_cells)) != 0) + return (ENXIO); + /* + * Process 'ranges' property. + */ + par_addr_cells = fdt_parent_addr_cells(node); + if (par_addr_cells > 2) { + return (ERANGE); + } + + len = OF_getproplen(node, "ranges"); + if (len < 0) + return (-1); + if (len > sizeof(ranges)) + return (ENOMEM); + if (len == 0) { + *base = 0; + *size = ULONG_MAX; + return (0); + } + + if (OF_getprop(node, "ranges", ranges, sizeof(ranges)) <= 0) + return (EINVAL); + + tuple_size = addr_cells + par_addr_cells + size_cells; + tuples = len / (tuple_size * sizeof(cell_t)); + + if (fdt_ranges_verify(ranges, tuples, par_addr_cells, + addr_cells, size_cells)) { + return (ERANGE); + } + *base = 0; + *size = 0; + + for (i = 0; i < tuples; i++) { + rangesptr = &ranges[i * tuple_size]; + + bus_addr = fdt_data_get((void *)rangesptr, addr_cells); + if (bus_addr != addr) + continue; + rangesptr += addr_cells; + + par_bus_addr = fdt_data_get((void *)rangesptr, par_addr_cells); + rangesptr += par_addr_cells; + + err = fdt_get_range_by_busaddr(OF_parent(node), par_bus_addr, + &pbase, &psize); + if (err > 0) + return (err); + if (err == 0) + *base = pbase; + else + *base = par_bus_addr; + + *size = fdt_data_get((void *)rangesptr, size_cells); + + return (0); + } + + return (EINVAL); +} + int fdt_get_range(phandle_t node, int range_id, u_long *base, u_long *size) { pcell_t ranges[6], *rangesptr; pcell_t addr_cells, size_cells, par_addr_cells; - int len, tuple_size, tuples; + u_long par_bus_addr, pbase, psize; + int err, len, tuple_size, tuples; if ((fdt_addrsize_cells(node, &addr_cells, &size_cells)) != 0) return (ENXIO); @@ -109,8 +183,17 @@ fdt_get_range(phandle_t node, int range_ *base = fdt_data_get((void *)rangesptr, addr_cells); rangesptr += addr_cells; - *base += fdt_data_get((void *)rangesptr, par_addr_cells); + + par_bus_addr = fdt_data_get((void *)rangesptr, par_addr_cells); rangesptr += par_addr_cells; + + err = fdt_get_range_by_busaddr(OF_parent(node), par_bus_addr, + &pbase, &psize); + if (err == 0) + *base += pbase; + else + *base += par_bus_addr; + *size = fdt_data_get((void *)rangesptr, size_cells); return (0); } @@ -292,7 +375,7 @@ fdt_parent_addr_cells(phandle_t node) /* Find out #address-cells of the superior bus. */ if (OF_searchprop(OF_parent(node), "#address-cells", &addr_cells, sizeof(addr_cells)) <= 0) - addr_cells = 2; + return (2); return ((int)fdt32_to_cpu(addr_cells)); } Modified: projects/sendfile/sys/mips/conf/MALTA ============================================================================== --- projects/sendfile/sys/mips/conf/MALTA Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/mips/conf/MALTA Thu Nov 20 21:54:32 2014 (r274762) @@ -68,3 +68,4 @@ device miibus device bpf device md device uart +device random Modified: projects/sendfile/sys/mips/conf/MALTA64 ============================================================================== --- projects/sendfile/sys/mips/conf/MALTA64 Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/mips/conf/MALTA64 Thu Nov 20 21:54:32 2014 (r274762) @@ -53,7 +53,7 @@ options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options ROOTDEVNAME=\"ufs:ada0s1a\" +options ROOTDEVNAME=\"ufs:ada0\" # Debugging for use in -current @@ -70,3 +70,4 @@ device miibus device md device bpf device uart +device random Modified: projects/sendfile/sys/mips/include/cache_mipsNN.h ============================================================================== --- projects/sendfile/sys/mips/include/cache_mipsNN.h Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/mips/include/cache_mipsNN.h Thu Nov 20 21:54:32 2014 (r274762) @@ -67,5 +67,15 @@ void mipsNN_pdcache_wbinv_range_index_12 void mipsNN_pdcache_inv_range_128(vm_offset_t, vm_size_t); void mipsNN_pdcache_wb_range_128(vm_offset_t, vm_size_t); #endif +void mipsNN_sdcache_wbinv_all_32(void); +void mipsNN_sdcache_wbinv_range_32(vm_paddr_t, vm_size_t); +void mipsNN_sdcache_wbinv_range_index_32(vm_paddr_t, vm_size_t); +void mipsNN_sdcache_inv_range_32(vm_paddr_t, vm_size_t); +void mipsNN_sdcache_wb_range_32(vm_paddr_t, vm_size_t); +void mipsNN_sdcache_wbinv_all_128(void); +void mipsNN_sdcache_wbinv_range_128(vm_paddr_t, vm_size_t); +void mipsNN_sdcache_wbinv_range_index_128(vm_paddr_t, vm_size_t); +void mipsNN_sdcache_inv_range_128(vm_paddr_t, vm_size_t); +void mipsNN_sdcache_wb_range_128(vm_paddr_t, vm_size_t); #endif /* _MACHINE_CACHE_MIPSNN_H_ */ Modified: projects/sendfile/sys/mips/include/cpuinfo.h ============================================================================== --- projects/sendfile/sys/mips/include/cpuinfo.h Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/mips/include/cpuinfo.h Thu Nov 20 21:54:32 2014 (r274762) @@ -67,6 +67,12 @@ struct mips_cpuinfo { u_int8_t dc_nways; u_int16_t dc_nsets; } l1; + struct { + u_int32_t dc_size; + u_int8_t dc_linesize; + u_int8_t dc_nways; + u_int16_t dc_nsets; + } l2; }; extern struct mips_cpuinfo cpuinfo; Modified: projects/sendfile/sys/mips/include/cpuregs.h ============================================================================== --- projects/sendfile/sys/mips/include/cpuregs.h Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/mips/include/cpuregs.h Thu Nov 20 21:54:32 2014 (r274762) @@ -550,6 +550,13 @@ #define MIPS_CONFIG1_EP 0x00000002 /* EJTAG implemented */ #define MIPS_CONFIG1_FP 0x00000001 /* FPU implemented */ +#define MIPS_CONFIG2_SA_SHIFT 0 /* Secondary cache associativity */ +#define MIPS_CONFIG2_SA_MASK 0xf +#define MIPS_CONFIG2_SL_SHIFT 4 /* Secondary cache line size */ +#define MIPS_CONFIG2_SL_MASK 0xf +#define MIPS_CONFIG2_SS_SHIFT 8 /* Secondary cache sets per way */ +#define MIPS_CONFIG2_SS_MASK 0xf + #define MIPS_CONFIG4_MMUSIZEEXT 0x000000FF /* bits 7.. 0 MMU Size Extension */ #define MIPS_CONFIG4_MMUEXTDEF 0x0000C000 /* bits 15.14 MMU Extension Definition */ #define MIPS_CONFIG4_MMUEXTDEF_MMUSIZEEXT 0x00004000 /* This values denotes CONFIG4 bits */ Modified: projects/sendfile/sys/mips/mips/cache.c ============================================================================== --- projects/sendfile/sys/mips/mips/cache.c Thu Nov 20 21:18:19 2014 (r274761) +++ projects/sendfile/sys/mips/mips/cache.c Thu Nov 20 21:54:32 2014 (r274762) @@ -260,19 +260,42 @@ mips_config_cache(struct mips_cpuinfo * panic("no pdcache_wb_range"); } - /* XXXMIPS: No secondary cache handlers yet */ -#ifdef notyet - if (mips_sdcache_size) { - if (!mips_cache_ops.mco_sdcache_wbinv_all) - panic("no sdcache_wbinv_all"); - if (!mips_cache_ops.mco_sdcache_wbinv_range) - panic("no sdcache_wbinv_range"); - if (!mips_cache_ops.mco_sdcache_wbinv_range_index) - panic("no sdcache_wbinv_range_index"); - if (!mips_cache_ops.mco_sdcache_inv_range) - panic("no sdcache_inv_range"); - if (!mips_cache_ops.mco_sdcache_wb_range) - panic("no sdcache_wb_range"); + /* L2 data cache */ + if (!cpuinfo->l2.dc_size) { + /* No L2 found, ignore */ + return; } + + switch (cpuinfo->l2.dc_linesize) { + case 32: + mips_cache_ops.mco_sdcache_wbinv_all = + mipsNN_sdcache_wbinv_all_32; + mips_cache_ops.mco_sdcache_wbinv_range = + mipsNN_sdcache_wbinv_range_32; + mips_cache_ops.mco_sdcache_wbinv_range_index = + mipsNN_sdcache_wbinv_range_index_32; + mips_cache_ops.mco_sdcache_inv_range = + mipsNN_sdcache_inv_range_32; + mips_cache_ops.mco_sdcache_wb_range = + mipsNN_sdcache_wb_range_32; + break; + case 128: + mips_cache_ops.mco_sdcache_wbinv_all = + mipsNN_sdcache_wbinv_all_128; + mips_cache_ops.mco_sdcache_wbinv_range = + mipsNN_sdcache_wbinv_range_128; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Nov 20 22:42:04 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8557C41; Thu, 20 Nov 2014 22:42:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C3064A0E; Thu, 20 Nov 2014 22:42:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKMg4Cp097675; Thu, 20 Nov 2014 22:42:04 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKMg0LZ097576; Thu, 20 Nov 2014 22:42:00 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411202242.sAKMg0LZ097576@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Thu, 20 Nov 2014 22:42:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274763 - in projects/routing/sys: contrib/ipfilter/netinet net netinet netinet6 netpfil/ipfw netpfil/pf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 22:42:05 -0000 Author: melifaro Date: Thu Nov 20 22:41:59 2014 New Revision: 274763 URL: https://svnweb.freebsd.org/changeset/base/274763 Log: Simplify API: use new NHOP_LOOKUP_AIFP flag to select what ifp we need to return. Rename fib[64]_lookup_nh_basic to fib[64]_lookup_nh, add flags fields for all relevant functions. Modified: projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/routing/sys/net/if_stf.c projects/routing/sys/net/rt_nhops.c projects/routing/sys/net/rt_nhops.h projects/routing/sys/netinet/in.c projects/routing/sys/netinet/in_gif.c projects/routing/sys/netinet/in_mcast.c projects/routing/sys/netinet/ip_input.c projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/in6_gif.c projects/routing/sys/netinet6/in6_mcast.c projects/routing/sys/netinet6/in6_src.c projects/routing/sys/netinet6/ip6_output.c projects/routing/sys/netpfil/ipfw/ip_fw2.c projects/routing/sys/netpfil/pf/pf.c Modified: projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Nov 20 22:41:59 2014 (r274763) @@ -958,7 +958,7 @@ ipf_verifysrc(fin) struct nhop4_basic nh4; memset(&nh4, 0, sizeof(nh4)); - if (fib4_lookup_nh_basic(RT_DEFAULT_FIB, fin->fin_src, 0, &nh4) != 0) + if (fib4_lookup_nh(RT_DEFAULT_FIB, fin->fin_src, 0, 0, &nh4) != 0) return (0); return (fin->fin_ifp == nh4.nh_ifp); Modified: projects/routing/sys/net/if_stf.c ============================================================================== --- projects/routing/sys/net/if_stf.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/net/if_stf.c Thu Nov 20 22:41:59 2014 (r274763) @@ -574,7 +574,7 @@ stf_checkaddr4(sc, in, inifp) if (sc && (STF2IFP(sc)->if_flags & IFF_LINK2) == 0 && inifp) { struct nhop4_basic nh4; - if (fib4_lookup_nh_basic(sc->sc_fibnum, *in, 0, &nh4) != 0) + if (fib4_lookup_nh(sc->sc_fibnum, *in, 0, 0, &nh4) != 0) return (-1); if (nh4.nh_ifp != inifp) return (-1); Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/net/rt_nhops.c Thu Nov 20 22:41:59 2014 (r274763) @@ -123,22 +123,22 @@ static inline uint16_t fib_rte_to_nh_fla static void rib4_rte_to_nh_extended(struct rtentry *rte, struct in_addr dst, struct rt4_extended *prt4); static void fib4_rte_to_nh_extended(struct rtentry *rte, struct in_addr dst, - struct nhop4_extended *pnh4); -static void fib4_rte_to_nh_basic(struct rtentry *rte, struct in_addr dst, - struct nhop4_basic *pnh4); + uint32_t flags, struct nhop4_extended *pnh4); +static void fib4_rte_to_nh(struct rtentry *rte, struct in_addr dst, + uint32_t flags, struct nhop4_basic *pnh4); #endif #ifdef INET6 static void fib6_rte_to_nh_extended(struct rtentry *rte, struct in6_addr *dst, - struct nhop6_extended *pnh6); -static void fib6_rte_to_nh_basic(struct rtentry *rte, struct in6_addr *dst, - struct nhop6_basic *pnh6); + uint32_t flags, struct nhop6_extended *pnh6); +static void fib6_rte_to_nh(struct rtentry *rte, struct in6_addr *dst, + uint32_t flags, struct nhop6_basic *pnh6); static int fib6_storelladdr(struct ifnet *ifp, struct in6_addr *dst, int mm_flags, u_char *desten); static uint16_t fib6_get_ifa(struct rtentry *rte); static int fib6_lla_to_nh_basic(struct in6_addr *dst, uint32_t scopeid, - struct nhop6_basic *pnh6); + uint32_t flags, struct nhop6_basic *pnh6); static int fib6_lla_to_nh_extended(struct in6_addr *dst, uint32_t scopeid, - struct nhop6_extended *pnh6); + uint32_t flags, struct nhop6_extended *pnh6); static int fib6_lla_to_nh(struct in6_addr *dst, uint32_t scopeid, struct nhop_prepend *nh, struct ifnet **lifp); #endif @@ -321,7 +321,7 @@ fib4_lookup_prepend(uint32_t fibnum, str if (nh_ext != NULL) { /* Fill in extended info */ - fib4_rte_to_nh_extended(rte, dst, nh_ext); + fib4_rte_to_nh_extended(rte, dst, 0, nh_ext); } RIB_RUNLOCK(rh); @@ -413,12 +413,15 @@ fib_rte_to_nh_flags(int rt_flags) } static void -fib4_rte_to_nh_basic(struct rtentry *rte, struct in_addr dst, - struct nhop4_basic *pnh4) +fib4_rte_to_nh(struct rtentry *rte, struct in_addr dst, + uint32_t flags, struct nhop4_basic *pnh4) { struct sockaddr_in *gw; - pnh4->nh_ifp = rte->rt_ifa->ifa_ifp; + if ((flags & NHOP_LOOKUP_AIFP) == 0) + pnh4->nh_ifp = rte->rt_ifp; + else + pnh4->nh_ifp = rte->rt_ifa->ifa_ifp; pnh4->nh_mtu = min(rte->rt_mtu, rte->rt_ifp->if_mtu); if (rte->rt_flags & RTF_GATEWAY) { gw = (struct sockaddr_in *)rte->rt_gateway; @@ -435,12 +438,15 @@ fib4_rte_to_nh_basic(struct rtentry *rte static void fib4_rte_to_nh_extended(struct rtentry *rte, struct in_addr dst, - struct nhop4_extended *pnh4) + uint32_t flags, struct nhop4_extended *pnh4) { struct sockaddr_in *gw; struct in_ifaddr *ia; - pnh4->nh_ifp = rte->rt_ifa->ifa_ifp; + if ((flags & NHOP_LOOKUP_AIFP) == 0) + pnh4->nh_ifp = rte->rt_ifp; + else + pnh4->nh_ifp = rte->rt_ifa->ifa_ifp; pnh4->nh_mtu = min(rte->rt_mtu, rte->rt_ifp->if_mtu); if (rte->rt_flags & RTF_GATEWAY) { gw = (struct sockaddr_in *)rte->rt_gateway; @@ -502,8 +508,8 @@ rib4_rte_to_nh_extended(struct rtentry * * - howewer mtu from "transmit" interface will be returned. */ int -fib4_lookup_nh_basic(uint32_t fibnum, struct in_addr dst, uint32_t flowid, - struct nhop4_basic *pnh4) +fib4_lookup_nh(uint32_t fibnum, struct in_addr dst, uint32_t flowid, + uint32_t flags, struct nhop4_basic *pnh4) { struct rib_head *rh; struct radix_node *rn; @@ -511,7 +517,7 @@ fib4_lookup_nh_basic(uint32_t fibnum, st struct rtentry *rte; RIB_LOCK_READER; - KASSERT((fibnum < rt_numfibs), ("fib4_lookup_nh_basic: bad fibnum")); + KASSERT((fibnum < rt_numfibs), ("fib4_lookup_nh: bad fibnum")); rh = rt_tables_get_rnh(fibnum, AF_INET); if (rh == NULL) return (ENOENT); @@ -527,7 +533,7 @@ fib4_lookup_nh_basic(uint32_t fibnum, st rte = RNTORT(rn); /* Ensure route & ifp is UP */ if (RT_LINK_IS_UP(rte->rt_ifp)) { - fib4_rte_to_nh_basic(rte, dst, pnh4); + fib4_rte_to_nh(rte, dst, flags, pnh4); RIB_RUNLOCK(rh); return (0); @@ -538,43 +544,6 @@ fib4_lookup_nh_basic(uint32_t fibnum, st return (ENOENT); } -int -fib4_lookup_nh_ifp(uint32_t fibnum, struct in_addr dst, uint32_t flowid, - struct nhop4_basic *pnh4) -{ - struct rib_head *rh; - struct radix_node *rn; - struct sockaddr_in sin; - struct rtentry *rte; - RIB_LOCK_READER; - - KASSERT((fibnum < rt_numfibs), ("fib4_lookup_nh_ifp: bad fibnum")); - rh = rt_tables_get_rnh(fibnum, AF_INET); - if (rh == NULL) - return (ENOENT); - - /* Prepare lookup key */ - memset(&sin, 0, sizeof(sin)); - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_addr = dst; - - RIB_RLOCK(rh); - rn = rh->rnh_matchaddr((void *)&sin, &rh->head); - if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0)) { - rte = RNTORT(rn); - /* Ensure route & ifp is UP */ - if (RT_LINK_IS_UP(rte->rt_ifp)) { - fib4_rte_to_nh_basic(rte, dst, pnh4); - RIB_RUNLOCK(rh); - pnh4->nh_ifp = rte->rt_ifp; - return (0); - } - } - RIB_RUNLOCK(rh); - - return (ENOENT); -} - /* * Performs IPv4 route table lookup on @dst. Returns 0 on success. * Stores extende nexthop info provided @pnh4 structure. @@ -610,7 +579,7 @@ fib4_lookup_nh_ext(uint32_t fibnum, stru rte = RNTORT(rn); /* Ensure route & ifp is UP */ if (RT_LINK_IS_UP(rte->rt_ifp)) { - fib4_rte_to_nh_extended(rte, dst, pnh4); + fib4_rte_to_nh_extended(rte, dst, flags, pnh4); if ((flags & NHOP_LOOKUP_REF) != 0) { /* TODO: Do lwref on egress ifp's */ } @@ -946,7 +915,7 @@ fib6_get_ifa(struct rtentry *rte) static int fib6_lla_to_nh_basic(struct in6_addr *dst, uint32_t scopeid, - struct nhop6_basic *pnh6) + uint32_t flags, struct nhop6_basic *pnh6) { struct ifnet *ifp; @@ -957,8 +926,13 @@ fib6_lla_to_nh_basic(struct in6_addr *ds /* Do explicit nexthop zero unless we're copying it */ memset(pnh6, 0, sizeof(*pnh6)); - pnh6->nh_ifp = ifp; pnh6->nh_mtu = IN6_LINKMTU(ifp); + pnh6->nh_ifp = ifp; + if ((flags & NHOP_LOOKUP_AIFP)!=0 && in6_ifawithifp_lla(ifp, dst) != 0){ + if ((ifp = V_loif) != NULL) + pnh6->nh_ifp = ifp; + } + /* No flags set */ pnh6->nh_addr = *dst; @@ -967,7 +941,7 @@ fib6_lla_to_nh_basic(struct in6_addr *ds static int fib6_lla_to_nh_extended(struct in6_addr *dst, uint32_t scopeid, - struct nhop6_extended *pnh6) + uint32_t flags, struct nhop6_extended *pnh6) { struct ifnet *ifp; @@ -978,8 +952,12 @@ fib6_lla_to_nh_extended(struct in6_addr /* Do explicit nexthop zero unless we're copying it */ memset(pnh6, 0, sizeof(*pnh6)); - pnh6->nh_ifp = ifp; pnh6->nh_mtu = IN6_LINKMTU(ifp); + pnh6->nh_ifp = ifp; + if ((flags & NHOP_LOOKUP_AIFP)!=0 && in6_ifawithifp_lla(ifp, dst) != 0){ + if ((ifp = V_loif) != NULL) + pnh6->nh_ifp = ifp; + } /* No flags set */ pnh6->nh_addr = *dst; @@ -988,7 +966,7 @@ fib6_lla_to_nh_extended(struct in6_addr static int rib6_lla_to_nh_extended(struct in6_addr *dst, uint32_t scopeid, - struct rt6_extended *prt6) + uint32_t flags, struct rt6_extended *prt6) { struct ifnet *ifp; @@ -1047,15 +1025,18 @@ fib6_lla_to_nh(struct in6_addr *dst, uin static void -fib6_rte_to_nh_basic(struct rtentry *rte, struct in6_addr *dst, - struct nhop6_basic *pnh6) +fib6_rte_to_nh(struct rtentry *rte, struct in6_addr *dst, + uint32_t flags, struct nhop6_basic *pnh6) { struct sockaddr_in6 *gw; /* Do explicit nexthop zero unless we're copying it */ memset(pnh6, 0, sizeof(*pnh6)); - pnh6->nh_ifp = ifnet_byindex(fib6_get_ifa(rte)); + if ((flags & NHOP_LOOKUP_AIFP) == 0) + pnh6->nh_ifp = rte->rt_ifp; + else + pnh6->nh_ifp = ifnet_byindex(fib6_get_ifa(rte)); pnh6->nh_mtu = min(rte->rt_mtu, IN6_LINKMTU(rte->rt_ifp)); if (rte->rt_flags & RTF_GATEWAY) { @@ -1073,7 +1054,7 @@ fib6_rte_to_nh_basic(struct rtentry *rte static void fib6_rte_to_nh_extended(struct rtentry *rte, struct in6_addr *dst, - struct nhop6_extended *pnh6) + uint32_t flags, struct nhop6_extended *pnh6) { struct sockaddr_in6 *gw; struct in6_ifaddr *ia; @@ -1081,7 +1062,11 @@ fib6_rte_to_nh_extended(struct rtentry * /* Do explicit nexthop zero unless we're copying it */ memset(pnh6, 0, sizeof(*pnh6)); - pnh6->nh_ifp = ifnet_byindex(fib6_get_ifa(rte)); + if ((flags & NHOP_LOOKUP_AIFP) == 0) + pnh6->nh_ifp = rte->rt_ifp; + else + pnh6->nh_ifp = ifnet_byindex(fib6_get_ifa(rte)); + pnh6->nh_mtu = min(rte->rt_mtu, IN6_LINKMTU(rte->rt_ifp)); if (rte->rt_flags & RTF_GATEWAY) { gw = (struct sockaddr_in6 *)rte->rt_gateway; @@ -1104,7 +1089,7 @@ fib6_rte_to_nh_extended(struct rtentry * bitcount32((x).__u6_addr.__u6_addr32[3]) static void rib6_rte_to_nh_extended(struct rtentry *rte, struct in6_addr *dst, - struct rt6_extended *prt6) + uint32_t flags, struct rt6_extended *prt6) { struct sockaddr_in6 *gw; @@ -1130,52 +1115,8 @@ rib6_rte_to_nh_extended(struct rtentry * } int -fib6_lookup_nh_ifp(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, - uint32_t flowid, struct nhop6_basic *pnh6) -{ - struct rib_head *rh; - struct radix_node *rn; - struct sockaddr_in6 sin6; - struct rtentry *rte; - RIB_LOCK_READER; - - if (IN6_IS_SCOPE_LINKLOCAL(dst)) { - /* Do not lookup link-local addresses in rtable */ - /* XXX: Check if dst is local */ - return (fib6_lla_to_nh_basic(dst, scopeid, pnh6)); - } - - KASSERT((fibnum < rt_numfibs), ("fib6_lookup_nh_basic: bad fibnum")); - rh = rt_tables_get_rnh(fibnum, AF_INET6); - if (rh == NULL) - return (ENOENT); - - /* Prepare lookup key */ - memset(&sin6, 0, sizeof(sin6)); - sin6.sin6_addr = *dst; - sin6.sin6_scope_id = scopeid; - sa6_embedscope(&sin6, 0); - - RIB_RLOCK(rh); - rn = rh->rnh_matchaddr((void *)&sin6, &rh->head); - if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0)) { - rte = RNTORT(rn); - /* Ensure route & ifp is UP */ - if (RT_LINK_IS_UP(rte->rt_ifp)) { - fib6_rte_to_nh_basic(rte, dst, pnh6); - pnh6->nh_ifp = rte->rt_ifp; - RIB_RUNLOCK(rh); - return (0); - } - } - RIB_RUNLOCK(rh); - - return (ENOENT); -} - -int -fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, - uint32_t flowid, struct nhop6_basic *pnh6) +fib6_lookup_nh(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + uint32_t flowid, uint32_t flags, struct nhop6_basic *pnh6) { struct rib_head *rh; struct radix_node *rn; @@ -1185,10 +1126,10 @@ fib6_lookup_nh_basic(uint32_t fibnum, st if (IN6_IS_SCOPE_LINKLOCAL(dst)) { /* Do not lookup link-local addresses in rtable */ - return (fib6_lla_to_nh_basic(dst, scopeid, pnh6)); + return (fib6_lla_to_nh_basic(dst, scopeid, flags, pnh6)); } - KASSERT((fibnum < rt_numfibs), ("fib6_lookup_nh_basic: bad fibnum")); + KASSERT((fibnum < rt_numfibs), ("fib6_lookup_nh: bad fibnum")); rh = rt_tables_get_rnh(fibnum, AF_INET6); if (rh == NULL) return (ENOENT); @@ -1205,7 +1146,7 @@ fib6_lookup_nh_basic(uint32_t fibnum, st rte = RNTORT(rn); /* Ensure route & ifp is UP */ if (RT_LINK_IS_UP(rte->rt_ifp)) { - fib6_rte_to_nh_basic(rte, dst, pnh6); + fib6_rte_to_nh(rte, dst, flags, pnh6); RIB_RUNLOCK(rh); return (0); } @@ -1237,7 +1178,7 @@ fib6_lookup_nh_ext(uint32_t fibnum, stru if (IN6_IS_SCOPE_LINKLOCAL(dst)) { /* Do not lookup link-local addresses in rtable */ /* XXX: Do lwref on egress ifp */ - return (fib6_lla_to_nh_extended(dst, scopeid, pnh6)); + return (fib6_lla_to_nh_extended(dst, scopeid, flags, pnh6)); } KASSERT((fibnum < rt_numfibs), ("fib4_lookup_nh_ext: bad fibnum")); @@ -1258,7 +1199,7 @@ fib6_lookup_nh_ext(uint32_t fibnum, stru rte = RNTORT(rn); /* Ensure route & ifp is UP */ if (RT_LINK_IS_UP(rte->rt_ifp)) { - fib6_rte_to_nh_extended(rte, dst, pnh6); + fib6_rte_to_nh_extended(rte, dst, flags, pnh6); if ((flags & NHOP_LOOKUP_REF) != 0) { /* TODO: Do lwref on egress ifp's */ } @@ -1291,7 +1232,7 @@ rib6_lookup_nh_ext(uint32_t fibnum, stru if (IN6_IS_SCOPE_LINKLOCAL(dst)) { /* Do not lookup link-local addresses in rtable */ /* XXX: Do lwref on egress ifp */ - return (rib6_lla_to_nh_extended(dst, scopeid, prt6)); + return (rib6_lla_to_nh_extended(dst, scopeid, flags, prt6)); } KASSERT((fibnum < rt_numfibs), ("rib6_lookup_nh_ext: bad fibnum")); @@ -1312,7 +1253,7 @@ rib6_lookup_nh_ext(uint32_t fibnum, stru rte = RNTORT(rn); /* Ensure route & ifp is UP */ if (RT_LINK_IS_UP(rte->rt_ifp)) { - rib6_rte_to_nh_extended(rte, dst, prt6); + rib6_rte_to_nh_extended(rte, dst, flags, prt6); if ((flags & NHOP_LOOKUP_REF) != 0) { /* TODO: Do lwref on egress ifp's */ } Modified: projects/routing/sys/net/rt_nhops.h ============================================================================== --- projects/routing/sys/net/rt_nhops.h Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/net/rt_nhops.h Thu Nov 20 22:41:59 2014 (r274763) @@ -216,23 +216,21 @@ struct route_info { uint32_t scopeid; /* Desired scope id to use */ }; -int fib4_lookup_nh_ifp(uint32_t fibnum, struct in_addr dst, uint32_t flowid, - struct nhop4_basic *pnh4); -int fib4_lookup_nh_basic(uint32_t fibnum, struct in_addr dst, uint32_t flowid, - struct nhop4_basic *pnh4); +#define NHOP_LOOKUP_REF 0x01 /* reference objects in passed structure */ +#define NHOP_LOOKUP_AIFP 0x02 /* return route "address" interface */ + +int fib4_lookup_nh(uint32_t fibnum, struct in_addr dst, uint32_t flowid, + uint32_t flags, struct nhop4_basic *pnh4); int fib4_lookup_nh_ext(uint32_t fibnum, struct in_addr dst, uint32_t flowid, uint32_t flags, struct nhop4_extended *pnh4); void fib4_free_nh_ext(uint32_t fibnum, struct nhop4_extended *pnh4); -#define NHOP_LOOKUP_REF 0x01 int rib4_lookup_nh_ext(uint32_t fibnum, struct in_addr dst, uint32_t flowid, uint32_t flags, struct rt4_extended *prt4); void rib4_free_nh_ext(uint32_t fibnum, struct rt4_extended *prt4); -int fib6_lookup_nh_ifp(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, - uint32_t flowid, struct nhop6_basic *pnh6); -int fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr *dst, - uint32_t scopeid, uint32_t flowid, struct nhop6_basic *pnh6); +int fib6_lookup_nh(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + uint32_t flowid, uint32_t flags, struct nhop6_basic *pnh6); int fib6_lookup_nh_ext(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, uint32_t flowid, uint32_t flags, struct nhop6_extended *pnh6); Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet/in.c Thu Nov 20 22:41:59 2014 (r274763) @@ -1024,7 +1024,7 @@ in_lltable_rtcheck(struct ifnet *ifp, u_ ("sin_family %d", l3addr->sa_family)); dst = ((struct sockaddr_in *)l3addr)->sin_addr; - if (fib4_lookup_nh_ifp(ifp->if_fib, dst, 0, &nh4) != 0) + if (fib4_lookup_nh(ifp->if_fib, dst, 0, 0, &nh4) != 0) return (EINVAL); /* Modified: projects/routing/sys/netinet/in_gif.c ============================================================================== --- projects/routing/sys/netinet/in_gif.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet/in_gif.c Thu Nov 20 22:41:59 2014 (r274763) @@ -193,7 +193,7 @@ gif_validate4(const struct ip *ip, struc fibnum = sc->gif_fibnum; - if (fib4_lookup_nh_basic(fibnum, ip->ip_src, 0, &nh4) != 0) + if (fib4_lookup_nh(fibnum, ip->ip_src, 0, 0, &nh4) != 0) return (0); if (nh4.nh_ifp != ifp) return (0); Modified: projects/routing/sys/netinet/in_mcast.c ============================================================================== --- projects/routing/sys/netinet/in_mcast.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet/in_mcast.c Thu Nov 20 22:41:59 2014 (r274763) @@ -1898,8 +1898,8 @@ inp_lookup_mcast_ifp(const struct inpcb } else { struct nhop4_basic nh4; - if (fib4_lookup_nh_basic(inp ? inp->inp_inc.inc_fibnum : 0, - gsin->sin_addr, 0, &nh4) != 0) { + if (fib4_lookup_nh(inp ? inp->inp_inc.inc_fibnum : 0, + gsin->sin_addr, 0, 0, &nh4) != 0) { return (nh4.nh_ifp); } else { struct in_ifaddr *ia; Modified: projects/routing/sys/netinet/ip_input.c ============================================================================== --- projects/routing/sys/netinet/ip_input.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet/ip_input.c Thu Nov 20 22:41:59 2014 (r274763) @@ -1466,7 +1466,8 @@ ip_forward(struct mbuf *m, int srcrt) #endif pnh4 = &nh4; - if (fib4_lookup_nh_basic(M_GETFIB(m), ip->ip_dst, 0, &nh4) != 0) + if (fib4_lookup_nh(M_GETFIB(m), ip->ip_dst, 0, NHOP_LOOKUP_AIFP, + &nh4) != 0) pnh4 = NULL; #ifndef IPSEC /* Modified: projects/routing/sys/netinet6/icmp6.c ============================================================================== --- projects/routing/sys/netinet6/icmp6.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet6/icmp6.c Thu Nov 20 22:41:59 2014 (r274763) @@ -2401,7 +2401,7 @@ icmp6_redirect_input(struct mbuf *m, int /* ip6->ip6_src must be equal to gw for icmp6->icmp6_reddst */ struct nhop6_basic nh6; - if (fib6_lookup_nh_basic(RT_DEFAULT_FIB, &reddst6, 0, 0, &nh6)==0) { + if (fib6_lookup_nh(RT_DEFAULT_FIB, &reddst6, 0, 0, 0, &nh6)==0) { /* XXX: Think about AF_LINK GW */ if ((nh6.nh_flags & NHF_GATEWAY) == 0) { nd6log((LOG_ERR, Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet6/in6.c Thu Nov 20 22:41:59 2014 (r274763) @@ -2188,7 +2188,7 @@ in6_lltable_rtcheck(struct ifnet *ifp, /* Our local addresses are always only installed on the default FIB. */ in6_splitscope(&((struct sockaddr_in6 *)l3addr)->sin6_addr, &dst, &scopeid); - error = fib6_lookup_nh_ifp(RT_DEFAULT_FIB, &dst, scopeid, 0, &nh6); + error = fib6_lookup_nh(RT_DEFAULT_FIB, &dst, scopeid, 0, 0, &nh6); if (error != 0 || ((nh6.nh_flags & NHF_GATEWAY) != 0) || nh6.nh_ifp != ifp) { struct ifaddr *ifa; /* Modified: projects/routing/sys/netinet6/in6_gif.c ============================================================================== --- projects/routing/sys/netinet6/in6_gif.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet6/in6_gif.c Thu Nov 20 22:41:59 2014 (r274763) @@ -203,7 +203,7 @@ gif_validate6(const struct ip6_hdr *ip6, fibnum = sc->gif_fibnum; in6_splitscope(&ip6->ip6_src, &src, &scopeid); - if (fib6_lookup_nh_basic(fibnum, &src, scopeid, 0, &nh6) != 0) + if (fib6_lookup_nh(fibnum, &src, scopeid, 0, 0, &nh6) != 0) return (0); if (nh6.nh_ifp != ifp) return (0); Modified: projects/routing/sys/netinet6/in6_mcast.c ============================================================================== --- projects/routing/sys/netinet6/in6_mcast.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet6/in6_mcast.c Thu Nov 20 22:41:59 2014 (r274763) @@ -1786,7 +1786,7 @@ in6p_lookup_mcast_ifp(const struct inpcb in6_splitscope(&gsin6->sin6_addr, &dst, &scopeid); fibnum = in6p ? in6p->inp_inc.inc_fibnum : RT_DEFAULT_FIB; - if (fib6_lookup_nh_ifp(fibnum, &dst, scopeid, 0, &nh6) != 0) + if (fib6_lookup_nh(fibnum, &dst, scopeid, 0, 0, &nh6) != 0) return (NULL); return (nh6.nh_ifp); Modified: projects/routing/sys/netinet6/in6_src.c ============================================================================== --- projects/routing/sys/netinet6/in6_src.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet6/in6_src.c Thu Nov 20 22:41:59 2014 (r274763) @@ -797,7 +797,7 @@ in6_selectif(uint32_t fibnum, struct soc * XXX: Embedded form? */ in6_splitscope(&sin6_next->sin6_addr, &dst, &scopeid); - if (fib6_lookup_nh_basic(fibnum, &dst, scopeid, 0, &nh6) != 0) { + if (fib6_lookup_nh(fibnum, &dst, scopeid, 0, 0, &nh6) != 0) { error = EHOSTUNREACH; goto done; } @@ -815,7 +815,7 @@ in6_selectif(uint32_t fibnum, struct soc } /* Do route lookup */ - if (fib6_lookup_nh_basic(fibnum, &dst, scopeid, 0, &nh6) != 0) { + if (fib6_lookup_nh(fibnum, &dst, scopeid, 0, 0, &nh6) != 0) { error = EHOSTUNREACH; goto done; } @@ -829,8 +829,6 @@ in6_selectif(uint32_t fibnum, struct soc * (this may happen when we are sending a packet to one of * our own addresses.) * - * XXX: basic_ means we return "proper" interface address. - * */ if (opts && opts->ip6po_pktinfo && opts->ip6po_pktinfo->ipi6_ifindex) { if (!(ifp->if_flags & IFF_LOOPBACK) && Modified: projects/routing/sys/netinet6/ip6_output.c ============================================================================== --- projects/routing/sys/netinet6/ip6_output.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netinet6/ip6_output.c Thu Nov 20 22:41:59 2014 (r274763) @@ -1868,8 +1868,8 @@ do { \ * the outgoing interface. * TODO: embedded, Multipath */ - if (fib6_lookup_nh_basic(so->so_fibnum, - &in6p->in6p_faddr, 0, 0, &nh6) != 0) { + if (fib6_lookup_nh(so->so_fibnum, + &in6p->in6p_faddr, 0, 0, 0, &nh6) != 0) { error = EHOSTUNREACH; break; } Modified: projects/routing/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- projects/routing/sys/netpfil/ipfw/ip_fw2.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netpfil/ipfw/ip_fw2.c Thu Nov 20 22:41:59 2014 (r274763) @@ -440,7 +440,7 @@ verify_path(struct in_addr src, struct i #else struct nhop4_basic nh4; - if (fib4_lookup_nh_basic(fib, src, 0, &nh4) != 0) + if (fib4_lookup_nh(fib, src, 0, NHOP_LOOKUP_AIFP, &nh4) != 0) return (0); /* @@ -519,7 +519,7 @@ verify_path6(struct in6_addr *src, struc struct nhop6_basic nh6; /* XXX: unembed scope? */ - if (fib6_lookup_nh_basic(fib, src, 0, 0, &nh6) != 0) + if (fib6_lookup_nh(fib, src, 0, 0, NHOP_LOOKUP_AIFP, &nh6) != 0) return (0); /* If ifp is provided, check for equality with route table. */ Modified: projects/routing/sys/netpfil/pf/pf.c ============================================================================== --- projects/routing/sys/netpfil/pf/pf.c Thu Nov 20 21:54:32 2014 (r274762) +++ projects/routing/sys/netpfil/pf/pf.c Thu Nov 20 22:41:59 2014 (r274763) @@ -2915,15 +2915,14 @@ pf_calc_mss(struct pf_addr *addr, sa_fam #ifdef INET case AF_INET: hlen = sizeof(struct ip); - if (fib4_lookup_nh_basic(rtableid, addr->v4, 0, &nh.u.nh4) == 0) + if (fib4_lookup_nh(rtableid, addr->v4, 0, 0, &nh.u.nh4) == 0) mss = nh.u.nh4.nh_mtu - hlen - sizeof(struct tcphdr); break; #endif /* INET */ #ifdef INET6 case AF_INET6: hlen = sizeof(struct ip6_hdr); - if (fib6_lookup_nh_basic(rtableid, &addr->v6, 0, 0, &nh.u.nh6) - == 0) + if (fib6_lookup_nh(rtableid, &addr->v6, 0, 0, 0, &nh.u.nh6)==0) mss = nh.u.nh6.nh_mtu - hlen - sizeof(struct tcphdr); break; #endif /* INET6 */ @@ -5100,14 +5099,13 @@ pf_routable(struct pf_addr *addr, sa_fam */ if (IN6_IS_SCOPE_EMBED(&addr->v6)) return (1); - if (fib6_lookup_nh_basic(rtableid, &addr->v6, 0, 0, &nh.u.nh6) - != 0) + if (fib6_lookup_nh(rtableid, &addr->v6, 0, 0, 0, &nh.u.nh6)!=0) return (0); break; #endif #ifdef INET case AF_INET: - if (fib4_lookup_nh_basic(rtableid, addr->v4, 0, &nh.u.nh4) != 0) + if (fib4_lookup_nh(rtableid, addr->v4, 0, 0, &nh.u.nh4) != 0) return (0); break; #endif From owner-svn-src-projects@FreeBSD.ORG Thu Nov 20 22:42:41 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF307D29; Thu, 20 Nov 2014 22:42:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB052A13; Thu, 20 Nov 2014 22:42:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKMgfi1098339; Thu, 20 Nov 2014 22:42:41 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKMgf9b098332; Thu, 20 Nov 2014 22:42:41 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411202242.sAKMgf9b098332@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Thu, 20 Nov 2014 22:42:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274764 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 22:42:41 -0000 Author: sjg Date: Thu Nov 20 22:42:40 2014 New Revision: 274764 URL: https://svnweb.freebsd.org/changeset/base/274764 Log: Use latest version Modified: projects/bmake/share/mk/dirdeps.mk projects/bmake/share/mk/meta.stage.mk Modified: projects/bmake/share/mk/dirdeps.mk ============================================================================== --- projects/bmake/share/mk/dirdeps.mk Thu Nov 20 22:41:59 2014 (r274763) +++ projects/bmake/share/mk/dirdeps.mk Thu Nov 20 22:42:40 2014 (r274764) @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.33 2014/03/14 22:25:35 sjg Exp $ +# $Id: dirdeps.mk,v 1.38 2014/11/20 22:22:30 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -111,7 +111,9 @@ # TARGET_SPEC = ${TARGET_SPEC_VARS:@v@${$v:U}@:ts,} # -.if ${.MAKE.LEVEL} == 0 +# touch this at your peril +_DIRDEP_USE_LEVEL?= 0 +.if ${.MAKE.LEVEL} == ${_DIRDEP_USE_LEVEL} # only the first instance is interested in all this # First off, we want to know what ${MACHINE} to build for. @@ -201,7 +203,7 @@ _last_dependfile := ${.INCLUDEDFROMFILE: .else _last_dependfile := ${.MAKE.MAKEFILES:M*/${.MAKE.DEPENDFILE_PREFIX}*:[-1]} .endif -.if !empty(_debug_reldir) +.if ${_debug_reldir:U0} .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: _last_dependfile='${_last_dependfile}' .endif @@ -260,7 +262,7 @@ _DEP_RELDIR := ${DEP_RELDIR} # things we skip for host tools SKIP_HOSTDIR ?= -NSkipHostDir = ${SKIP_HOSTDIR:N*.host:S,$,.host,:N.host:${M_ListToSkip}} +NSkipHostDir = ${SKIP_HOSTDIR:N*.host*:S,$,.host*,:N.host*:S,^,${SRCTOP}/,:${M_ListToSkip}} # things we always skip # SKIP_DIRDEPS allows for adding entries on command line. @@ -282,7 +284,7 @@ DIRDEPS_FILTER += M${_DEP_RELDIR}* # this is what we run below DIRDEP_MAKE?= ${.MAKE} -# we supress SUBDIR when visiting the leaves +# we suppress SUBDIR when visiting the leaves # we assume sys.mk will set MACHINE_ARCH # you can add extras to DIRDEP_USE_ENV # if there is no makefile in the target directory, we skip it. @@ -332,8 +334,16 @@ _only_machines := ${_only_machines:${NOT DIRDEPS ?= ${RELDIR} .endif # target -_debug_reldir := ${DEBUG_DIRDEPS:@x@${DEP_RELDIR:M$x}${${DEP_RELDIR}.${DEP_MACHINE}:L:M$x}@} -_debug_search := ${DEBUG_DIRDEPS:@x@${DEP_RELDIR:M$x}${${DEP_RELDIR}.depend:L:M$x}@} +.if ${DEBUG_DIRDEPS:@x@${DEP_RELDIR:M$x}${${DEP_RELDIR}.${DEP_MACHINE}:L:M$x}@} != "" +_debug_reldir = 1 +.else +_debug_reldir = 0 +.endif +.if ${DEBUG_DIRDEPS:@x@${DEP_RELDIR:M$x}${${DEP_RELDIR}.depend:L:M$x}@} != "" +_debug_search = 1 +.else +_debug_search = 0 +.endif # the rest is done repeatedly for every Makefile.depend we read. # if we are anything but the original dir we care only about the @@ -368,7 +378,8 @@ _machines := ${_machines:O:u} # we need to tweak _machines _dm := ${DEP_MACHINE} # apply the same filtering that we do when qualifying DIRDEPS. -_machines := ${_machines:@DEP_MACHINE@${DEP_TARGET_SPEC}@:${M_dep_qual_fixes:ts:}:O:u} +# M_dep_qual_fixes expects .${MACHINE}* so add (and remove) '.' +_machines := ${_machines:@DEP_MACHINE@${DEP_TARGET_SPEC}@:S,^,.,:${M_dep_qual_fixes:ts:}:O:u:S,^.,,} DEP_MACHINE := ${_dm} .endif @@ -388,7 +399,7 @@ _build_dirs += ${_machines:N${DEP_TARGET .endif .endif -.if !empty(_debug_reldir) +.if ${_debug_reldir} .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: DIRDEPS='${DIRDEPS}' .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: _machines='${_machines}' .endif @@ -419,7 +430,7 @@ __hostdpadd := ${DPADD:U.:M${HOST_OBJTOP __qual_depdirs += ${__hostdpadd} .endif -.if !empty(_debug_reldir) +.if ${_debug_reldir} .info depdirs=${__depdirs} .info qualified=${__qual_depdirs} .info unqualified=${__unqual_depdirs} @@ -429,7 +440,8 @@ __qual_depdirs += ${__hostdpadd} _build_dirs += \ ${__qual_depdirs:M*.host:${NSkipHostDir}:N.host} \ ${__qual_depdirs:N*.host} \ - ${_machines:@m@${__unqual_depdirs:@d@$d.$m@}@} + ${_machines:Mhost*:@m@${__unqual_depdirs:@d@$d.$m@}@:${NSkipHostDir}:N.host} \ + ${_machines:Nhost*:@m@${__unqual_depdirs:@d@$d.$m@}@} # qualify everything now _build_dirs := ${_build_dirs:${M_dep_qual_fixes:ts:}:O:u} @@ -445,7 +457,7 @@ _build_dirs := ${_build_dirs:${M_dep_qua dirdeps: ${_build_dirs} ${_build_dirs}: _DIRDEP_USE -.if !empty(_debug_reldir) +.if ${_debug_reldir} .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: needs: ${_build_dirs} .endif @@ -454,13 +466,13 @@ ${_build_dirs}: _DIRDEP_USE # it would be nice to do :N${.TARGET} .if !empty(__qual_depdirs) .for q in ${__qual_depdirs:${M_dep_qual_fixes:ts:}:E:O:u:N$m} -.if !empty(_debug_reldir) || ${DEBUG_DIRDEPS:@x@${${DEP_RELDIR}.$m:L:M$x}${${DEP_RELDIR}.$q:L:M$x}@} != "" +.if ${_debug_reldir} || ${DEBUG_DIRDEPS:@x@${${DEP_RELDIR}.$m:L:M$x}${${DEP_RELDIR}.$q:L:M$x}@} != "" .info ${DEP_RELDIR}.$m: graph: ${_build_dirs:M*.$q} .endif ${_this_dir}.$m: ${_build_dirs:M*.$q} .endfor .endif -.if !empty(_debug_reldir) +.if ${_debug_reldir} .info ${DEP_RELDIR}.$m: graph: ${_build_dirs:M*.$m:N${_this_dir}.$m} .endif ${_this_dir}.$m: ${_build_dirs:M*.$m:N${_this_dir}.$m} @@ -473,7 +485,7 @@ ${_this_dir}.$m: ${_build_dirs:M*.$m:N${ .if ${_DIRDEP_CHECKED:M$d} == "" # once only _DIRDEP_CHECKED += $d -.if !empty(_debug_search) +.if ${_debug_search} .info checking $d .endif # Note: _build_dirs is fully qualifed so d:R is always the directory @@ -485,14 +497,14 @@ _m := ${.MAKE.DEPENDFILE_PREFERENCE:T:S; .if !empty(_m) # M_dep_qual_fixes isn't geared to Makefile.depend _qm := ${_m:C;(\.depend)$;\1.${d:E};:${M_dep_qual_fixes:ts:}} -.if !empty(_debug_search) +.if ${_debug_search} .info Looking for ${_qm} .endif # we pass _DEP_TARGET_SPEC to tell the next step what we want _DEP_TARGET_SPEC := ${d:E} # some makefiles may still look at this _DEP_MACHINE := ${d:E:C/,.*//} -.if !empty(_debug_reldir) && ${_qm} != ${_m} +.if ${_debug_reldir} && ${_qm} != ${_m} .info loading ${_m} for ${d:E} .endif .include <${_m}> @@ -511,3 +523,37 @@ _DEP_RELDIR := ${DEP_RELDIR} .-include <.depend> .endif +# bootstrapping new dependencies made easy? +.if make(bootstrap*) && !target(bootstrap) + +.if exists(${.CURDIR}/${.MAKE.DEPENDFILE:T}) +# stop here +${.TARGETS:Mboot*}: +.else +# find a Makefile.depend to use as _src +_src != cd ${.CURDIR} && for m in ${.MAKE.DEPENDFILE_PREFERENCE:T:S,${MACHINE},*,}; do test -s $$m || continue; echo $$m; break; done; echo +.if empty(_src) +.error cannot find any of ${.MAKE.DEPENDFILE_PREFERENCE:T} +.endif + +_src?= ${.MAKE.DEPENDFILE:T} + +bootstrap-this: .NOTMAIN + @echo Bootstrapping ${RELDIR}/${.MAKE.DEPENDFILE:T} from ${_src:T} + (cd ${.CURDIR} && sed 's,${_src:E},${MACHINE},g' ${_src} > ${.MAKE.DEPENDFILE:T}) + +bootstrap: bootstrap-recurse +bootstrap-recurse: bootstrap-this + +_mf := ${.PARSEFILE} +bootstrap-recurse: .NOTMAIN .MAKE + @cd ${SRCTOP} && \ + for d in `cd ${RELDIR} && ${.MAKE} -B -f ${"${.MAKEFLAGS:M-n}":?${_src}:${.MAKE.DEPENDFILE:T}} -V DIRDEPS`; do \ + test -d $$d || d=$${d%.*}; \ + test -d $$d || continue; \ + echo "Checking $$d for bootstrap ..."; \ + (cd $$d && ${.MAKE} -f ${_mf} bootstrap-recurse); \ + done + +.endif +.endif Modified: projects/bmake/share/mk/meta.stage.mk ============================================================================== --- projects/bmake/share/mk/meta.stage.mk Thu Nov 20 22:41:59 2014 (r274763) +++ projects/bmake/share/mk/meta.stage.mk Thu Nov 20 22:42:40 2014 (r274764) @@ -1,4 +1,4 @@ -# $Id: meta.stage.mk,v 1.30 2013/04/19 16:32:57 sjg Exp $ +# $Id: meta.stage.mk,v 1.34 2014/11/20 22:40:08 sjg Exp $ # # @(#) Copyright (c) 2011, Simon J. Gerraty # @@ -52,7 +52,7 @@ STAGE_DIR_FILTER = tA:@d@$${_STAGED_DIRS # convert _STAGED_DIRS into suitable filters GENDIRDEPS_FILTER += Nnot-empty-is-important \ ${_STAGED_DIRS:O:u:M${OBJTOP}*:S,${OBJTOP}/,N,} \ - ${_STAGED_DIRS:O:u:N${OBJTOP}*:S,${_objroot},,:C,^([^/]+)/(.*),N\2.\1,:S,${HOST_TARGET},.host,} + ${_STAGED_DIRS:O:u:M${_objroot}*:N${OBJTOP}*:S,${_objroot},,:C,^([^/]+)/(.*),N\2.\1,:S,${HOST_TARGET},.host,} LN_CP_SCRIPT = LnCp() { \ rm -f $$2 2> /dev/null; \ @@ -119,6 +119,9 @@ STAGE_AS_SCRIPT = ${STAGE_DIRDEP_SCRIPT} _STAGE_BASENAME_USE: .USE ${.TARGET:T} @${STAGE_FILE_SCRIPT}; StageFiles ${.TARGET:H:${STAGE_DIR_FILTER}} ${.TARGET:T} +_STAGE_AS_BASENAME_USE: .USE ${.TARGET:T} + @${STAGE_AS_SCRIPT}; StageAs ${.TARGET:H:${STAGE_DIR_FILTER}} ${.TARGET:T} ${STAGE_AS_${.TARGET:T}:U${.TARGET:T}} + .if !empty(STAGE_INCSDIR) STAGE_TARGETS += stage_incs STAGE_INCS ?= ${.ALLSRC:N.dirdep} @@ -249,5 +252,26 @@ INSTALL := ${STAGE_INSTALL} beforeinstall: .dirdep .endif .endif +.NOPATH: ${STAGE_FILES} + +.if !empty(STAGE_TARGETS) +MK_STALE_STAGED?= no +.if ${MK_STALE_STAGED} == "yes" +all: stale_staged +# get a list of paths that we have just staged +# get a list of paths that we have previously staged to those same dirs +# anything in the 2nd list but not the first is stale - remove it. +stale_staged: staging .NOMETA + @egrep '^[WL] .*${STAGE_OBJTOP}' /dev/null ${.MAKE.META.FILES:M*stage_*} | \ + sed "/\.dirdep/d;s,.* '*\(${STAGE_OBJTOP}/[^ '][^ ']*\).*,\1," | \ + sort > ${.TARGET}.staged1 + @grep -l '${_dirdep}' /dev/null ${_STAGED_DIRS:M${STAGE_OBJTOP}*:O:u:@d@$d/*.dirdep@} | \ + sed 's,\.dirdep,,' | sort > ${.TARGET}.staged2 + @comm -13 ${.TARGET}.staged1 ${.TARGET}.staged2 > ${.TARGET}.stale + @test ! -s ${.TARGET}.stale || { \ + echo "Removing stale staged files..."; \ + sed 's,.*,& &.dirdep,' ${.TARGET}.stale | xargs rm -f; } .endif +.endif +.endif From owner-svn-src-projects@FreeBSD.ORG Thu Nov 20 23:00:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F37321F3; Thu, 20 Nov 2014 23:00:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DDAF8BFB; Thu, 20 Nov 2014 23:00:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKN0Jn1020975; Thu, 20 Nov 2014 23:00:19 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKN0HP3019382; Thu, 20 Nov 2014 23:00:17 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411202300.sAKN0HP3019382@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 20 Nov 2014 23:00:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274765 - in projects/sendfile: sbin/fsck sys/cam/scsi sys/dev/ct sys/dev/ncv sys/dev/nsp sys/dev/stg sys/dev/wl sys/i386/isa X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 23:00:20 -0000 Author: glebius Date: Thu Nov 20 23:00:17 2014 New Revision: 274765 URL: https://svnweb.freebsd.org/changeset/base/274765 Log: Merge head r258543 through r274762. Modified: projects/sendfile/sbin/fsck/fsck.c projects/sendfile/sys/cam/scsi/scsi_low.c projects/sendfile/sys/cam/scsi/scsi_low.h projects/sendfile/sys/cam/scsi/scsi_xpt.c projects/sendfile/sys/dev/ct/bshw_machdep.c projects/sendfile/sys/dev/ct/ct.c projects/sendfile/sys/dev/ct/ct_isa.c projects/sendfile/sys/dev/ct/ct_machdep.h projects/sendfile/sys/dev/ct/ctvar.h projects/sendfile/sys/dev/ncv/ncr53c500.c projects/sendfile/sys/dev/ncv/ncr53c500_pccard.c projects/sendfile/sys/dev/ncv/ncr53c500var.h projects/sendfile/sys/dev/nsp/nsp.c projects/sendfile/sys/dev/nsp/nsp_pccard.c projects/sendfile/sys/dev/nsp/nspvar.h projects/sendfile/sys/dev/stg/tmc18c30.c projects/sendfile/sys/dev/stg/tmc18c30_isa.c projects/sendfile/sys/dev/stg/tmc18c30_pccard.c projects/sendfile/sys/dev/stg/tmc18c30_pci.c projects/sendfile/sys/dev/stg/tmc18c30_subr.c projects/sendfile/sys/dev/stg/tmc18c30var.h projects/sendfile/sys/dev/wl/if_wl.c projects/sendfile/sys/dev/wl/if_wl.h projects/sendfile/sys/i386/isa/spic.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/sys/ (props changed) Modified: projects/sendfile/sbin/fsck/fsck.c ============================================================================== --- projects/sendfile/sbin/fsck/fsck.c Thu Nov 20 22:42:40 2014 (r274764) +++ projects/sendfile/sbin/fsck/fsck.c Thu Nov 20 23:00:17 2014 (r274765) @@ -41,7 +41,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#define FSTYPENAMES +#include #include #include @@ -80,21 +81,10 @@ static void addentry(struct fstypelist * static void maketypelist(char *); static void catopt(char **, const char *); static void mangle(char *, int *, const char ** volatile *, int *); -static const char *getfstype(const char *); +static const char *getfslab(const char *); static void usage(void) __dead2; static int isok(struct fstab *); -static struct { - const char *ptype; - const char *name; -} ptype_map[] = { - { "ufs", "ffs" }, - { "ffs", "ffs" }, - { "fat", "msdosfs" }, - { "efi", "msdosfs" }, - { NULL, NULL }, -}; - int main(int argc, char *argv[]) { @@ -213,7 +203,7 @@ main(int argc, char *argv[]) if ((fs = getfsfile(spec)) == NULL && (fs = getfsspec(spec)) == NULL) { if (vfstype == NULL) - vfstype = getfstype(spec); + vfstype = getfslab(spec); if (vfstype == NULL) errx(1, "Could not determine filesystem type"); type = vfstype; @@ -545,27 +535,41 @@ mangle(char *opts, int *argcp, const cha *maxargcp = maxargc; } + static const char * -getfstype(const char *str) +getfslab(const char *str) { - struct diocgattr_arg attr; - int fd, i; + struct disklabel dl; + int fd; + char p; + const char *vfstype; + u_char t; + /* deduce the file system type from the disk label */ if ((fd = open(str, O_RDONLY)) == -1) err(1, "cannot open `%s'", str); - strncpy(attr.name, "PART::type", sizeof(attr.name)); - memset(&attr.value, 0, sizeof(attr.value)); - attr.len = sizeof(attr.value); - if (ioctl(fd, DIOCGATTR, &attr) == -1) { + if (ioctl(fd, DIOCGDINFO, &dl) == -1) { (void) close(fd); return(NULL); } + (void) close(fd); - for (i = 0; ptype_map[i].ptype != NULL; i++) - if (strstr(attr.value.str, ptype_map[i].ptype) != NULL) - return (ptype_map[i].name); - return (NULL); + + p = str[strlen(str) - 1]; + + if ((p - 'a') >= dl.d_npartitions) + errx(1, "partition `%s' is not defined on disk", str); + + if ((t = dl.d_partitions[p - 'a'].p_fstype) >= FSMAXTYPES) + errx(1, "partition `%s' is not of a legal vfstype", + str); + + if ((vfstype = fstypenames[t]) == NULL) + errx(1, "vfstype `%s' on partition `%s' is not supported", + fstypenames[t], str); + + return vfstype; } Modified: projects/sendfile/sys/cam/scsi/scsi_low.c ============================================================================== --- projects/sendfile/sys/cam/scsi/scsi_low.c Thu Nov 20 22:42:40 2014 (r274764) +++ projects/sendfile/sys/cam/scsi/scsi_low.c Thu Nov 20 23:00:17 2014 (r274765) @@ -150,6 +150,8 @@ int scsi_low_version_major = 2; int scsi_low_version_minor = 17; static struct scsi_low_softc_tab sl_tab = LIST_HEAD_INITIALIZER(sl_tab); +static struct mtx sl_tab_lock; +MTX_SYSINIT(sl_tab_lock, &sl_tab_lock, "scsi low table", MTX_DEF); /************************************************************** * Debug, Run test and Statics @@ -365,21 +367,10 @@ static void scsi_low_poll_cam(struct cam void scsi_low_scsi_action_cam(struct cam_sim *, union ccb *); static int scsi_low_attach_cam(struct scsi_low_softc *); -static int scsi_low_world_start_cam(struct scsi_low_softc *); -static int scsi_low_dettach_cam(struct scsi_low_softc *); +static int scsi_low_detach_cam(struct scsi_low_softc *); static int scsi_low_ccb_setup_cam(struct scsi_low_softc *, struct slccb *); static int scsi_low_done_cam(struct scsi_low_softc *, struct slccb *); -static void scsi_low_timeout_cam(struct scsi_low_softc *, int, int); -struct scsi_low_osdep_funcs scsi_low_osdep_funcs_cam = { - scsi_low_attach_cam, - scsi_low_world_start_cam, - scsi_low_dettach_cam, - scsi_low_ccb_setup_cam, - scsi_low_done_cam, - scsi_low_timeout_cam -}; - struct scsi_low_error_code scsi_low_error_code_cam[] = { {0, CAM_REQ_CMP}, {SENSEIO, CAM_AUTOSNS_VALID | CAM_REQ_CMP_ERR}, @@ -409,12 +400,13 @@ scsi_low_poll_cam(sim) { struct scsi_low_softc *slp = SIM2SLP(sim); + SCSI_LOW_ASSERT_LOCKED(slp); (*slp->sl_funcs->scsi_low_poll) (slp); - if (slp->sl_si.si_poll_count ++ >= + if (slp->sl_poll_count ++ >= SCSI_LOW_CAM_POLL_HZ / SCSI_LOW_TIMEOUT_HZ) { - slp->sl_si.si_poll_count = 0; + slp->sl_poll_count = 0; scsi_low_timeout_check(slp); } } @@ -429,8 +421,9 @@ scsi_low_scsi_action_cam(sim, ccb) struct lun_info *li; struct slccb *cb; u_int lun, flags, msg, target; - int s, rv; + int rv; + SCSI_LOW_ASSERT_LOCKED(slp); target = (u_int) (ccb->ccb_h.target_id); lun = (u_int) ccb->ccb_h.target_lun; @@ -469,7 +462,6 @@ scsi_low_scsi_action_cam(sim, ccb) else flags = CCB_SCSIIO; - s = splcam(); li = scsi_low_alloc_li(ti, lun, 1); if (ti->ti_setup_msg != 0) @@ -485,7 +477,6 @@ scsi_low_scsi_action_cam(sim, ccb) scsi_low_test_abort(slp, ti, li); } #endif /* SCSI_LOW_DEBUG */ - splx(s); break; case XPT_EN_LUN: /* Enable LUN as a target */ @@ -508,10 +499,8 @@ scsi_low_scsi_action_cam(sim, ccb) } #endif /* SCSI_LOW_DIAGNOSTIC */ - s = splcam(); cb = scsi_low_find_ccb(slp, target, lun, ccb->cab.abort_ccb); rv = scsi_low_abort_ccb(slp, cb); - splx(s); if (rv == 0) ccb->ccb_h.status = CAM_REQ_CMP; @@ -540,7 +529,6 @@ scsi_low_scsi_action_cam(sim, ccb) if (lun == CAM_LUN_WILDCARD) lun = 0; - s = splcam(); scsi = &cts->proto_specific.scsi; spi = &cts->xport_specific.spi; if ((spi->valid & (CTS_SPI_VALID_BUS_WIDTH | @@ -587,7 +575,6 @@ scsi_low_scsi_action_cam(sim, ccb) if ((slp->sl_show_result & SHOW_CALCF_RES) != 0) scsi_low_calcf_show(li); } - splx(s); ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); @@ -612,7 +599,6 @@ scsi_low_scsi_action_cam(sim, ccb) if (lun == CAM_LUN_WILDCARD) lun = 0; - s = splcam(); li = scsi_low_alloc_li(ti, lun, 1); if (li != NULL && cts->type == CTS_TYPE_CURRENT_SETTINGS) { struct ccb_trans_settings_scsi *scsi = @@ -658,7 +644,6 @@ scsi_low_scsi_action_cam(sim, ccb) } else ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; settings_out: - splx(s); xpt_done(ccb); break; } @@ -670,9 +655,7 @@ settings_out: } case XPT_RESET_BUS: /* Reset the specified SCSI bus */ - s = splcam(); scsi_low_restart(slp, SCSI_LOW_RESTART_HARD, NULL); - splx(s); ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; @@ -711,10 +694,8 @@ settings_out: else flags = CCB_NORETRY | CCB_URGENT; - s = splcam(); li = scsi_low_alloc_li(ti, lun, 1); scsi_low_enqueue(slp, ti, li, cb, flags, msg); - splx(s); break; case XPT_PATH_INQ: { /* Path routing inquiry */ @@ -774,51 +755,47 @@ scsi_low_attach_cam(slp) * ask the adapter what subunits are present */ tagged_openings = min(slp->sl_openings, SCSI_LOW_MAXNEXUS); - slp->sl_si.sim = cam_sim_alloc(scsi_low_scsi_action_cam, + slp->sl_sim = cam_sim_alloc(scsi_low_scsi_action_cam, scsi_low_poll_cam, device_get_name(slp->sl_dev), slp, - device_get_unit(slp->sl_dev), &Giant, + device_get_unit(slp->sl_dev), &slp->sl_lock, slp->sl_openings, tagged_openings, devq); - if (slp->sl_si.sim == NULL) { + if (slp->sl_sim == NULL) { cam_simq_free(devq); return ENODEV; } - if (xpt_bus_register(slp->sl_si.sim, NULL, 0) != CAM_SUCCESS) { - free(slp->sl_si.sim, M_SCSILOW); + SCSI_LOW_LOCK(slp); + if (xpt_bus_register(slp->sl_sim, slp->sl_dev, 0) != CAM_SUCCESS) { + cam_sim_free(slp->sl_sim, TRUE); + SCSI_LOW_UNLOCK(slp); return ENODEV; } - if (xpt_create_path(&slp->sl_si.path, /*periph*/NULL, - cam_sim_path(slp->sl_si.sim), CAM_TARGET_WILDCARD, + if (xpt_create_path(&slp->sl_path, /*periph*/NULL, + cam_sim_path(slp->sl_sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { - xpt_bus_deregister(cam_sim_path(slp->sl_si.sim)); - cam_sim_free(slp->sl_si.sim, /*free_simq*/TRUE); + xpt_bus_deregister(cam_sim_path(slp->sl_sim)); + cam_sim_free(slp->sl_sim, /*free_simq*/TRUE); + SCSI_LOW_UNLOCK(slp); return ENODEV; } slp->sl_show_result = SHOW_CALCF_RES; /* OK ? */ + SCSI_LOW_UNLOCK(slp); return 0; } static int -scsi_low_world_start_cam(slp) - struct scsi_low_softc *slp; -{ - - return 0; -} - -static int -scsi_low_dettach_cam(slp) +scsi_low_detach_cam(slp) struct scsi_low_softc *slp; { - xpt_async(AC_LOST_DEVICE, slp->sl_si.path, NULL); - xpt_free_path(slp->sl_si.path); - xpt_bus_deregister(cam_sim_path(slp->sl_si.sim)); - cam_sim_free(slp->sl_si.sim, /* free_devq */ TRUE); + xpt_async(AC_LOST_DEVICE, slp->sl_path, NULL); + xpt_free_path(slp->sl_path); + xpt_bus_deregister(cam_sim_path(slp->sl_sim)); + cam_sim_free(slp->sl_sim, /* free_devq */ TRUE); return 0; } @@ -906,48 +883,6 @@ scsi_low_done_cam(slp, cb) return 0; } -static void -scsi_low_timeout_cam(slp, ch, action) - struct scsi_low_softc *slp; - int ch; - int action; -{ - - switch (ch) - { - case SCSI_LOW_TIMEOUT_CH_IO: - switch (action) - { - case SCSI_LOW_TIMEOUT_START: - slp->sl_si.timeout_ch = timeout(scsi_low_timeout, slp, - hz / SCSI_LOW_TIMEOUT_HZ); - break; - case SCSI_LOW_TIMEOUT_STOP: - untimeout(scsi_low_timeout, slp, slp->sl_si.timeout_ch); - break; - } - break; - - case SCSI_LOW_TIMEOUT_CH_ENGAGE: - switch (action) - { - case SCSI_LOW_TIMEOUT_START: - slp->sl_si.engage_ch = timeout(scsi_low_engage, slp, 1); - break; - case SCSI_LOW_TIMEOUT_STOP: - untimeout(scsi_low_engage, slp, slp->sl_si.engage_ch); - break; - } - break; - case SCSI_LOW_TIMEOUT_CH_RECOVER: - break; - } -} - -/*============================================================= - * END OF OS switch (All OS depend fucntions should be above) - =============================================================*/ - /************************************************************** * scsi low deactivate and activate **************************************************************/ @@ -965,15 +900,10 @@ int scsi_low_deactivate(slp) struct scsi_low_softc *slp; { - int s; - s = splcam(); slp->sl_flags |= HW_INACTIVE; - (*slp->sl_osdep_fp->scsi_low_osdep_timeout) - (slp, SCSI_LOW_TIMEOUT_CH_IO, SCSI_LOW_TIMEOUT_STOP); - (*slp->sl_osdep_fp->scsi_low_osdep_timeout) - (slp, SCSI_LOW_TIMEOUT_CH_ENGAGE, SCSI_LOW_TIMEOUT_STOP); - splx(s); + callout_stop(&slp->sl_timeout_timer); + callout_stop(&slp->sl_engage_timer); return 0; } @@ -981,21 +911,18 @@ int scsi_low_activate(slp) struct scsi_low_softc *slp; { - int error, s; + int error; - s = splcam(); slp->sl_flags &= ~HW_INACTIVE; if ((error = scsi_low_restart(slp, SCSI_LOW_RESTART_HARD, NULL)) != 0) { slp->sl_flags |= HW_INACTIVE; - splx(s); return error; } slp->sl_timeout_count = 0; - (*slp->sl_osdep_fp->scsi_low_osdep_timeout) - (slp, SCSI_LOW_TIMEOUT_CH_IO, SCSI_LOW_TIMEOUT_START); - splx(s); + callout_reset(&slp->sl_timeout_timer, hz / SCSI_LOW_TIMEOUT_HZ, + scsi_low_timeout, slp); return 0; } @@ -1063,15 +990,15 @@ scsi_low_engage(arg) void *arg; { struct scsi_low_softc *slp = arg; - int s = splcam(); + SCSI_LOW_ASSERT_LOCKED(slp); switch (slp->sl_rstep) { case 0: slp->sl_rstep ++; (*slp->sl_funcs->scsi_low_power) (slp, SCSI_LOW_ENGAGE); - (*slp->sl_osdep_fp->scsi_low_osdep_timeout) (slp, - SCSI_LOW_TIMEOUT_CH_ENGAGE, SCSI_LOW_TIMEOUT_START); + callout_reset(&slp->sl_engage_timer, hz / 1000, + scsi_low_engage, slp); break; case 1: @@ -1083,7 +1010,6 @@ scsi_low_engage(arg) case 2: break; } - splx(s); } static int @@ -1098,8 +1024,7 @@ scsi_low_init(slp, flags) /* clear power control timeout */ if ((slp->sl_flags & HW_POWERCTRL) != 0) { - (*slp->sl_osdep_fp->scsi_low_osdep_timeout) (slp, - SCSI_LOW_TIMEOUT_CH_ENGAGE, SCSI_LOW_TIMEOUT_STOP); + callout_stop(&slp->sl_engage_timer); slp->sl_flags &= ~(HW_POWDOWN | HW_RESUME); slp->sl_active = 1; slp->sl_powc = SCSI_LOW_POWDOWN_TC; @@ -1273,13 +1198,10 @@ scsi_low_timeout(arg) void *arg; { struct scsi_low_softc *slp = arg; - int s; - s = splcam(); + SCSI_LOW_ASSERT_LOCKED(slp); (void) scsi_low_timeout_check(slp); - (*slp->sl_osdep_fp->scsi_low_osdep_timeout) - (slp, SCSI_LOW_TIMEOUT_CH_IO, SCSI_LOW_TIMEOUT_START); - splx(s); + callout_schedule(&slp->sl_timeout_timer, hz / SCSI_LOW_TIMEOUT_HZ); } static int @@ -1459,12 +1381,7 @@ scsi_low_attach(slp, openings, ntargs, n { struct targ_info *ti; struct lun_info *li; - int s, i, nccb, rv; - - slp->sl_osdep_fp = &scsi_low_osdep_funcs_cam; - - if (slp->sl_osdep_fp == NULL) - panic("scsi_low: interface not spcified"); + int i, nccb, rv; if (ntargs > SCSI_LOW_NTARGETS) { @@ -1503,31 +1420,32 @@ scsi_low_attach(slp, openings, ntargs, n TAILQ_INIT(&slp->sl_start); /* call os depend attach */ - s = splcam(); - rv = (*slp->sl_osdep_fp->scsi_low_osdep_attach) (slp); + rv = scsi_low_attach_cam(slp); if (rv != 0) { - splx(s); device_printf(slp->sl_dev, "scsi_low_attach: osdep attach failed\n"); - return EINVAL; + return (rv); } /* check hardware */ DELAY(1000); /* wait for 1ms */ + SCSI_LOW_LOCK(slp); if (scsi_low_init(slp, SCSI_LOW_RESTART_HARD) != 0) { - splx(s); device_printf(slp->sl_dev, "scsi_low_attach: initialization failed\n"); + SCSI_LOW_UNLOCK(slp); return EINVAL; } /* start watch dog */ slp->sl_timeout_count = 0; - (*slp->sl_osdep_fp->scsi_low_osdep_timeout) - (slp, SCSI_LOW_TIMEOUT_CH_IO, SCSI_LOW_TIMEOUT_START); + callout_reset(&slp->sl_timeout_timer, hz / SCSI_LOW_TIMEOUT_HZ, + scsi_low_timeout, slp); + mtx_lock(&sl_tab_lock); LIST_INSERT_HEAD(&sl_tab, slp, sl_chain); + mtx_unlock(&sl_tab_lock); /* fake call */ scsi_low_abort_ccb(slp, scsi_low_find_ccb(slp, 0, 0, NULL)); @@ -1536,38 +1454,40 @@ scsi_low_attach(slp, openings, ntargs, n /* probing devices */ scsi_low_start_up(slp); #endif /* SCSI_LOW_START_UP_CHECK */ + SCSI_LOW_UNLOCK(slp); - /* call os depend attach done*/ - (*slp->sl_osdep_fp->scsi_low_osdep_world_start) (slp); - splx(s); return 0; } int -scsi_low_dettach(slp) +scsi_low_detach(slp) struct scsi_low_softc *slp; { - int s, rv; + int rv; - s = splcam(); + SCSI_LOW_LOCK(slp); if (scsi_low_is_busy(slp) != 0) { - splx(s); + SCSI_LOW_UNLOCK(slp); return EBUSY; } scsi_low_deactivate(slp); - rv = (*slp->sl_osdep_fp->scsi_low_osdep_dettach) (slp); + rv = scsi_low_detach_cam(slp); if (rv != 0) { - splx(s); + SCSI_LOW_UNLOCK(slp); return EBUSY; } scsi_low_free_ti(slp); + SCSI_LOW_UNLOCK(slp); + callout_drain(&slp->sl_timeout_timer); + callout_drain(&slp->sl_engage_timer); + mtx_lock(&sl_tab_lock); LIST_REMOVE(slp, sl_chain); - splx(s); + mtx_unlock(&sl_tab_lock); return 0; } @@ -1753,9 +1673,8 @@ scsi_low_resume(slp) slp->sl_flags |= HW_RESUME; slp->sl_rstep = 0; (*slp->sl_funcs->scsi_low_power) (slp, SCSI_LOW_ENGAGE); - (*slp->sl_osdep_fp->scsi_low_osdep_timeout) - (slp, SCSI_LOW_TIMEOUT_CH_ENGAGE, - SCSI_LOW_TIMEOUT_START); + callout_reset(&slp->sl_engage_timer, hz / 1000, + scsi_low_engage, slp); return EJUSTRETURN; } return 0; @@ -1839,7 +1758,7 @@ scsi_low_cmd_start: else if (li->li_state >= SCSI_LOW_LUN_OK) { cb->ccb_flags &= ~CCB_INTERNAL; - rv = (*slp->sl_osdep_fp->scsi_low_osdep_ccb_setup) (slp, cb); + rv = scsi_low_ccb_setup_cam(slp, cb); if (cb->ccb_msgoutflag != 0) { scsi_low_ccb_message_exec(slp, cb); @@ -2199,7 +2118,7 @@ scsi_low_done(slp, cb) /* call OS depend done */ if (cb->osdep != NULL) { - rv = (*slp->sl_osdep_fp->scsi_low_osdep_done) (slp, cb); + rv = scsi_low_done_cam(slp, cb); if (rv == EJUSTRETURN) goto retry; } @@ -3140,7 +3059,7 @@ cmd_link_start: scsi_low_init_msgsys(slp, ti); - (*slp->sl_osdep_fp->scsi_low_osdep_ccb_setup) (slp, ncb); + scsi_low_ccb_setup_cam(slp, ncb); if (ncb->ccb_tcmax < SCSI_LOW_MIN_TOUT) ncb->ccb_tcmax = SCSI_LOW_MIN_TOUT; Modified: projects/sendfile/sys/cam/scsi/scsi_low.h ============================================================================== --- projects/sendfile/sys/cam/scsi/scsi_low.h Thu Nov 20 22:42:40 2014 (r274764) +++ projects/sendfile/sys/cam/scsi/scsi_low.h Thu Nov 20 23:00:17 2014 (r274765) @@ -44,10 +44,6 @@ #ifndef _SCSI_LOW_H_ #define _SCSI_LOW_H_ -/*================================================ - * Scsi low OSDEP - * (All os depend structures should be here!) - ================================================*/ /******** includes *******************************/ #include @@ -65,51 +61,8 @@ #undef MSG_IDENTIFY -/******** os depend interface structures **********/ -typedef struct scsi_sense_data scsi_low_osdep_sense_data_t; - -struct scsi_low_osdep_interface { - device_t si_dev; - - struct cam_sim *sim; - struct cam_path *path; - - int si_poll_count; - - struct callout_handle engage_ch; - struct callout_handle timeout_ch; -#ifdef SCSI_LOW_POWFUNC - struct callout_handle recover_ch; -#endif -}; - -/******** os depend interface functions *************/ -struct slccb; -struct scsi_low_softc; -#define SCSI_LOW_TIMEOUT_STOP 0 -#define SCSI_LOW_TIMEOUT_START 1 -#define SCSI_LOW_TIMEOUT_CH_IO 0 -#define SCSI_LOW_TIMEOUT_CH_ENGAGE 1 -#define SCSI_LOW_TIMEOUT_CH_RECOVER 2 - -struct scsi_low_osdep_funcs { - int (*scsi_low_osdep_attach) \ - (struct scsi_low_softc *); - int (*scsi_low_osdep_world_start) \ - (struct scsi_low_softc *); - int (*scsi_low_osdep_dettach) \ - (struct scsi_low_softc *); - int (*scsi_low_osdep_ccb_setup) \ - (struct scsi_low_softc *, struct slccb *); - int (*scsi_low_osdep_done) \ - (struct scsi_low_softc *, struct slccb *); - void (*scsi_low_osdep_timeout) \ - (struct scsi_low_softc *, int, int); -}; - /*================================================ * Generic Scsi Low header file - * (All os depend structures should be above!) ================================================*/ /************************************************* * Scsi low definitions @@ -229,7 +182,7 @@ struct slccb { * Sense data buffer *****************************************/ u_int8_t ccb_scsi_cmd[12]; - scsi_low_osdep_sense_data_t ccb_sense; + struct scsi_sense_data ccb_sense; }; /************************************************* @@ -486,10 +439,19 @@ struct scsi_low_funcs { }; struct scsi_low_softc { - /* os depend structure */ - struct scsi_low_osdep_interface sl_si; -#define sl_dev sl_si.si_dev - struct scsi_low_osdep_funcs *sl_osdep_fp; + device_t sl_dev; + + struct cam_sim *sl_sim; + struct cam_path *sl_path; + + int sl_poll_count; + + struct mtx sl_lock; + struct callout sl_engage_timer; + struct callout sl_timeout_timer; +#ifdef SCSI_LOW_POWFUNC + struct callout sl_recover_timer; +#endif /* our chain */ LIST_ENTRY(scsi_low_softc) sl_chain; @@ -596,6 +558,10 @@ struct scsi_low_softc { int sl_targsize; }; +#define SCSI_LOW_LOCK(sl) mtx_lock(&(sl)->sl_lock) +#define SCSI_LOW_UNLOCK(sl) mtx_unlock(&(sl)->sl_lock) +#define SCSI_LOW_ASSERT_LOCKED(sl) mtx_assert(&(sl)->sl_lock, MA_OWNED) + /************************************************* * SCSI LOW service functions *************************************************/ @@ -603,7 +569,7 @@ struct scsi_low_softc { * Scsi low attachment function. */ int scsi_low_attach(struct scsi_low_softc *, int, int, int, int, int); -int scsi_low_dettach(struct scsi_low_softc *); +int scsi_low_detach(struct scsi_low_softc *); /* * Scsi low interface activate or deactivate functions Modified: projects/sendfile/sys/cam/scsi/scsi_xpt.c ============================================================================== --- projects/sendfile/sys/cam/scsi/scsi_xpt.c Thu Nov 20 22:42:40 2014 (r274764) +++ projects/sendfile/sys/cam/scsi/scsi_xpt.c Thu Nov 20 23:00:17 2014 (r274765) @@ -2032,23 +2032,7 @@ scsi_scan_bus(struct cam_periph *periph, scan_info->lunindex[target_id]++; } else { mtx_unlock(&target->luns_mtx); - /* - * We're done with scanning all luns. - * - * Nuke the bogus device for lun 0 if lun 0 - * wasn't on the list. - */ - if (first != 0) { - TAILQ_FOREACH(device, - &target->ed_entries, links) { - if (device->lun_id == 0) { - break; - } - } - if (device) { - xpt_release_device(device); - } - } + /* We're done with scanning all luns. */ } } else { mtx_unlock(&target->luns_mtx); Modified: projects/sendfile/sys/dev/ct/bshw_machdep.c ============================================================================== --- projects/sendfile/sys/dev/ct/bshw_machdep.c Thu Nov 20 22:42:40 2014 (r274764) +++ projects/sendfile/sys/dev/ct/bshw_machdep.c Thu Nov 20 23:00:17 2014 (r274765) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -328,7 +329,7 @@ bshw_smit_xfer_start(struct ct_softc *ct break; count = (datalen > LC_FSZ ? LC_FSZ : datalen); - bus_space_read_region_4(chp->ch_memt, chp->ch_memh, + bus_read_region_4(chp->ch_mem, LC_SMIT_OFFSET, (u_int32_t *) data, count >> 2); data += count; datalen -= count; @@ -354,7 +355,7 @@ bshw_smit_xfer_start(struct ct_softc *ct } count = (datalen > LC_SFSZ ? LC_SFSZ : datalen); - bus_space_write_region_4(chp->ch_memt, chp->ch_memh, + bus_write_region_4(chp->ch_mem, LC_SMIT_OFFSET, (u_int32_t *) data, count >> 2); data += count; datalen -= count; @@ -363,7 +364,7 @@ bshw_smit_xfer_start(struct ct_softc *ct break; count = (datalen > LC_REST ? LC_REST : datalen); - bus_space_write_region_4(chp->ch_memt, chp->ch_memh, + bus_write_region_4(chp->ch_mem, LC_SMIT_OFFSET + LC_SFSZ, (u_int32_t *) data, count >> 2); data += count; Modified: projects/sendfile/sys/dev/ct/ct.c ============================================================================== --- projects/sendfile/sys/dev/ct/ct.c Thu Nov 20 22:42:40 2014 (r274764) +++ projects/sendfile/sys/dev/ct/ct.c Thu Nov 20 23:00:17 2014 (r274765) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -140,6 +141,7 @@ static int ct_unbusy(struct ct_softc *); static void ct_attention(struct ct_softc *); static struct ct_synch_data *ct_make_synch_table(struct ct_softc *); static int ct_catch_intr(struct ct_softc *); +static int ct_poll(void *); struct scsi_low_funcs ct_funcs = { SC_LOW_INIT_T ct_world_start, @@ -155,7 +157,7 @@ struct scsi_low_funcs ct_funcs = { SC_LOW_MSG_T ct_msg, SC_LOW_TIMEOUT_T NULL, - SC_LOW_POLL_T ctintr, + SC_LOW_POLL_T ct_poll, NULL, /* SC_LOW_POWER_T cthw_power, */ }; @@ -876,11 +878,22 @@ ct_catch_intr(struct ct_softc *ct) return EJUSTRETURN; } -int +void ctintr(void *arg) { struct ct_softc *ct = arg; struct scsi_low_softc *slp = &ct->sc_sclow; + + SCSI_LOW_LOCK(slp); + ct_poll(ct); + SCSI_LOW_UNLOCK(slp); +} + +static int +ct_poll(void *arg) +{ + struct ct_softc *ct = arg; + struct scsi_low_softc *slp = &ct->sc_sclow; struct ct_bus_access_handle *chp = &ct->sc_ch; struct targ_info *ti; struct buf *bp; Modified: projects/sendfile/sys/dev/ct/ct_isa.c ============================================================================== --- projects/sendfile/sys/dev/ct/ct_isa.c Thu Nov 20 22:42:40 2014 (r274764) +++ projects/sendfile/sys/dev/ct/ct_isa.c Thu Nov 20 23:00:17 2014 (r274765) @@ -137,8 +137,7 @@ ct_isa_match(device_t dev) return ENXIO; bzero(&ch, sizeof(ch)); - ch.ch_iot = rman_get_bustag(port_res); - ch.ch_ioh = rman_get_bushandle(port_res), + ch.ch_io = port_res; ch.ch_bus_weight = ct_isa_bus_access_weight; rv = ctprobesubr(&ch, 0, BSHW_DEFAULT_HOSTID, @@ -159,7 +158,7 @@ ct_isa_match(device_t dev) bus_release_resource(dev, SYS_RES_MEMORY, 0, mem_res); if (rv != 0) - return 0; + return (BUS_PROBE_DEFAULT); return ENXIO; } @@ -175,7 +174,6 @@ ct_isa_attach(device_t dev) int irq_rid, drq_rid, chiprev; u_int8_t *vaddr; bus_addr_t addr; - intrmask_t s; hw = ct_find_hw(dev); if (ct_space_map(dev, hw, &ct->port_res, &ct->mem_res) != 0) { @@ -183,13 +181,8 @@ ct_isa_attach(device_t dev) return ENXIO; } - bzero(chp, sizeof(*chp)); - chp->ch_iot = rman_get_bustag(ct->port_res); - chp->ch_ioh = rman_get_bushandle(ct->port_res); - if (ct->mem_res) { - chp->ch_memt = rman_get_bustag(ct->mem_res); - chp->ch_memh = rman_get_bushandle(ct->mem_res); - } + chp->ch_io = ct->port_res; + chp->ch_mem = ct->mem_res; chp->ch_bus_weight = ct_isa_bus_access_weight; irq_rid = 0; @@ -254,7 +247,7 @@ ct_isa_attach(device_t dev) ct->ct_synch_setup = bshw_synch_setup; ct->sc_xmode = CT_XMODE_DMA; - if (chp->ch_memh != NULL) + if (chp->ch_mem != NULL) ct->sc_xmode |= CT_XMODE_PIO; ct->sc_chiprev = chiprev; @@ -297,13 +290,12 @@ ct_isa_attach(device_t dev) slp->sl_dev = dev; slp->sl_hostid = bs->sc_hostid; slp->sl_cfgflags = device_get_flags(dev); + mtx_init(&slp->sl_lock, "ct", NULL, MTX_DEF); - s = splcam(); ctattachsubr(ct); - splx(s); - if (bus_setup_intr(dev, ct->irq_res, INTR_TYPE_CAM, - NULL, (driver_intr_t *)ctintr, ct, &ct->sc_ih)) { + if (bus_setup_intr(dev, ct->irq_res, INTR_TYPE_CAM | INTR_MPSAFE, + NULL, ctintr, ct, &ct->sc_ih)) { ct_space_unmap(dev, ct); return ENXIO; } @@ -326,7 +318,7 @@ ct_space_map(device_t dev, struct bshw * *memhp = NULL; port_rid = 0; - *iohp = bus_alloc_resource(dev, SYS_RES_IOPORT, &port_rid, 0, ~0, + *iohp = bus_alloc_resource(dev, SYS_RES_IOPORT, &port_rid, 0ul, ~0ul, BSHW_IOSZ, RF_ACTIVE); if (*iohp == NULL) return ENXIO; @@ -335,7 +327,7 @@ ct_space_map(device_t dev, struct bshw * return 0; mem_rid = 0; - *memhp = bus_alloc_resource(dev, SYS_RES_MEMORY, &mem_rid, 0, ~0, + *memhp = bus_alloc_resource(dev, SYS_RES_MEMORY, &mem_rid, 0ul, ~0ul, BSHW_MEMSZ, RF_ACTIVE); if (*memhp == NULL) { bus_release_resource(dev, SYS_RES_IOPORT, port_rid, *iohp); Modified: projects/sendfile/sys/dev/ct/ct_machdep.h ============================================================================== --- projects/sendfile/sys/dev/ct/ct_machdep.h Thu Nov 20 22:42:40 2014 (r274764) +++ projects/sendfile/sys/dev/ct/ct_machdep.h Thu Nov 20 23:00:17 2014 (r274765) @@ -94,7 +94,7 @@ ct_stat_read_1(struct ct_bus_access_hand { u_int8_t regv; - regv = bus_space_read_1(chp->ch_iot, chp->ch_ioh, stat_port); + regv = bus_read_1(chp->ch_io, stat_port); CT_BUS_WEIGHT(chp) return regv; } @@ -102,33 +102,29 @@ ct_stat_read_1(struct ct_bus_access_hand static __inline void cthw_set_count(struct ct_bus_access_handle *chp, u_int count) { - bus_space_tag_t bst = chp->ch_iot; - bus_space_handle_t bsh = chp->ch_ioh; - bus_space_write_1(bst, bsh, addr_port, wd3s_cnt); + bus_write_1(chp->ch_io, addr_port, wd3s_cnt); CT_BUS_WEIGHT(chp) - bus_space_write_1(bst, bsh, ctrl_port, count >> 16); + bus_write_1(chp->ch_io, ctrl_port, count >> 16); CT_BUS_WEIGHT(chp) - bus_space_write_1(bst, bsh, ctrl_port, count >> 8); + bus_write_1(chp->ch_io, ctrl_port, count >> 8); CT_BUS_WEIGHT(chp) - bus_space_write_1(bst, bsh, ctrl_port, count); + bus_write_1(chp->ch_io, ctrl_port, count); CT_BUS_WEIGHT(chp) } static __inline u_int cthw_get_count(struct ct_bus_access_handle *chp) { - bus_space_tag_t bst = chp->ch_iot; - bus_space_handle_t bsh = chp->ch_ioh; u_int count; - bus_space_write_1(bst, bsh, addr_port, wd3s_cnt); + bus_write_1(chp->ch_io, addr_port, wd3s_cnt); CT_BUS_WEIGHT(chp) - count = (((u_int) bus_space_read_1(bst, bsh, ctrl_port)) << 16); + count = (((u_int) bus_read_1(chp->ch_io, ctrl_port)) << 16); CT_BUS_WEIGHT(chp) - count += (((u_int) bus_space_read_1(bst, bsh, ctrl_port)) << 8); + count += (((u_int) bus_read_1(chp->ch_io, ctrl_port)) << 8); CT_BUS_WEIGHT(chp) - count += ((u_int) bus_space_read_1(bst, bsh, ctrl_port)); + count += ((u_int) bus_read_1(chp->ch_io, ctrl_port)); CT_BUS_WEIGHT(chp) return count; } @@ -136,15 +132,13 @@ cthw_get_count(struct ct_bus_access_hand static __inline void ct_write_cmds(struct ct_bus_access_handle *chp, u_int8_t *cmd, int len) { - bus_space_tag_t bst = chp->ch_iot; - bus_space_handle_t bsh = chp->ch_ioh; int i; - bus_space_write_1(bst, bsh, addr_port, wd3s_cdb); + bus_write_1(chp->ch_io, addr_port, wd3s_cdb); CT_BUS_WEIGHT(chp) for (i = 0; i < len; i ++) { - bus_space_write_1(bst, bsh, ctrl_port, cmd[i]); + bus_write_1(chp->ch_io, ctrl_port, cmd[i]); CT_BUS_WEIGHT(chp) } } @@ -152,13 +146,11 @@ ct_write_cmds(struct ct_bus_access_handl static __inline u_int8_t ct_cr_read_1(struct ct_bus_access_handle *chp, bus_addr_t offs) { - bus_space_tag_t bst = chp->ch_iot; - bus_space_handle_t bsh = chp->ch_ioh; u_int8_t regv; - bus_space_write_1(bst, bsh, addr_port, offs); + bus_write_1(chp->ch_io, addr_port, offs); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 01:22:42 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D80E3F5; Fri, 21 Nov 2014 01:22:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 653E2BEC; Fri, 21 Nov 2014 01:22:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL1MgmE001521; Fri, 21 Nov 2014 01:22:42 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL1MZkL001392; Fri, 21 Nov 2014 01:22:35 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411210122.sAL1MZkL001392@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 21 Nov 2014 01:22:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274768 - in projects/routing: . bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/zstreamdump cdd... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 01:22:42 -0000 Author: melifaro Date: Fri Nov 21 01:22:33 2014 New Revision: 274768 URL: https://svnweb.freebsd.org/changeset/base/274768 Log: Sync to HEAD@r274766 Added: projects/routing/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff - copied unchanged from r274766, head/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff projects/routing/contrib/telnet/telnet/baud.h - copied unchanged from r274766, head/contrib/telnet/telnet/baud.h projects/routing/lib/libc/tests/gen/arc4random_test.c - copied unchanged from r274766, head/lib/libc/tests/gen/arc4random_test.c projects/routing/lib/libc/tests/gen/fpclassify2_test.c - copied unchanged from r274766, head/lib/libc/tests/gen/fpclassify2_test.c projects/routing/lib/libc/tests/stdio/fmemopen2_test.c - copied unchanged from r274766, head/lib/libc/tests/stdio/fmemopen2_test.c projects/routing/lib/librt/Makefile.amd64 - copied unchanged from r274766, head/lib/librt/Makefile.amd64 projects/routing/lib/librt/Makefile.i386 - copied unchanged from r274766, head/lib/librt/Makefile.i386 projects/routing/lib/librt/tests/ - copied from r274766, head/lib/librt/tests/ projects/routing/lib/libthr/Makefile.amd64 - copied unchanged from r274766, head/lib/libthr/Makefile.amd64 projects/routing/lib/libthr/Makefile.i386 - copied unchanged from r274766, head/lib/libthr/Makefile.i386 projects/routing/lib/libthr/tests/ - copied from r274766, head/lib/libthr/tests/ projects/routing/lib/msun/Makefile.amd64 - copied unchanged from r274766, head/lib/msun/Makefile.amd64 projects/routing/lib/msun/Makefile.i386 - copied unchanged from r274766, head/lib/msun/Makefile.i386 projects/routing/lib/msun/tests/ - copied from r274766, head/lib/msun/tests/ projects/routing/share/man/man9/vnet.9 - copied unchanged from r274766, head/share/man/man9/vnet.9 projects/routing/sys/dev/altera/pio/ - copied from r274766, head/sys/dev/altera/pio/ projects/routing/sys/dev/beri/virtio/ - copied from r274766, head/sys/dev/beri/virtio/ projects/routing/sys/dev/virtio/mmio/ - copied from r274766, head/sys/dev/virtio/mmio/ projects/routing/tools/build/options/WITHOUT_INCLUDES - copied unchanged from r274766, head/tools/build/options/WITHOUT_INCLUDES projects/routing/tools/build/options/WITHOUT_TESTS_SUPPORT - copied unchanged from r274766, head/tools/build/options/WITHOUT_TESTS_SUPPORT projects/routing/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES - copied unchanged from r274766, head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES projects/routing/usr.sbin/pw/tests/pw_etcdir.sh - copied unchanged from r274766, head/usr.sbin/pw/tests/pw_etcdir.sh projects/routing/usr.sbin/pw/tests/pw_lock.sh - copied unchanged from r274766, head/usr.sbin/pw/tests/pw_lock.sh Deleted: projects/routing/etc/rc.d/faith projects/routing/lib/libc/posix1e/acl_size.c projects/routing/share/man/man4/faith.4 projects/routing/sys/dev/dpt/dpt_isa.c projects/routing/sys/modules/if_faith/ projects/routing/sys/sys/sf_base.h projects/routing/sys/sys/sf_sync.h projects/routing/tools/regression/lib/libc/gen/test-arc4random.c projects/routing/tools/regression/lib/libc/gen/test-fpclassify.c projects/routing/tools/regression/lib/libc/stdio/test-fmemopen.c projects/routing/usr.sbin/faithd/ Modified: projects/routing/MAINTAINERS (contents, props changed) projects/routing/Makefile.inc1 projects/routing/ObsoleteFiles.inc projects/routing/UPDATING projects/routing/bin/sh/sh.1 projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/routing/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c projects/routing/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c projects/routing/contrib/byacc/test/yacc/calc.tab.c projects/routing/contrib/byacc/test/yacc/calc1.tab.c projects/routing/contrib/byacc/test/yacc/calc2.tab.c projects/routing/contrib/byacc/test/yacc/calc3.tab.c projects/routing/contrib/byacc/test/yacc/code_calc.code.c projects/routing/contrib/byacc/test/yacc/code_calc.tab.c projects/routing/contrib/byacc/test/yacc/code_error.code.c projects/routing/contrib/byacc/test/yacc/code_error.tab.c projects/routing/contrib/byacc/test/yacc/empty.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax10.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax11.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax12.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax18.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax20.tab.c projects/routing/contrib/byacc/test/yacc/error.tab.c projects/routing/contrib/byacc/test/yacc/grammar.tab.c projects/routing/contrib/byacc/test/yacc/ok_syntax1.tab.c projects/routing/contrib/byacc/test/yacc/pure_calc.tab.c projects/routing/contrib/byacc/test/yacc/pure_error.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc-s.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc2-s.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc2.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc3-s.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc3.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc4-s.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc4.tab.c projects/routing/contrib/byacc/test/yacc/rename_debug.c projects/routing/contrib/byacc/test/yacc/varsyntax_calc1.tab.c projects/routing/contrib/hyperv/tools/hv_kvp_daemon.c projects/routing/contrib/libxo/README.md projects/routing/contrib/libxo/configure.ac projects/routing/contrib/libxo/libxo/libxo.c projects/routing/contrib/libxo/libxo/xoconfig.h projects/routing/contrib/libxo/libxo/xoversion.h projects/routing/contrib/libxo/tests/core/Makefile.am projects/routing/contrib/libxo/tests/core/saved/test_07.J.out projects/routing/contrib/libxo/tests/core/saved/test_07.JP.out projects/routing/contrib/libxo/tests/core/saved/test_07.X.out projects/routing/contrib/libxo/tests/core/saved/test_07.XP.out projects/routing/contrib/libxo/tests/core/test_07.c projects/routing/contrib/libxo/xolint/xolint.pl projects/routing/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h projects/routing/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/routing/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_glob.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_nice.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_raise.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_time.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c projects/routing/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c projects/routing/contrib/netbsd-tests/lib/libc/regex/debug.c projects/routing/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c projects/routing/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c projects/routing/contrib/netbsd-tests/lib/libc/string/t_memcpy.c projects/routing/contrib/netbsd-tests/lib/libc/string/t_strerror.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_access.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_clock_gettime.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getgroups.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_listen.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_pipe2.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_poll.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_revoke.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_stat.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_unlink.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_write.c projects/routing/contrib/netbsd-tests/lib/libc/time/t_strptime.c projects/routing/contrib/netbsd-tests/lib/libc/tls/dso/h_tls_dlopen.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_dlopen.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_dynamic.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_static.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_static_helper.c projects/routing/contrib/netbsd-tests/lib/libc/tls_dso/h_tls_dynamic.c projects/routing/contrib/netbsd-tests/lib/libm/t_cbrt.c projects/routing/contrib/netbsd-tests/lib/libm/t_exp.c projects/routing/contrib/netbsd-tests/lib/libm/t_pow.c projects/routing/contrib/netbsd-tests/lib/libm/t_precision.c projects/routing/contrib/netbsd-tests/lib/libm/t_scalbn.c projects/routing/contrib/netbsd-tests/lib/libpthread/h_atexit.c projects/routing/contrib/netbsd-tests/lib/libpthread/h_cancel.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_condwait.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_detach.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_fork.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_join.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_once.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_sem.c projects/routing/contrib/netbsd-tests/lib/librt/t_sem.c projects/routing/contrib/ofed/librdmacm/examples/rping.c projects/routing/contrib/telnet/arpa/telnet.h projects/routing/contrib/telnet/telnet/commands.c projects/routing/contrib/telnet/telnet/externs.h projects/routing/contrib/telnet/telnet/main.c projects/routing/contrib/telnet/telnet/sys_bsd.c projects/routing/contrib/telnet/telnet/telnet.1 projects/routing/contrib/telnet/telnet/telnet.c projects/routing/contrib/telnet/telnet/types.h projects/routing/contrib/telnet/telnetd/sys_term.c projects/routing/contrib/tzdata/africa projects/routing/contrib/tzdata/asia projects/routing/contrib/tzdata/australasia projects/routing/contrib/tzdata/europe projects/routing/contrib/tzdata/northamerica projects/routing/contrib/tzdata/southamerica projects/routing/etc/defaults/rc.conf projects/routing/etc/devd/apple.conf projects/routing/etc/mtree/BSD.tests.dist projects/routing/etc/network.subr projects/routing/etc/rc.d/Makefile projects/routing/etc/rc.d/NETWORKING projects/routing/etc/rc.d/bridge projects/routing/etc/rc.d/defaultroute projects/routing/etc/rc.d/routing projects/routing/gnu/usr.bin/gdb/kgdb/kgdb.h projects/routing/gnu/usr.bin/gdb/kgdb/trgt_i386.c projects/routing/lib/libc/net/getaddrinfo.c projects/routing/lib/libc/net/getnameinfo.c projects/routing/lib/libc/sys/Makefile.inc projects/routing/lib/libc/sys/Symbol.map projects/routing/lib/libc/sys/poll.2 projects/routing/lib/libc/tests/gen/Makefile projects/routing/lib/libc/tests/stdio/Makefile projects/routing/lib/libexpat/Makefile projects/routing/lib/librt/Makefile projects/routing/lib/libthr/Makefile projects/routing/lib/msun/Makefile projects/routing/libexec/fingerd/fingerd.8 projects/routing/libexec/telnetd/Makefile projects/routing/release/picobsd/bridge/PICOBSD projects/routing/release/picobsd/qemu/PICOBSD projects/routing/sbin/camcontrol/camcontrol.c projects/routing/sbin/gbde/gbde.8 projects/routing/sbin/gbde/gbde.c projects/routing/sbin/geom/core/geom.c projects/routing/sbin/growfs/growfs.8 projects/routing/sbin/ifconfig/ifgroup.c projects/routing/sbin/reboot/boot_i386.8 projects/routing/sbin/route/keywords projects/routing/sbin/route/route.8 projects/routing/sbin/route/route.c projects/routing/share/man/man4/Makefile projects/routing/share/man/man4/acpi.4 projects/routing/share/man/man4/dpt.4 projects/routing/share/man/man4/inet.4 projects/routing/share/man/man4/inet6.4 projects/routing/share/man/man4/ip6.4 projects/routing/share/man/man4/ipheth.4 projects/routing/share/man/man4/iscsi_initiator.4 projects/routing/share/man/man4/rsu.4 projects/routing/share/man/man4/splash.4 projects/routing/share/man/man4/virtio_console.4 projects/routing/share/man/man5/rc.conf.5 projects/routing/share/man/man7/hier.7 projects/routing/share/man/man7/security.7 projects/routing/share/man/man9/Makefile projects/routing/share/mk/bsd.incs.mk projects/routing/share/mk/bsd.lib.mk projects/routing/share/mk/bsd.opts.mk projects/routing/share/mk/bsd.own.mk projects/routing/share/mk/bsd.prog.mk projects/routing/share/mk/src.opts.mk projects/routing/share/mk/sys.mk projects/routing/sys/amd64/amd64/genassym.c projects/routing/sys/amd64/amd64/pmap.c projects/routing/sys/amd64/amd64/support.S projects/routing/sys/amd64/conf/GENERIC projects/routing/sys/amd64/include/asmacros.h projects/routing/sys/amd64/include/vmparam.h projects/routing/sys/arm/allwinner/a10_gpio.c projects/routing/sys/arm/arm/busdma_machdep-v6.c projects/routing/sys/arm/arm/gic.c projects/routing/sys/arm/arm/stdatomic.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/routing/sys/arm/conf/ATMEL projects/routing/sys/arm/conf/DOCKSTAR projects/routing/sys/arm/conf/DREAMPLUG-1001 projects/routing/sys/arm/conf/EFIKA_MX projects/routing/sys/arm/conf/ETHERNUT5 projects/routing/sys/arm/conf/IMX53 projects/routing/sys/arm/conf/IMX6 projects/routing/sys/arm/conf/SAM9260EK projects/routing/sys/arm/freescale/imx/imx_common.c projects/routing/sys/arm/freescale/imx/imx_gpio.c projects/routing/sys/arm/freescale/imx/imx_i2c.c projects/routing/sys/arm/freescale/imx/imx_iomux.c projects/routing/sys/arm/freescale/vybrid/vf_gpio.c projects/routing/sys/arm/include/asmacros.h projects/routing/sys/arm/mv/mv_common.c projects/routing/sys/arm/rockchip/rk30xx_gpio.c projects/routing/sys/arm/samsung/exynos/exynos5_pad.c projects/routing/sys/arm/ti/ti_common.c projects/routing/sys/arm/ti/ti_gpio.c projects/routing/sys/arm/ti/ti_i2c.c projects/routing/sys/arm/versatile/versatile_common.c projects/routing/sys/arm/versatile/versatile_machdep.c projects/routing/sys/arm/xilinx/uart_dev_cdnc.c projects/routing/sys/arm/xilinx/zy7_machdep.c projects/routing/sys/arm/xscale/ixp425/avila_gpio.c projects/routing/sys/arm/xscale/ixp425/cambria_gpio.c projects/routing/sys/boot/common/load_elf.c projects/routing/sys/boot/efi/include/efiapi.h projects/routing/sys/boot/ficl/amd64/sysdep.c projects/routing/sys/boot/ficl/arm/sysdep.c projects/routing/sys/boot/ficl/i386/sysdep.c projects/routing/sys/boot/ficl/mips/sysdep.c projects/routing/sys/boot/ficl/mips64/sysdep.c projects/routing/sys/boot/ficl/powerpc/sysdep.c projects/routing/sys/boot/ficl/sparc64/sysdep.c projects/routing/sys/boot/forth/loader.conf projects/routing/sys/boot/i386/loader/conf.c projects/routing/sys/boot/pc98/loader/conf.c projects/routing/sys/boot/zfs/zfsimpl.c projects/routing/sys/cam/ctl/ctl.c projects/routing/sys/cam/ctl/ctl_cmd_table.c projects/routing/sys/cam/ctl/ctl_frontend_iscsi.c projects/routing/sys/cam/scsi/scsi_all.c projects/routing/sys/cam/scsi/scsi_all.h projects/routing/sys/cam/scsi/scsi_low.c projects/routing/sys/cam/scsi/scsi_low.h projects/routing/sys/cam/scsi/scsi_xpt.c projects/routing/sys/cddl/boot/zfs/zfsimpl.h projects/routing/sys/cddl/compat/opensolaris/sys/vnode.h projects/routing/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/routing/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/routing/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/routing/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/routing/sys/compat/freebsd32/freebsd32_misc.c projects/routing/sys/compat/freebsd32/freebsd32_proto.h projects/routing/sys/compat/freebsd32/freebsd32_syscall.h projects/routing/sys/compat/freebsd32/freebsd32_syscalls.c projects/routing/sys/compat/freebsd32/freebsd32_sysent.c projects/routing/sys/compat/freebsd32/freebsd32_systrace_args.c projects/routing/sys/compat/freebsd32/syscalls.master projects/routing/sys/compat/linux/linux_file.c projects/routing/sys/compat/linux/linux_misc.c projects/routing/sys/compat/linux/linux_socket.c projects/routing/sys/compat/linux/linux_stats.c projects/routing/sys/compat/linux/linux_uid16.c projects/routing/sys/compat/svr4/svr4_fcntl.c projects/routing/sys/compat/svr4/svr4_misc.c projects/routing/sys/compat/svr4/svr4_stat.c projects/routing/sys/compat/svr4/svr4_stream.c projects/routing/sys/conf/NOTES projects/routing/sys/conf/files projects/routing/sys/conf/kern.opts.mk projects/routing/sys/conf/newvers.sh projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/routing/sys/contrib/ngatm/netnatm/saal/saal_sscop.c projects/routing/sys/crypto/rijndael/rijndael-api-fst.c projects/routing/sys/crypto/rijndael/rijndael-api-fst.h projects/routing/sys/dev/acpica/acpi.c projects/routing/sys/dev/agp/agp_i810.c projects/routing/sys/dev/ath/if_ath.c projects/routing/sys/dev/ct/bshw_machdep.c projects/routing/sys/dev/ct/ct.c projects/routing/sys/dev/ct/ct_isa.c projects/routing/sys/dev/ct/ct_machdep.h projects/routing/sys/dev/ct/ctvar.h projects/routing/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/routing/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/routing/sys/dev/cxgbe/common/common.h projects/routing/sys/dev/cxgbe/common/t4_hw.c projects/routing/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/routing/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/routing/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/routing/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt projects/routing/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/routing/sys/dev/cxgbe/iw_cxgbe/cm.c projects/routing/sys/dev/cxgbe/t4_main.c projects/routing/sys/dev/cxgbe/tom/t4_cpl_io.c projects/routing/sys/dev/cxgbe/tom/t4_ddp.c projects/routing/sys/dev/drm2/radeon/radeon_connectors.c projects/routing/sys/dev/fdt/fdt_common.c projects/routing/sys/dev/fdt/fdt_pinctrl.c projects/routing/sys/dev/gpio/gpio_if.m projects/routing/sys/dev/gpio/gpiobus.c projects/routing/sys/dev/gpio/gpiobusvar.h projects/routing/sys/dev/gpio/gpioc.c projects/routing/sys/dev/gpio/ofw_gpiobus.c projects/routing/sys/dev/hwpmc/hwpmc_mod.c projects/routing/sys/dev/iicbus/iicbus.c projects/routing/sys/dev/iicbus/iicbus.h projects/routing/sys/dev/iicbus/iicbus_if.m projects/routing/sys/dev/iir/iir.c projects/routing/sys/dev/iir/iir.h projects/routing/sys/dev/iir/iir_ctrl.c projects/routing/sys/dev/iir/iir_pci.c projects/routing/sys/dev/ips/ips.c projects/routing/sys/dev/ips/ips.h projects/routing/sys/dev/ips/ips_pci.c projects/routing/sys/dev/iscsi/icl.c projects/routing/sys/dev/isp/isp_freebsd.c projects/routing/sys/dev/isp/isp_freebsd.h projects/routing/sys/dev/ixgbe/ixgbe.c projects/routing/sys/dev/mcd/mcd.c projects/routing/sys/dev/mcd/mcd_isa.c projects/routing/sys/dev/mcd/mcdvar.h projects/routing/sys/dev/mly/mly.c projects/routing/sys/dev/mly/mlyvar.h projects/routing/sys/dev/ncv/ncr53c500.c projects/routing/sys/dev/ncv/ncr53c500_pccard.c projects/routing/sys/dev/ncv/ncr53c500var.h projects/routing/sys/dev/netmap/netmap.c projects/routing/sys/dev/netmap/netmap_freebsd.c projects/routing/sys/dev/netmap/netmap_generic.c projects/routing/sys/dev/netmap/netmap_kern.h projects/routing/sys/dev/netmap/netmap_monitor.c projects/routing/sys/dev/netmap/netmap_pipe.c projects/routing/sys/dev/nsp/nsp.c projects/routing/sys/dev/nsp/nsp_pccard.c projects/routing/sys/dev/nsp/nspvar.h projects/routing/sys/dev/null/null.c projects/routing/sys/dev/ofw/ofw_iicbus.c projects/routing/sys/dev/pccbb/pccbb.c projects/routing/sys/dev/pci/pci.c projects/routing/sys/dev/pst/pst-pci.c projects/routing/sys/dev/pst/pst-raid.c projects/routing/sys/dev/random/fortuna.c projects/routing/sys/dev/random/hash.c projects/routing/sys/dev/random/hash.h projects/routing/sys/dev/random/ivy.c projects/routing/sys/dev/rp/rp.c projects/routing/sys/dev/rp/rp_pci.c projects/routing/sys/dev/rp/rpreg.h projects/routing/sys/dev/rp/rpvar.h projects/routing/sys/dev/scd/scd.c projects/routing/sys/dev/scd/scd_isa.c projects/routing/sys/dev/scd/scdvar.h projects/routing/sys/dev/stg/tmc18c30.c projects/routing/sys/dev/stg/tmc18c30_isa.c projects/routing/sys/dev/stg/tmc18c30_pccard.c projects/routing/sys/dev/stg/tmc18c30_pci.c projects/routing/sys/dev/stg/tmc18c30_subr.c projects/routing/sys/dev/stg/tmc18c30var.h projects/routing/sys/dev/streams/streams.c projects/routing/sys/dev/uart/uart_bus_fdt.c projects/routing/sys/dev/uart/uart_dev_pl011.c projects/routing/sys/dev/usb/usbdevs projects/routing/sys/dev/usb/wlan/if_rsu.c projects/routing/sys/dev/virtio/block/virtio_blk.c projects/routing/sys/dev/virtio/network/if_vtnet.c projects/routing/sys/dev/wds/wd7000.c projects/routing/sys/dev/wl/if_wl.c projects/routing/sys/dev/wl/if_wl.h projects/routing/sys/dev/xen/netback/netback.c projects/routing/sys/fs/ext2fs/ext2_extern.h projects/routing/sys/fs/ext2fs/ext2_inode_cnv.c projects/routing/sys/fs/ext2fs/ext2_vfsops.c projects/routing/sys/geom/bde/g_bde.c projects/routing/sys/geom/bde/g_bde.h projects/routing/sys/geom/geom_dev.c projects/routing/sys/geom/part/g_part.c projects/routing/sys/geom/part/g_part_bsd.c projects/routing/sys/geom/part/g_part_if.m projects/routing/sys/i386/conf/GENERIC projects/routing/sys/i386/conf/XBOX projects/routing/sys/i386/conf/XEN projects/routing/sys/i386/i386/pmap.c projects/routing/sys/i386/ibcs2/ibcs2_fcntl.c projects/routing/sys/i386/ibcs2/ibcs2_misc.c projects/routing/sys/i386/ibcs2/ibcs2_other.c projects/routing/sys/i386/ibcs2/ibcs2_stat.c projects/routing/sys/i386/ibcs2/ibcs2_xenix.c projects/routing/sys/i386/include/vmparam.h projects/routing/sys/i386/isa/spic.c projects/routing/sys/i386/xen/locore.s projects/routing/sys/kern/init_main.c projects/routing/sys/kern/init_sysent.c projects/routing/sys/kern/kern_clock.c projects/routing/sys/kern/kern_cons.c projects/routing/sys/kern/kern_descrip.c projects/routing/sys/kern/kern_event.c projects/routing/sys/kern/kern_fork.c projects/routing/sys/kern/kern_lock.c projects/routing/sys/kern/kern_mutex.c projects/routing/sys/kern/kern_shutdown.c projects/routing/sys/kern/kern_umtx.c projects/routing/sys/kern/subr_prof.c projects/routing/sys/kern/sys_generic.c projects/routing/sys/kern/sys_socket.c projects/routing/sys/kern/syscalls.c projects/routing/sys/kern/syscalls.master projects/routing/sys/kern/systrace_args.c projects/routing/sys/kern/uipc_sockbuf.c projects/routing/sys/kern/uipc_socket.c projects/routing/sys/kern/uipc_syscalls.c projects/routing/sys/kern/uipc_usrreq.c projects/routing/sys/kern/vfs_mountroot.c projects/routing/sys/kern/vfs_syscalls.c projects/routing/sys/kern/vfs_vnops.c projects/routing/sys/libkern/strncmp.c projects/routing/sys/mips/atheros/ar71xx_gpio.c projects/routing/sys/mips/cavium/octeon_gpio.c projects/routing/sys/mips/conf/GXEMUL projects/routing/sys/mips/conf/GXEMUL32 projects/routing/sys/mips/conf/MALTA projects/routing/sys/mips/conf/MALTA64 projects/routing/sys/mips/conf/OCTEON1 projects/routing/sys/mips/include/cache_mipsNN.h projects/routing/sys/mips/include/cpuinfo.h projects/routing/sys/mips/include/cpuregs.h projects/routing/sys/mips/mips/cache.c projects/routing/sys/mips/mips/cache_mipsNN.c projects/routing/sys/mips/mips/cpu.c projects/routing/sys/mips/mips/stdatomic.c projects/routing/sys/mips/mips/trap.c projects/routing/sys/mips/rmi/rootfs_list.txt projects/routing/sys/mips/rt305x/rt305x_gpio.c projects/routing/sys/modules/Makefile projects/routing/sys/modules/cxgb/tom/Makefile projects/routing/sys/modules/dpt/Makefile projects/routing/sys/modules/geom/geom_part/geom_part_bsd/Makefile projects/routing/sys/modules/if_gif/Makefile projects/routing/sys/modules/if_gre/Makefile projects/routing/sys/modules/lmc/Makefile projects/routing/sys/net/ethernet.h projects/routing/sys/net/if.c projects/routing/sys/net/if_clone.c projects/routing/sys/net/if_clone.h projects/routing/sys/net/if_ethersubr.c projects/routing/sys/net/if_types.h projects/routing/sys/net/if_var.h projects/routing/sys/net/if_vlan_var.h projects/routing/sys/net/netmap_user.h projects/routing/sys/net/route.c projects/routing/sys/net/route.h projects/routing/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/routing/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/routing/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c projects/routing/sys/netinet/accf_dns.c projects/routing/sys/netinet/accf_http.c projects/routing/sys/netinet/in.h projects/routing/sys/netinet/in_pcb.c projects/routing/sys/netinet/in_pcb.h projects/routing/sys/netinet/in_rmx.c projects/routing/sys/netinet/in_var.h projects/routing/sys/netinet/ip_fastfwd.c projects/routing/sys/netinet/ip_icmp.c projects/routing/sys/netinet/ip_input.c projects/routing/sys/netinet/ip_output.c projects/routing/sys/netinet/siftr.c projects/routing/sys/netinet/tcp_input.c projects/routing/sys/netinet/tcp_output.c projects/routing/sys/netinet/tcp_subr.c projects/routing/sys/netinet/tcp_var.h projects/routing/sys/netinet6/frag6.c projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/in6.h projects/routing/sys/netinet6/in6_ifattach.c projects/routing/sys/netinet6/in6_pcb.c projects/routing/sys/netinet6/in6_proto.c projects/routing/sys/netinet6/in6_rmx.c projects/routing/sys/netinet6/in6_src.c projects/routing/sys/netinet6/ip6_input.c projects/routing/sys/netinet6/ip6_ipsec.c projects/routing/sys/netinet6/ip6_output.c projects/routing/sys/netinet6/ip6_var.h projects/routing/sys/netinet6/nd6.c projects/routing/sys/netinet6/nd6.h projects/routing/sys/netinet6/nd6_nbr.c projects/routing/sys/netinet6/raw_ip6.c projects/routing/sys/netinet6/scope6.c projects/routing/sys/netinet6/scope6_var.h projects/routing/sys/netinet6/sctp6_usrreq.c projects/routing/sys/netinet6/udp6_usrreq.c projects/routing/sys/netipsec/ipsec_input.c projects/routing/sys/netipsec/ipsec_output.c projects/routing/sys/netipsec/xform_ipip.c projects/routing/sys/netpfil/ipfw/ip_fw_private.h projects/routing/sys/netpfil/pf/pf.c projects/routing/sys/netpfil/pf/pf_ioctl.c projects/routing/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/routing/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/routing/sys/pc98/conf/GENERIC projects/routing/sys/powerpc/aim/trap_subr32.S projects/routing/sys/powerpc/aim/trap_subr64.S projects/routing/sys/powerpc/conf/GENERIC projects/routing/sys/powerpc/conf/GENERIC64 projects/routing/sys/powerpc/conf/WII projects/routing/sys/powerpc/powermac/pmu.c projects/routing/sys/powerpc/powermac/pmuvar.h projects/routing/sys/powerpc/powerpc/db_trace.c projects/routing/sys/powerpc/wii/wii_gpio.c projects/routing/sys/rpc/clnt_vc.c projects/routing/sys/rpc/svc_vc.c projects/routing/sys/sparc64/conf/GENERIC projects/routing/sys/sys/conf.h projects/routing/sys/sys/event.h projects/routing/sys/sys/file.h projects/routing/sys/sys/filedesc.h projects/routing/sys/sys/param.h projects/routing/sys/sys/poll.h projects/routing/sys/sys/protosw.h projects/routing/sys/sys/sockbuf.h projects/routing/sys/sys/socket.h projects/routing/sys/sys/socketvar.h projects/routing/sys/sys/syscall.h projects/routing/sys/sys/syscall.mk projects/routing/sys/sys/syscallsubr.h projects/routing/sys/sys/sysproto.h projects/routing/sys/vm/vm_page.c projects/routing/sys/vm/vm_pager.h projects/routing/sys/vm/vm_phys.c projects/routing/sys/vm/vm_phys.h projects/routing/sys/vm/vnode_pager.c projects/routing/sys/xen/gnttab.c projects/routing/tools/build/mk/OptionalObsoleteFiles.inc projects/routing/tools/build/options/WITHOUT_LIB32 projects/routing/tools/regression/lib/libc/gen/Makefile projects/routing/tools/regression/lib/libc/stdio/Makefile projects/routing/tools/regression/zfs/zpool/add/files.t projects/routing/tools/tools/nanobsd/pcengines/ALIX_DSK projects/routing/tools/tools/nanobsd/pcengines/ALIX_NFS projects/routing/tools/tools/sysbuild/sysbuild.sh projects/routing/tools/tools/sysdoc/tunables.mdoc projects/routing/tools/tools/tinybsd/conf/default/TINYBSD projects/routing/tools/tools/tinybsd/conf/vpn/TINYBSD projects/routing/tools/tools/tinybsd/conf/wrap/TINYBSD projects/routing/usr.bin/iscsictl/iscsictl.c projects/routing/usr.bin/man/man.1 projects/routing/usr.bin/mkimg/image.c projects/routing/usr.bin/mkimg/mkimg.1 projects/routing/usr.bin/sort/Makefile projects/routing/usr.bin/w/w.c projects/routing/usr.bin/yacc/Makefile projects/routing/usr.sbin/Makefile projects/routing/usr.sbin/autofs/auto_master.5 projects/routing/usr.sbin/bhyve/bhyve.8 projects/routing/usr.sbin/bhyve/block_if.c projects/routing/usr.sbin/bsdconfig/networking/share/device.subr projects/routing/usr.sbin/bsdconfig/timezone/timezone projects/routing/usr.sbin/ctld/chap.c projects/routing/usr.sbin/ctld/ctl.conf.5 projects/routing/usr.sbin/ctld/ctld.8 projects/routing/usr.sbin/ctld/ctld.c projects/routing/usr.sbin/ctld/ctld.h projects/routing/usr.sbin/ctld/login.c projects/routing/usr.sbin/ctld/parse.y projects/routing/usr.sbin/ctld/token.l projects/routing/usr.sbin/freebsd-update/freebsd-update.sh projects/routing/usr.sbin/i2c/i2c.c projects/routing/usr.sbin/inetd/inetd.c projects/routing/usr.sbin/iscsid/chap.c projects/routing/usr.sbin/pw/pw.c projects/routing/usr.sbin/pw/tests/Makefile projects/routing/usr.sbin/pw/tests/helper_functions.shin projects/routing/usr.sbin/pw/tests/pw_delete.sh projects/routing/usr.sbin/pw/tests/pw_modify.sh projects/routing/usr.sbin/tzsetup/tzsetup.c projects/routing/usr.sbin/usbconfig/dump.c projects/routing/usr.sbin/watchdogd/watchdogd.8 projects/routing/usr.sbin/watchdogd/watchdogd.c projects/routing/usr.sbin/wpa/wpa_cli/Makefile Directory Properties: projects/routing/ (props changed) projects/routing/cddl/ (props changed) projects/routing/cddl/contrib/opensolaris/ (props changed) projects/routing/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/routing/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/routing/contrib/byacc/ (props changed) projects/routing/contrib/llvm/ (props changed) projects/routing/contrib/tzdata/ (props changed) projects/routing/etc/ (props changed) projects/routing/gnu/usr.bin/gdb/ (props changed) projects/routing/lib/libc/ (props changed) projects/routing/sbin/ (props changed) projects/routing/share/ (props changed) projects/routing/share/man/man4/ (props changed) projects/routing/sys/ (props changed) projects/routing/sys/boot/ (props changed) projects/routing/sys/cddl/contrib/opensolaris/ (props changed) projects/routing/sys/conf/ (props changed) projects/routing/sys/contrib/ipfilter/ (props changed) projects/routing/usr.bin/mkimg/ (props changed) projects/routing/usr.sbin/bhyve/ (props changed) Modified: projects/routing/MAINTAINERS ============================================================================== --- projects/routing/MAINTAINERS Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/MAINTAINERS Fri Nov 21 01:22:33 2014 (r274768) @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -bxe(4) davidch Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. @@ -81,6 +80,8 @@ contrib/pf glebius Pre-commit review rec file obrien Insists to keep file blocked from other's unapproved commits contrib/bzip2 obrien Pre-commit review required. +contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. +contrib/pjdfstest freebsd-testing,ngie Pre-commit review requested. geom_concat pjd Pre-commit review preferred. geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. Modified: projects/routing/Makefile.inc1 ============================================================================== --- projects/routing/Makefile.inc1 Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/Makefile.inc1 Fri Nov 21 01:22:33 2014 (r274768) @@ -1447,12 +1447,31 @@ NXBMAKE= ${NXBENV} ${MAKE} \ MK_CLANG_FULL=no MK_LLDB=no native-xtools: .MAKE + mkdir -p ${OBJTREE}/nxb-bin/bin + mkdir -p ${OBJTREE}/nxb-bin/sbin mkdir -p ${OBJTREE}/nxb-bin/usr mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${OBJTREE}/nxb-bin/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${OBJTREE}/nxb-bin/usr/include >/dev/null .for _tool in \ + bin/cat \ + bin/chmod \ + bin/cp \ + bin/csh \ + bin/echo \ + bin/expr \ + bin/hostname \ + bin/ln \ + bin/ls \ + bin/mkdir \ + bin/mv \ + bin/ps \ + bin/realpath \ + bin/rm \ + bin/rmdir \ + bin/sh \ + bin/sleep \ ${_clang_tblgen} \ usr.bin/ar \ ${_binutils} \ @@ -1460,12 +1479,39 @@ native-xtools: .MAKE ${_gcc_tools} \ ${_clang_libs} \ ${_clang} \ + sbin/md5 \ + sbin/sysctl \ + gnu/usr.bin/diff \ usr.bin/awk \ + usr.bin/basename \ usr.bin/bmake \ + usr.bin/bzip2 \ + usr.bin/cmp \ + usr.bin/dirname \ + usr.bin/env \ + usr.bin/fetch \ + usr.bin/find \ + usr.bin/grep \ + usr.bin/gzip \ + usr.bin/id \ usr.bin/lex \ usr.bin/lorder \ + usr.bin/mktemp \ + usr.bin/mt \ + usr.bin/patch \ usr.bin/sed \ - usr.bin/yacc + usr.bin/sort \ + usr.bin/tar \ + usr.bin/touch \ + usr.bin/tr \ + usr.bin/true \ + usr.bin/uniq \ + usr.bin/unzip \ + usr.bin/xargs \ + usr.bin/xinstall \ + usr.bin/xz \ + usr.bin/yacc \ + usr.sbin/chown ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${NXBMAKE} DIRPRFX=${_tool}/ obj && \ Modified: projects/routing/ObsoleteFiles.inc ============================================================================== --- projects/routing/ObsoleteFiles.inc Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/ObsoleteFiles.inc Fri Nov 21 01:22:33 2014 (r274768) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20141109: faith/faithd removal +OLD_FILES+=etc/rc.d/faith +OLD_FILES+=usr/share/man/man4/faith.4.gz +OLD_FILES+=usr/share/man/man4/if_faith.4.gz +OLD_FILES+=usr/sbin/faithd +OLD_FILES+=usr/share/man/man8/faithd.8.gz # 20141102: postrandom obsoleted by new /dev/random code OLD_FILES+=etc/rc.d/postrandom # 20141031: initrandom obsoleted by new /dev/random code Modified: projects/routing/UPDATING ============================================================================== --- projects/routing/UPDATING Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/UPDATING Fri Nov 21 01:22:33 2014 (r274768) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141109: + faith(4) and faithd(8) has been removed from base system. It + has been obsolete for a very long time. + 20141104: vt(4), the new console driver, is enabled by default. It brings support for Unicode and double-width characters, as well as @@ -833,8 +837,8 @@ COMMON ITEMS: 2.) update the ZFS boot block on your boot drive The following example updates the ZFS boot block on the first - partition (freebsd-boot) of a GPT partitioned drive ad0: - "gpart bootcode -p /boot/gptzfsboot -i 1 ad0" + partition (freebsd-boot) of a GPT partitioned drive ada0: + "gpart bootcode -p /boot/gptzfsboot -i 1 ada0" Non-boot pools do not need these updates. Modified: projects/routing/bin/sh/sh.1 ============================================================================== --- projects/routing/bin/sh/sh.1 Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/bin/sh/sh.1 Fri Nov 21 01:22:33 2014 (r274768) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd November 7, 2014 +.Dd November 14, 2014 .Dt SH 1 .Os .Sh NAME @@ -795,10 +795,13 @@ should indicate the various exit codes a Additionally, the built-in commands return exit codes, as does an executed shell function. .Pp -If a command is terminated by a signal, its exit status is 128 plus -the signal number. -Signal numbers are defined in the header file -.In sys/signal.h . +If a command is terminated by a signal, its exit status is greater than 128. +The signal name can be found by passing the exit status to +.Li kill -l . +.Pp +If there is no command word, +the exit status is the exit status of the last command substitution executed, +or zero if the command does not contain any command substitutions. .Ss Complex Commands Complex commands are combinations of simple commands with control operators or keywords, together creating a larger complex @@ -818,7 +821,8 @@ function definition .El .Pp Unless otherwise stated, the exit status of a command is -that of the last simple command executed by the command. +that of the last simple command executed by the command, +or zero if no simple command was executed. .Ss Pipelines A pipeline is a sequence of one or more commands separated by the control operator @@ -902,6 +906,8 @@ The format for running a command in back If the shell is not interactive, the standard input of an asynchronous command is set to .Pa /dev/null . +.Pp +The exit status is zero. .Ss Lists (Generally Speaking) A list is a sequence of zero or more commands separated by newlines, semicolons, or ampersands, @@ -940,6 +946,13 @@ command is: .Ic fi .Ed .Pp +The exit status is that of selected +.Ic then +or +.Ic else +list, +or zero if no list was selected. +.Pp The syntax of the .Ic while command is: @@ -960,6 +973,9 @@ in place of which causes it to repeat until the exit status of the first list is zero. .Pp +The exit status is that of the last execution of the second list, +or zero if it was never executed. +.Pp The syntax of the .Ic for command is: @@ -1040,10 +1056,6 @@ continuing until a list terminated with or the end of the .Ic case command. -The exit code of the -.Ic case -command is the exit code of the last command executed in the list or -zero if no patterns were matched. .Ss Grouping Commands Together Commands may be grouped by writing either .Pp @@ -1131,6 +1143,8 @@ and the syntax is: The .Ic local command is implemented as a built-in command. +The exit status is zero +unless the command is not in a function or a variable name is invalid. .Pp When a variable is made local, it inherits the initial value and exported and readonly flags from the variable Modified: projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Nov 21 01:22:33 2014 (r274768) @@ -2147,6 +2147,8 @@ dump_label(const char *dev) (void) close(fd); } +static uint64_t num_large_blocks; + /*ARGSUSED*/ static int dump_one_dir(const char *dsname, void *arg) @@ -2159,6 +2161,8 @@ dump_one_dir(const char *dsname, void *a (void) printf("Could not open %s, error %d\n", dsname, error); return (0); } + if (dmu_objset_ds(os)->ds_large_blocks) + num_large_blocks++; dump_dir(os); dmu_objset_disown(os, FTAG); fuid_table_destroy(); @@ -2169,7 +2173,7 @@ dump_one_dir(const char *dsname, void *a /* * Block statistics. */ -#define PSIZE_HISTO_SIZE (SPA_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1) +#define PSIZE_HISTO_SIZE (SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 2) typedef struct zdb_blkstats { uint64_t zb_asize; uint64_t zb_lsize; @@ -2234,7 +2238,15 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t * zb->zb_lsize += BP_GET_LSIZE(bp); zb->zb_psize += BP_GET_PSIZE(bp); zb->zb_count++; - zb->zb_psize_histogram[BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT]++; + + /* + * The histogram is only big enough to record blocks up to + * SPA_OLD_MAXBLOCKSIZE; larger blocks go into the last, + * "other", bucket. + */ + int idx = BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT; + idx = MIN(idx, SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1); + zb->zb_psize_histogram[idx]++; zb->zb_gangs += BP_COUNT_GANG(bp); @@ -2946,6 +2958,7 @@ dump_zpool(spa_t *spa) dump_metaslab_groups(spa); if (dump_opt['d'] || dump_opt['i']) { + uint64_t refcount; dump_dir(dp->dp_meta_objset); if (dump_opt['d'] >= 3) { dump_bpobj(&spa->spa_deferred_bpobj, @@ -2965,8 +2978,21 @@ dump_zpool(spa_t *spa) } (void) dmu_objset_find(spa_name(spa), dump_one_dir, NULL, DS_FIND_SNAPSHOTS | DS_FIND_CHILDREN); + + (void) feature_get_refcount(spa, + &spa_feature_table[SPA_FEATURE_LARGE_BLOCKS], &refcount); + if (num_large_blocks != refcount) { + (void) printf("large_blocks feature refcount mismatch: " + "expected %lld != actual %lld\n", + (longlong_t)num_large_blocks, + (longlong_t)refcount); + rc = 2; + } else { + (void) printf("Verified large_blocks feature refcount " + "is correct (%llu)\n", (longlong_t)refcount); + } } - if (dump_opt['b'] || dump_opt['c']) + if (rc == 0 && (dump_opt['b'] || dump_opt['c'])) rc = dump_block_stats(spa); if (rc == 0) Modified: projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Nov 21 01:22:33 2014 (r274768) @@ -27,10 +27,11 @@ .\" Copyright (c) 2014, Joyent, Inc. All rights reserved. .\" Copyright (c) 2013, Steven Hartland .\" Copyright (c) 2014, Xin LI +.\" Copyright (c) 2014, The FreeBSD Foundation, All Rights Reserved. .\" .\" $FreeBSD$ .\" -.Dd June 30, 2014 +.Dd November 12, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -179,12 +180,12 @@ .Ar bookmark .Nm .Cm send -.Op Fl DnPpRve +.Op Fl DnPpRveL .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Nm .Cm send -.Op Fl e +.Op Fl eL .Op Fl i Ar snapshot Ns | Ns bookmark .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm @@ -1187,6 +1188,12 @@ systems is strongly discouraged, and may .Pp The size specified must be a power of two greater than or equal to 512 and less than or equal to 128 Kbytes. +If the +.Sy large_blocks +feature is enabled on the pool, the size may be up to 1 Mbyte. +See +.Xr zpool-features 7 +for details on ZFS feature flags. .Pp Changing the file system's .Sy recordsize @@ -1785,7 +1792,7 @@ descendent file systems. Recursively destroy all clones of these snapshots, including the clones, snapshots, and children. If this flag is specified, the -.Op fl d +.Fl d flag will have no effect. .It Fl n Do a dry-run ("No-op") deletion. No data will be deleted. This is useful in @@ -2477,7 +2484,7 @@ feature. .It Xo .Nm .Cm send -.Op Fl DnPpRve +.Op Fl DnPpRveL .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Xc @@ -2549,6 +2556,22 @@ be used regardless of the dataset's property, but performance will be much better if the filesystem uses a dedup-capable checksum (eg. .Sy sha256 ) . +.It Fl L +Generate a stream which may contain blocks larger than 128KB. +This flag +has no effect if the +.Sy large_blocks +pool feature is disabled, or if the +.Sy recordsize +property of this filesystem has never been set above 128KB. +The receiving system must have the +.Sy large_blocks +pool feature enabled as well. +See +.Xr zpool-features 7 +for details on ZFS feature flags and the +.Sy large_blocks +feature. .It Fl e Generate a more compact stream by using WRITE_EMBEDDED records for blocks which are stored more compactly on disk by the @@ -2596,7 +2619,7 @@ on future versions of .It Xo .Nm .Cm send -.Op Fl e +.Op Fl eL .Op Fl i Ar snapshot Ns | Ns Ar bookmark .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Xc @@ -2622,6 +2645,22 @@ specified as the last component of the n If the incremental target is a clone, the incremental source can be the origin snapshot, or an earlier snapshot in the origin's filesystem, or the origin's origin, etc. +.It Fl L +Generate a stream which may contain blocks larger than 128KB. +This flag +has no effect if the +.Sy large_blocks +pool feature is disabled, or if the +.Sy recordsize +property of this filesystem has never been set above 128KB. +The receiving system must have the +.Sy large_blocks +pool feature enabled as well. +See +.Xr zpool-features 7 +for details on ZFS feature flags and the +.Sy large_blocks +feature. .It Fl e Generate a more compact stream by using WRITE_EMBEDDED records for blocks which are stored more compactly on disk by the Modified: projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Nov 21 01:22:33 2014 (r274768) @@ -274,9 +274,9 @@ get_usage(zfs_help_t idx) case HELP_ROLLBACK: return (gettext("\trollback [-rRf] \n")); case HELP_SEND: - return (gettext("\tsend [-DnPpRve] [-[iI] snapshot] " + return (gettext("\tsend [-DnPpRvLe] [-[iI] snapshot] " "\n" - "\tsend [-e] [-i snapshot|bookmark] " + "\tsend [-Le] [-i snapshot|bookmark] " "\n")); case HELP_SET: return (gettext("\tset " @@ -3709,7 +3709,7 @@ zfs_do_send(int argc, char **argv) boolean_t extraverbose = B_FALSE; /* check options */ - while ((c = getopt(argc, argv, ":i:I:RDpvnPe")) != -1) { + while ((c = getopt(argc, argv, ":i:I:RDpvnPLe")) != -1) { switch (c) { case 'i': if (fromname) @@ -3744,6 +3744,9 @@ zfs_do_send(int argc, char **argv) case 'n': flags.dryrun = B_TRUE; break; + case 'L': + flags.largeblock = B_TRUE; + break; case 'e': flags.embed_data = B_TRUE; break; @@ -3800,6 +3803,8 @@ zfs_do_send(int argc, char **argv) if (zhp == NULL) return (1); + if (flags.largeblock) + lzc_flags |= LZC_SEND_FLAG_LARGE_BLOCK; if (flags.embed_data) lzc_flags |= LZC_SEND_FLAG_EMBED_DATA; Modified: projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Fri Nov 21 01:22:33 2014 (r274768) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 2014 +.Dd November 10, 2014 .Dt ZPOOL-FEATURES 7 .Os .Sh NAME @@ -427,6 +427,33 @@ This feature becomes as soon as it is enabled and will never return to being .Sy enabled . +.It Sy large_blocks +.Bl -column "READ\-ONLY COMPATIBLE" "org.open-zfs:large_block" +.It GUID Ta org.open-zfs:large_block +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta extensible_dataset +.El +.Pp +The +.Sy large_block +feature allows the record size on a dataset to be +set larger than 128KB. +.Pp +This feature becomes +.Sy active +once a +.Sy recordsize +property has been set larger than 128KB, and will return to being +.Sy enabled +once all filesystems that have ever had their recordsize larger than 128KB +are destroyed. +.Pp +Please note that booting from datasets that have recordsize greater than +128KB is +.Em NOT +supported by the +.Fx +boot loader. .El .Sh SEE ALSO .Xr zpool 8 Modified: projects/routing/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c Fri Nov 21 01:22:33 2014 (r274768) @@ -54,7 +54,6 @@ uint64_t total_stream_len = 0; FILE *send_stream = 0; boolean_t do_byteswap = B_FALSE; boolean_t do_cksum = B_TRUE; -#define INITIAL_BUFLEN (1<<20) static void usage(void) @@ -67,6 +66,18 @@ usage(void) exit(1); } +static void * +safe_malloc(size_t size) +{ + void *rv = malloc(size); + if (rv == NULL) { + (void) fprintf(stderr, "ERROR; failed to allocate %zu bytes\n", + size); + abort(); + } + return (rv); +} + /* * ssread - send stream read. * @@ -158,7 +169,7 @@ print_block(char *buf, int length) int main(int argc, char *argv[]) { - char *buf = malloc(INITIAL_BUFLEN); + char *buf = safe_malloc(SPA_MAXBLOCKSIZE); uint64_t drr_record_count[DRR_NUMTYPES] = { 0 }; uint64_t total_records = 0; dmu_replay_record_t thedrr; @@ -307,9 +318,9 @@ main(int argc, char *argv[]) nvlist_t *nv; int sz = drr->drr_payloadlen; - if (sz > INITIAL_BUFLEN) { + if (sz > SPA_MAXBLOCKSIZE) { free(buf); - buf = malloc(sz); + buf = safe_malloc(sz); } (void) ssread(buf, sz, &zc); if (ferror(send_stream)) Modified: projects/routing/cddl/contrib/opensolaris/cmd/ztest/ztest.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/ztest/ztest.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/ztest/ztest.c Fri Nov 21 01:22:33 2014 (r274768) @@ -987,9 +987,15 @@ ztest_spa_get_ashift() { static int ztest_random_blocksize(void) { - // Choose a block size >= the ashift. - uint64_t block_shift = - ztest_random(SPA_MAXBLOCKSHIFT - ztest_spa_get_ashift() + 1); + uint64_t block_shift; + /* + * Choose a block size >= the ashift. + * If the SPA supports new MAXBLOCKSIZE, test up to 1MB blocks. + */ + int maxbs = SPA_OLD_MAXBLOCKSHIFT; + if (spa_maxblocksize(ztest_spa) == SPA_MAXBLOCKSIZE) + maxbs = 20; + block_shift = ztest_random(maxbs - ztest_spa_get_ashift() + 1); return (1 << (SPA_MINBLOCKSHIFT + block_shift)); } @@ -4789,7 +4795,7 @@ ztest_fault_inject(ztest_ds_t *zd, uint6 char path0[MAXPATHLEN]; char pathrand[MAXPATHLEN]; size_t fsize; - int bshift = SPA_MAXBLOCKSHIFT + 2; /* don't scrog all labels */ + int bshift = SPA_OLD_MAXBLOCKSHIFT + 2; /* don't scrog all labels */ int iters = 1000; int maxfaults; int mirror_save; Modified: projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Fri Nov 21 01:22:33 2014 (r274768) @@ -469,7 +469,7 @@ dof_add_probe(dt_idhash_t *dhp, dt_ident * locally so an alternate symbol is added for the purpose * of this relocation. */ - if (pip->pi_rname[0] == '\0') + if (pip->pi_rname == NULL) dofr.dofr_name = dofpr.dofpr_func; else dofr.dofr_name = dof_add_string(ddo, pip->pi_rname); Modified: projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Fri Nov 21 01:22:33 2014 (r274768) @@ -520,6 +520,8 @@ dt_probe_destroy(dt_probe_t *prp) for (pip = prp->pr_inst; pip != NULL; pip = pip_next) { pip_next = pip->pi_next; + dt_free(dtp, pip->pi_rname); + dt_free(dtp, pip->pi_fname); dt_free(dtp, pip->pi_offs); dt_free(dtp, pip->pi_enoffs); dt_free(dtp, pip); @@ -552,28 +554,18 @@ dt_probe_define(dt_provider_t *pvp, dt_p if ((pip = dt_zalloc(dtp, sizeof (*pip))) == NULL) return (-1); - if ((pip->pi_offs = dt_zalloc(dtp, - sizeof (uint32_t))) == NULL) { - dt_free(dtp, pip); - return (-1); - } + if ((pip->pi_offs = dt_zalloc(dtp, sizeof (uint32_t))) == NULL) + goto nomem; if ((pip->pi_enoffs = dt_zalloc(dtp, - sizeof (uint32_t))) == NULL) { - dt_free(dtp, pip->pi_offs); - dt_free(dtp, pip); - return (-1); - } + sizeof (uint32_t))) == NULL) + goto nomem; - (void) strlcpy(pip->pi_fname, fname, sizeof (pip->pi_fname)); - if (rname != NULL) { - if (strlen(rname) + 1 > sizeof (pip->pi_rname)) { - dt_free(dtp, pip->pi_offs); - dt_free(dtp, pip); - return (dt_set_errno(dtp, EDT_COMPILER)); - } - (void) strcpy(pip->pi_rname, rname); - } + if ((pip->pi_fname = strdup(fname)) == NULL) + goto nomem; + + if (rname != NULL && (pip->pi_rname = strdup(rname)) == NULL) + goto nomem; pip->pi_noffs = 0; pip->pi_maxoffs = 1; @@ -618,6 +610,13 @@ dt_probe_define(dt_provider_t *pvp, dt_p (*offs)[(*noffs)++] = offset; return (0); + +nomem: + dt_free(dtp, pip->pi_fname); + dt_free(dtp, pip->pi_enoffs); + dt_free(dtp, pip->pi_offs); + dt_free(dtp, pip); + return (dt_set_errno(dtp, EDT_NOMEM)); } /* Modified: projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h Fri Nov 21 01:22:33 2014 (r274768) @@ -64,8 +64,8 @@ typedef struct dt_probe_iter { } dt_probe_iter_t; typedef struct dt_probe_instance { - char pi_fname[DTRACE_FUNCNAMELEN]; /* function name */ - char pi_rname[DTRACE_FUNCNAMELEN + 20]; /* mangled relocation name */ + char *pi_fname; /* function name */ + char *pi_rname; /* mangled relocation name */ uint32_t *pi_offs; /* offsets into the function */ uint32_t *pi_enoffs; /* is-enabled offsets */ uint_t pi_noffs; /* number of offsets */ Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Nov 21 01:22:33 2014 (r274768) @@ -609,6 +609,9 @@ typedef struct sendflags { /* show progress (ie. -v) */ boolean_t progress; + /* large blocks (>128K) are permitted */ + boolean_t largeblock; + /* WRITE_EMBEDDED records of type DATA are permitted */ boolean_t embed_data; } sendflags_t; Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Nov 21 01:22:33 2014 (r274768) @@ -1080,21 +1080,36 @@ zfs_valid_proplist(libzfs_handle_t *hdl, break; } - case ZFS_PROP_RECORDSIZE: case ZFS_PROP_VOLBLOCKSIZE: - /* must be power of two within SPA_{MIN,MAX}BLOCKSIZE */ + case ZFS_PROP_RECORDSIZE: + { + int maxbs = SPA_MAXBLOCKSIZE; + if (zhp != NULL) { + maxbs = zpool_get_prop_int(zhp->zpool_hdl, + ZPOOL_PROP_MAXBLOCKSIZE, NULL); + } + /* + * Volumes are limited to a volblocksize of 128KB, + * because they typically service workloads with + * small random writes, which incur a large performance + * penalty with large blocks. + */ + if (prop == ZFS_PROP_VOLBLOCKSIZE) + maxbs = SPA_OLD_MAXBLOCKSIZE; + /* + * The value must be a power of two between + * SPA_MINBLOCKSIZE and maxbs. + */ if (intval < SPA_MINBLOCKSIZE || - intval > SPA_MAXBLOCKSIZE || !ISP2(intval)) { + intval > maxbs || !ISP2(intval)) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "'%s' must be power of 2 from %u " - "to %uk"), propname, - (uint_t)SPA_MINBLOCKSIZE, - (uint_t)SPA_MAXBLOCKSIZE >> 10); + "'%s' must be power of 2 from 512B " + "to %uKB"), propname, maxbs >> 10); (void) zfs_error(hdl, EZFS_BADPROP, errbuf); goto error; } break; - + } case ZFS_PROP_MLSLABEL: { #ifdef sun @@ -1471,7 +1486,9 @@ zfs_setprop_error(libzfs_handle_t *hdl, break; case ERANGE: - if (prop == ZFS_PROP_COMPRESSION) { + case EDOM: + if (prop == ZFS_PROP_COMPRESSION || + prop == ZFS_PROP_RECORDSIZE) { (void) zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "property setting is not allowed on " "bootable datasets")); @@ -3197,9 +3214,7 @@ zfs_create(libzfs_handle_t *hdl, const c case EDOM: zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "volume block size must be power of 2 from " - "%u to %uk"), - (uint_t)SPA_MINBLOCKSIZE, - (uint_t)SPA_MAXBLOCKSIZE >> 10); + "512B to 128KB")); return (zfs_error(hdl, EZFS_BADPROP, errbuf)); Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Fri Nov 21 01:22:33 2014 (r274768) @@ -215,7 +215,7 @@ static void * cksummer(void *arg) { dedup_arg_t *dda = arg; - char *buf = malloc(1<<20); + char *buf = zfs_alloc(dda->dedup_hdl, SPA_MAXBLOCKSIZE); dmu_replay_record_t thedrr; dmu_replay_record_t *drr = &thedrr; struct drr_begin *drrb = &thedrr.drr_u.drr_begin; @@ -280,9 +280,9 @@ cksummer(void *arg) DMU_COMPOUNDSTREAM && drr->drr_payloadlen != 0) { int sz = drr->drr_payloadlen; - if (sz > 1<<20) { - free(buf); - buf = malloc(sz); + if (sz > SPA_MAXBLOCKSIZE) { + buf = zfs_realloc(dda->dedup_hdl, buf, + SPA_MAXBLOCKSIZE, sz); } (void) ssread(buf, sz, ofp); if (ferror(stdin)) @@ -815,7 +815,7 @@ typedef struct send_dump_data { char prevsnap[ZFS_MAXNAMELEN]; uint64_t prevsnap_obj; boolean_t seenfrom, seento, replicate, doall, fromorigin; - boolean_t verbose, dryrun, parsable, progress, embed_data; + boolean_t verbose, dryrun, parsable, progress, embed_data, large_block; int outfd; boolean_t err; nvlist_t *fss; @@ -1163,6 +1163,8 @@ dump_snapshot(zfs_handle_t *zhp, void *a } enum lzc_send_flags flags = 0; + if (sdd->large_block) + flags |= LZC_SEND_FLAG_LARGE_BLOCK; if (sdd->embed_data) flags |= LZC_SEND_FLAG_EMBED_DATA; @@ -1511,6 +1513,7 @@ zfs_send(zfs_handle_t *zhp, const char * sdd.parsable = flags->parsable; sdd.progress = flags->progress; sdd.dryrun = flags->dryrun; + sdd.large_block = flags->largeblock; sdd.embed_data = flags->embed_data; sdd.filter_cb = filter_func; sdd.filter_cb_arg = cb_arg; @@ -2545,7 +2548,7 @@ static int recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap) { dmu_replay_record_t *drr; - void *buf = malloc(1<<20); + void *buf = zfs_alloc(hdl, SPA_MAXBLOCKSIZE); char errbuf[1024]; (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Fri Nov 21 01:22:33 2014 (r274768) @@ -502,6 +502,10 @@ lzc_get_holds(const char *snapname, nvli * * "fd" is the file descriptor to write the send stream to. * + * If "flags" contains LZC_SEND_FLAG_LARGE_BLOCK, the stream is permitted + * to contain DRR_WRITE records with drr_length > 128K, and DRR_OBJECT + * records with drr_blksz > 128K. + * * If "flags" contains LZC_SEND_FLAG_EMBED_DATA, the stream is permitted * to contain DRR_WRITE_EMBEDDED records with drr_etype==BP_EMBEDDED_TYPE_DATA, * which the receiving system must support (as indicated by support @@ -518,6 +522,8 @@ lzc_send(const char *snapname, const cha fnvlist_add_int32(args, "fd", fd); if (from != NULL) fnvlist_add_string(args, "fromsnap", from); + if (flags & LZC_SEND_FLAG_LARGE_BLOCK) + fnvlist_add_boolean(args, "largeblockok"); if (flags & LZC_SEND_FLAG_EMBED_DATA) fnvlist_add_boolean(args, "embedok"); err = lzc_ioctl(ZFS_IOC_SEND_NEW, snapname, args, NULL); Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h Fri Nov 21 01:22:33 2014 (r274768) @@ -54,7 +54,8 @@ int lzc_release(nvlist_t *, nvlist_t **) int lzc_get_holds(const char *, nvlist_t **); enum lzc_send_flags { - LZC_SEND_FLAG_EMBED_DATA = 1 << 0 + LZC_SEND_FLAG_EMBED_DATA = 1 << 0, + LZC_SEND_FLAG_LARGE_BLOCK = 1 << 1 }; int lzc_send(const char *, const char *, int, enum lzc_send_flags); Modified: projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c Fri Nov 21 01:22:33 2014 (r274768) @@ -24,6 +24,8 @@ */ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright 2012 Garrett D'Amore . All rights reserved. + * Copyright (c) 2014 by Delphix. All rights reserved. */ #include @@ -32,8 +34,10 @@ int taskq_now; taskq_t *system_taskq; #define TASKQ_ACTIVE 0x00010000 +#define TASKQ_NAMELEN 31 struct taskq { + char tq_name[TASKQ_NAMELEN + 1]; kmutex_t tq_lock; krwlock_t tq_threadlock; kcondvar_t tq_dispatch_cv; @@ -136,6 +140,7 @@ taskq_dispatch(taskq_t *tq, task_func_t t->tqent_prev->tqent_next = t; t->tqent_func = func; t->tqent_arg = arg; + t->tqent_flags = 0; cv_signal(&tq->tq_dispatch_cv); mutex_exit(&tq->tq_lock); return (1); @@ -245,6 +250,7 @@ taskq_create(const char *name, int nthre cv_init(&tq->tq_dispatch_cv, NULL, CV_DEFAULT, NULL); cv_init(&tq->tq_wait_cv, NULL, CV_DEFAULT, NULL); cv_init(&tq->tq_maxalloc_cv, NULL, CV_DEFAULT, NULL); + (void) strncpy(tq->tq_name, name, TASKQ_NAMELEN + 1); tq->tq_flags = flags | TASKQ_ACTIVE; tq->tq_active = nthreads; tq->tq_nthreads = nthreads; Modified: projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Fri Nov 21 01:22:33 2014 (r274768) @@ -766,7 +766,8 @@ die_array_resolve(tdesc_t *tdp, tdesc_t debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id, tdp->t_ardef->ad_contents->t_id); - if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0) { + if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 && + (tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) { debug(3, "unable to resolve array %s (%d) contents %d\n", tdesc_name(tdp), tdp->t_id, tdp->t_ardef->ad_contents->t_id); @@ -1138,12 +1139,17 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t ** /* * For empty members, or GCC/C99 flexible array - * members, a size of 0 is correct. + * members, a size of 0 is correct. Structs and unions + * consisting of flexible array members will also have + * size 0. */ if (mt->t_members == NULL) continue; if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0) continue; + if ((mt->t_flags & TDESC_F_RESOLVED) != 0 && + (mt->t_type == STRUCT || mt->t_type == UNION)) + continue; dw->dw_nunres++; return (1); Modified: projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Fri Nov 21 01:22:33 2014 (r274768) @@ -287,19 +287,11 @@ equiv_su(tdesc_t *stdp, tdesc_t *ttdp, e while (ml1 && ml2) { if (ml1->ml_offset != ml2->ml_offset || - strcmp(ml1->ml_name, ml2->ml_name) != 0) + strcmp(ml1->ml_name, ml2->ml_name) != 0 || + ml1->ml_size != ml2->ml_size || + !equiv_node(ml1->ml_type, ml2->ml_type, ed)) return (0); - /* - * Don't do the recursive equivalency checking more than - * we have to. - */ - if (olm1 == NULL || olm1->ml_type->t_id != ml1->ml_type->t_id) { - if (ml1->ml_size != ml2->ml_size || - !equiv_node(ml1->ml_type, ml2->ml_type, ed)) - return (0); - } - olm1 = ml1; ml1 = ml1->ml_next; ml2 = ml2->ml_next; @@ -357,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; - if (ctdp->t_emark > ed->ed_clear_mark || + if (ctdp->t_emark > ed->ed_clear_mark && mtdp->t_emark > ed->ed_clear_mark) return (ctdp->t_emark == mtdp->t_emark); Modified: projects/routing/contrib/byacc/test/yacc/calc.tab.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/calc.tab.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/calc.tab.c Fri Nov 21 01:22:33 2014 (r274768) @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, Modified: projects/routing/contrib/byacc/test/yacc/calc1.tab.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/calc1.tab.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/calc1.tab.c Fri Nov 21 01:22:33 2014 (r274768) @@ -175,7 +175,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc1_lhs[] = { -1, 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, Modified: projects/routing/contrib/byacc/test/yacc/calc2.tab.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/calc2.tab.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/calc2.tab.c Fri Nov 21 01:22:33 2014 (r274768) @@ -152,7 +152,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, Modified: projects/routing/contrib/byacc/test/yacc/calc3.tab.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/calc3.tab.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/calc3.tab.c Fri Nov 21 01:22:33 2014 (r274768) @@ -157,7 +157,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, Modified: projects/routing/contrib/byacc/test/yacc/code_calc.code.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/code_calc.code.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/code_calc.code.c Fri Nov 21 01:22:33 2014 (r274768) @@ -160,7 +160,7 @@ typedef int YYSTYPE; #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) extern int YYPARSE_DECL(); -typedef short YYINT; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 01:27:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 482D8545; Fri, 21 Nov 2014 01:27:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B3C1C1F; Fri, 21 Nov 2014 01:27:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL1RRgk005880; Fri, 21 Nov 2014 01:27:27 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL1RRl4005878; Fri, 21 Nov 2014 01:27:27 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411210127.sAL1RRl4005878@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 21 Nov 2014 01:27:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274769 - projects/routing/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 01:27:28 -0000 Author: melifaro Date: Fri Nov 21 01:27:27 2014 New Revision: 274769 URL: https://svnweb.freebsd.org/changeset/base/274769 Log: Finish sync: remove if_faith.c Deleted: projects/routing/sys/net/if_faith.c From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 01:53:41 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FBC3B27; Fri, 21 Nov 2014 01:53:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C3E1EA6; Fri, 21 Nov 2014 01:53:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL1rfdT037580; Fri, 21 Nov 2014 01:53:41 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL1rf2c037578; Fri, 21 Nov 2014 01:53:41 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201411210153.sAL1rf2c037578@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Fri, 21 Nov 2014 01:53:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274771 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 01:53:41 -0000 Author: cperciva Date: Fri Nov 21 01:53:40 2014 New Revision: 274771 URL: https://svnweb.freebsd.org/changeset/base/274771 Log: Add NOSWAP option which can be set by a vmimage.conf file to specify that no swap space should be created in the image. This will be used by EC2 builds, since FreeBSD/EC2 allocates swap space on "ephemeral" disks which are physically attached to the Xen host node. Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Fri Nov 21 01:43:55 2014 (r274770) +++ projects/release-vmimage/release/tools/vmimage.subr Fri Nov 21 01:53:40 2014 (r274771) @@ -10,19 +10,22 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sb trap "cleanup" INT QUIT TRAP ABRT TERM write_partition_layout() { + if [ -z "${NOSWAP}" ]; then + SWAPOPT="-p freebsd-swap/swapfs::1G" + fi case "${TARGET}:${TARGET_ARCH}" in amd64:amd64 | i386:i386) mkimg -s gpt -b /boot/pmbr \ -p freebsd-boot/bootfs:=/boot/gptboot \ - -p freebsd-swap/swapfs::1G \ + ${SWAPOPT} \ -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; powerpc:powerpc*) mkimg -s apm \ -p apple-boot/bootfs:=/boot/boot1.hfs \ - -p freebsd-swap/swapfs::1G \ + ${SWAPOPT} \ -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; @@ -76,8 +79,10 @@ vm_install_base() { > ${DESTDIR}/etc/fstab echo '/dev/gpt/rootfs / ufs rw 1 1' \ >> ${DESTDIR}/etc/fstab - echo '/dev/gpt/swapfs none swap sw 0 0' \ - >> ${DESTDIR}/etc/fstab + if [ -z "${NOSWAP}" ]; then + echo '/dev/gpt/swapfs none swap sw 0 0' \ + >> ${DESTDIR}/etc/fstab + fi mkdir -p ${DESTDIR}/dev mount -t devfs devfs ${DESTDIR}/dev From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 02:13:14 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 055CA108; Fri, 21 Nov 2014 02:13:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA3FFE8; Fri, 21 Nov 2014 02:13:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL2DDNE060357; Fri, 21 Nov 2014 02:13:13 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL2DDcK060348; Fri, 21 Nov 2014 02:13:13 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201411210213.sAL2DDcK060348@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Fri, 21 Nov 2014 02:13:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274773 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 02:13:14 -0000 Author: cperciva Date: Fri Nov 21 02:13:12 2014 New Revision: 274773 URL: https://svnweb.freebsd.org/changeset/base/274773 Log: Change how packages are installed into VM images: Rather than chrooting into the image and running 'pkg install' from there, use 'pkg fetch' to download packages into a temporary location and then 'pkg add' to install them into the image. This simplifies the code by avoiding the need to copy /etc/resolv.conf into the image and then delete it later, and makes it possible to cross build (e.g., to create an amd64 image when running on i386 hardware; or in the future for building disk images for embedded platforms). Because pkg was implicitly installed when VM_EXTRA_PACKAGES was non-empty, add it to VM_EXTRA_PACKAGES in azure.conf and openstack.conf to maintain the current behaviour. By default repo-FreeBSD.sqlite is copied into the image, (a) to match previous behaviour, where the file would be downloaded by the chrooted pkg invocation; and (b) because it may be useful for testing purposes, e.g., to see why a package didn't get installed. Because this file is large (46 MB) and not likely to be useful in -RELEASE images which are being launched into Clouds several months later, it can be disabled by setting NOREPOSQLITE. As far as I know this commit does not change the disk images produced in any filesystem-visible way. Modified: projects/release-vmimage/release/tools/azure.conf projects/release-vmimage/release/tools/openstack.conf projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/azure.conf ============================================================================== --- projects/release-vmimage/release/tools/azure.conf Fri Nov 21 02:05:48 2014 (r274772) +++ projects/release-vmimage/release/tools/azure.conf Fri Nov 21 02:13:12 2014 (r274773) @@ -5,7 +5,7 @@ # Set to a list of packages to install. # Example: -#export VM_EXTRA_PACKAGES="www/apache24" +#export VM_EXTRA_PACKAGES="www/apache24 ports-mgmt/pkg" export VM_EXTRA_PACKAGES= # Set to a list of third-party software to enable in rc.conf(5). @@ -17,7 +17,6 @@ vm_extra_install_base() { fetch -o ${DESTDIR}/usr/sbin/waagent \ http://people.freebsd.org/~gjb/waagent chmod +x ${DESTDIR}/usr/sbin/waagent - rm -f ${DESTDIR}/etc/resolv.conf return 0 } @@ -33,8 +32,6 @@ vm_extra_pre_umount() { echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } Modified: projects/release-vmimage/release/tools/openstack.conf ============================================================================== --- projects/release-vmimage/release/tools/openstack.conf Fri Nov 21 02:05:48 2014 (r274772) +++ projects/release-vmimage/release/tools/openstack.conf Fri Nov 21 02:13:12 2014 (r274773) @@ -4,7 +4,7 @@ # # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="net/cloud-init" +export VM_EXTRA_PACKAGES="net/cloud-init ports-mgmt/pkg" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="cloudinit" @@ -13,7 +13,6 @@ vm_extra_install_base() { fetch -o ${DESTDIR}/usr/sbin/waagent \ http://people.freebsd.org/~gjb/waagent chmod +x ${DESTDIR}/usr/sbin/waagent - rm -f ${DESTDIR}/etc/resolv.conf return 0 } @@ -22,7 +21,5 @@ vm_extra_pre_umount() { echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Fri Nov 21 02:05:48 2014 (r274772) +++ projects/release-vmimage/release/tools/vmimage.subr Fri Nov 21 02:13:12 2014 (r274773) @@ -90,8 +90,6 @@ vm_install_base() { chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart umount ${DESTDIR}/dev - cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf - return 0 } @@ -114,15 +112,18 @@ vm_extra_enable_services() { } vm_extra_install_packages() { - mkdir -p ${DESTDIR}/dev - mount -t devfs devfs ${DESTDIR}/dev - chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ - /usr/sbin/pkg bootstrap -y if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then - chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ - /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} + PKGSDIR=`mktemp -d` + ABI=`/usr/sbin/pkg -c ${DESTDIR} config abi` + /usr/sbin/pkg -o ABI=${ABI} fetch -o ${PKGSDIR} -d -y ${VM_EXTRA_PACKAGES} + for PKG in ${PKGSDIR}/All/*; do + /usr/sbin/pkg -c ${DESTDIR} add -M - < ${PKG} + done + rm -r ${PKGSDIR} + if [ -z "${NOREPOSQLITE}" ]; then + cp /var/db/pkg/repo-FreeBSD.sqlite ${DESTDIR}/var/db/pkg + fi fi - umount ${DESTDIR}/dev return 0 } @@ -138,8 +139,6 @@ vm_extra_pre_umount() { # Prototype. When overridden, installs additional ports within the # virtual machine environment. - rm -f ${DESTDIR}/etc/resolv.conf - return 0 } From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 02:29:00 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE36631D; Fri, 21 Nov 2014 02:29:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9FD7C1EF; Fri, 21 Nov 2014 02:29:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL2T0qO076505; Fri, 21 Nov 2014 02:29:00 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL2SvAI076446; Fri, 21 Nov 2014 02:28:57 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411210228.sAL2SvAI076446@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 21 Nov 2014 02:28:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274774 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 02:29:00 -0000 Author: melifaro Date: Fri Nov 21 02:28:56 2014 New Revision: 274774 URL: https://svnweb.freebsd.org/changeset/base/274774 Log: Switch IF_AFDATA lock to rmlock Modified: projects/routing/sys/net/if.c projects/routing/sys/net/if_llatbl.c projects/routing/sys/net/if_var.h projects/routing/sys/net/rt_nhops.c projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet/toecore.c projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/nd6.c projects/routing/sys/netinet6/nd6_nbr.c projects/routing/sys/netinet6/nd6_rtr.c projects/routing/sys/netinet6/scope6.c Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/net/if.c Fri Nov 21 02:28:56 2014 (r274774) @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -773,8 +774,11 @@ if_attachdomain1(struct ifnet *ifp) * Since dp->dom_ifattach calls malloc() with M_WAITOK, we * cannot lock ifp->if_afdata initialization, entirely. */ +#if 0 if (IF_AFDATA_TRYLOCK(ifp) == 0) return; +#endif + IF_AFDATA_LOCK(ifp); if (ifp->if_afdata_initialized >= domain_init_status) { IF_AFDATA_UNLOCK(ifp); log(LOG_WARNING, "%s called more than once on %s\n", Modified: projects/routing/sys/net/if_llatbl.c ============================================================================== --- projects/routing/sys/net/if_llatbl.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/net/if_llatbl.c Fri Nov 21 02:28:56 2014 (r274774) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef DDB #include @@ -142,6 +143,7 @@ llentry_alloc(struct ifnet *ifp, struct struct sockaddr_storage *dst) { struct llentry *la; + IF_AFDATA_TRACKER; IF_AFDATA_RLOCK(ifp); la = lla_lookup(lt, LLE_EXCLUSIVE, (struct sockaddr *)dst); Modified: projects/routing/sys/net/if_var.h ============================================================================== --- projects/routing/sys/net/if_var.h Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/net/if_var.h Fri Nov 21 02:28:56 2014 (r274774) @@ -192,7 +192,7 @@ struct ifnet { int if_amcount; /* number of all-multicast requests */ struct ifaddr *if_addr; /* pointer to link-level address */ const u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */ - struct rwlock if_afdata_lock; + struct rmlock if_afdata_lock; void *if_afdata[AF_MAX]; int if_afdata_initialized; @@ -340,21 +340,22 @@ EVENTHANDLER_DECLARE(group_change_event, #endif /* _SYS_EVENTHANDLER_H_ */ #define IF_AFDATA_LOCK_INIT(ifp) \ - rw_init(&(ifp)->if_afdata_lock, "if_afdata") + rm_init(&(ifp)->if_afdata_lock, "if_afdata") -#define IF_AFDATA_WLOCK(ifp) rw_wlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_RLOCK(ifp) rw_rlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_WUNLOCK(ifp) rw_wunlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_RUNLOCK(ifp) rw_runlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_WLOCK(ifp) rm_wlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_RLOCK(ifp) rm_rlock(&(ifp)->if_afdata_lock, &tracker) +#define IF_AFDATA_WUNLOCK(ifp) rm_wunlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_RUNLOCK(ifp) rm_runlock(&(ifp)->if_afdata_lock, &tracker) #define IF_AFDATA_LOCK(ifp) IF_AFDATA_WLOCK(ifp) #define IF_AFDATA_UNLOCK(ifp) IF_AFDATA_WUNLOCK(ifp) -#define IF_AFDATA_TRYLOCK(ifp) rw_try_wlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_DESTROY(ifp) rw_destroy(&(ifp)->if_afdata_lock) - -#define IF_AFDATA_LOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_LOCKED) -#define IF_AFDATA_RLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_RLOCKED) -#define IF_AFDATA_WLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_WLOCKED) -#define IF_AFDATA_UNLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED) +#define IF_AFDATA_TRYLOCK(ifp) rm_try_wlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_DESTROY(ifp) rm_destroy(&(ifp)->if_afdata_lock) +#define IF_AFDATA_TRACKER struct rm_priotracker tracker + +#define IF_AFDATA_LOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_LOCKED) +#define IF_AFDATA_RLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_RLOCKED) +#define IF_AFDATA_WLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_WLOCKED) +#define IF_AFDATA_UNLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED) /* * 72 was chosen below because it is the size of a TCP/IP Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/net/rt_nhops.c Fri Nov 21 02:28:56 2014 (r274774) @@ -681,6 +681,7 @@ fib6_storelladdr(struct ifnet *ifp, stru { struct llentry *ln; struct sockaddr_in6 dst_sa; + IF_AFDATA_TRACKER; if (mm_flags & M_MCAST) { ETHER_MAP_IPV6_MULTICAST(&dst, desten); Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet/if_ether.c Fri Nov 21 02:28:56 2014 (r274774) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -354,6 +355,7 @@ arpresolve_fast(struct ifnet *ifp, struc struct llentry *la; struct sockaddr_in sin; const struct sockaddr *sa_dst; + IF_AFDATA_TRACKER; if (mflags & M_BCAST) { memcpy(dst_addr, ifp->if_broadcastaddr, ifp->if_addrlen); @@ -437,6 +439,7 @@ arpresolve(struct ifnet *ifp, struct rte const struct sockaddr *dst, u_char *desten, struct llentry **lle) { struct llentry *la = NULL; + IF_AFDATA_TRACKER; int is_gw; *lle = NULL; @@ -479,6 +482,7 @@ arpresolve_slow(struct ifnet *ifp, int i struct mbuf *curr = NULL; struct mbuf *next = NULL; int create, error; + IF_AFDATA_TRACKER; create = 0; *lle = NULL; @@ -699,6 +703,7 @@ in_arpinput(struct mbuf *m) sin.sin_len = sizeof(struct sockaddr_in); sin.sin_family = AF_INET; sin.sin_addr.s_addr = 0; + IF_AFDATA_TRACKER; if (ifp->if_bridge) bridged = 1; Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet/in.c Fri Nov 21 02:28:56 2014 (r274774) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet/toecore.c ============================================================================== --- projects/routing/sys/netinet/toecore.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet/toecore.c Fri Nov 21 02:28:56 2014 (r274774) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -456,6 +457,7 @@ toe_nd6_resolve(struct ifnet *ifp, struc struct llentry *lle; struct sockaddr_in6 *sin6 = (void *)sa; int rc, flags = 0; + IF_AFDATA_TRACKER; restart: IF_AFDATA_RLOCK(ifp); Modified: projects/routing/sys/netinet6/icmp6.c ============================================================================== --- projects/routing/sys/netinet6/icmp6.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/icmp6.c Fri Nov 21 02:28:56 2014 (r274774) @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2504,6 +2505,7 @@ icmp6_redirect_output(struct mbuf *m0, s struct sockaddr_in6 src_sa; struct route_info ri; struct nhop6_basic nh6; + IF_AFDATA_TRACKER; int e; icmp6_errcount(ND_REDIRECT, 0); Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/in6.c Fri Nov 21 02:28:56 2014 (r274774) @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet6/nd6.c ============================================================================== --- projects/routing/sys/netinet6/nd6.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/nd6.c Fri Nov 21 02:28:56 2014 (r274774) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -997,6 +998,7 @@ nd6_is_addr_neighbor(struct sockaddr_in6 { struct llentry *lle; int rc = 0; + IF_AFDATA_TRACKER; IF_AFDATA_UNLOCK_ASSERT(ifp); if (nd6_is_new_addr_neighbor(addr, ifp)) @@ -1166,6 +1168,7 @@ nd6_nud_hint(struct rtentry *rt, struct { struct llentry *ln; struct ifnet *ifp; + IF_AFDATA_TRACKER; if ((dst6 == NULL) || (rt == NULL)) return; @@ -1253,6 +1256,7 @@ nd6_ioctl(u_long cmd, caddr_t data, stru struct nd_defrouter *dr; struct nd_prefix *pr; int i = 0, error = 0; + IF_AFDATA_TRACKER; if (ifp->if_afdata[AF_INET6] == NULL) return (EPFNOSUPPORT); @@ -1578,6 +1582,7 @@ nd6_cache_lladdr(struct ifnet *ifp, stru struct sockaddr_in6 sin6; struct mbuf *chain = NULL; int static_route = 0; + IF_AFDATA_TRACKER; IF_AFDATA_UNLOCK_ASSERT(ifp); @@ -1867,6 +1872,7 @@ nd6_output(struct ifnet *ifp, struct ifn { struct llentry *ln = NULL; int error = 0; + IF_AFDATA_TRACKER; /* discard the packet if IPv6 operation is disabled on the interface */ if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED)) { @@ -1963,6 +1969,7 @@ nd6_output_lle(struct ifnet *ifp, struct int error = 0; int has_lle = 0; int ip6len; + IF_AFDATA_TRACKER; #ifdef INVARIANTS if (lle != NULL) { @@ -2304,6 +2311,7 @@ nd6_storelladdr(struct ifnet *ifp, struc const struct sockaddr *dst, u_char *desten, struct llentry **lle) { struct llentry *ln; + IF_AFDATA_TRACKER; *lle = NULL; IF_AFDATA_UNLOCK_ASSERT(ifp); Modified: projects/routing/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_nbr.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/nd6_nbr.c Fri Nov 21 02:28:56 2014 (r274774) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -609,6 +610,7 @@ nd6_na_input(struct mbuf *m, int off, in struct mbuf *chain = NULL; struct m_tag *mtag; struct sockaddr_in6 sin6; + IF_AFDATA_TRACKER; char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN]; if (ip6->ip6_hlim != 255) { Modified: projects/routing/sys/netinet6/nd6_rtr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_rtr.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/nd6_rtr.c Fri Nov 21 02:28:56 2014 (r274774) @@ -626,6 +626,7 @@ defrouter_select(void) { struct nd_defrouter *dr, *selected_dr = NULL, *installed_dr = NULL; struct llentry *ln = NULL; + IF_AFDATA_TRACKER; /* * Let's handle easy case (3) first: @@ -1299,6 +1300,7 @@ find_pfxlist_reachable_router(struct nd_ struct nd_pfxrouter *pfxrtr; struct llentry *ln; int canreach; + IF_AFDATA_TRACKER; LIST_FOREACH(pfxrtr, &pr->ndpr_advrtrs, pfr_entry) { IF_AFDATA_RLOCK(pfxrtr->router->ifp); Modified: projects/routing/sys/netinet6/scope6.c ============================================================================== --- projects/routing/sys/netinet6/scope6.c Fri Nov 21 02:13:12 2014 (r274773) +++ projects/routing/sys/netinet6/scope6.c Fri Nov 21 02:28:56 2014 (r274774) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -208,6 +209,7 @@ static int scope6_get(struct ifnet *ifp, struct scope6_id *idlist) { struct scope6_id *sid; + IF_AFDATA_TRACKER; /* We only need to lock the interface's afdata for SID() to work. */ IF_AFDATA_RLOCK(ifp); @@ -410,6 +412,7 @@ in6_setscope(struct in6_addr *in6, struc int scope; u_int32_t zoneid = 0; struct scope6_id *sid; + IF_AFDATA_TRACKER; /* * special case: the loopback address can only belong to a loopback From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 02:30:39 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33009415; Fri, 21 Nov 2014 02:30:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F7AB1FC; Fri, 21 Nov 2014 02:30:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL2Uc3t078451; Fri, 21 Nov 2014 02:30:38 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL2Uc1Z078442; Fri, 21 Nov 2014 02:30:38 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411210230.sAL2Uc1Z078442@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 21 Nov 2014 02:30:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274775 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 02:30:39 -0000 Author: gjb Date: Fri Nov 21 02:30:37 2014 New Revision: 274775 URL: https://svnweb.freebsd.org/changeset/base/274775 Log: Revert r274773, after I *specifically* objected to this change numerous times. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/azure.conf projects/release-vmimage/release/tools/openstack.conf projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/azure.conf ============================================================================== --- projects/release-vmimage/release/tools/azure.conf Fri Nov 21 02:28:56 2014 (r274774) +++ projects/release-vmimage/release/tools/azure.conf Fri Nov 21 02:30:37 2014 (r274775) @@ -5,7 +5,7 @@ # Set to a list of packages to install. # Example: -#export VM_EXTRA_PACKAGES="www/apache24 ports-mgmt/pkg" +#export VM_EXTRA_PACKAGES="www/apache24" export VM_EXTRA_PACKAGES= # Set to a list of third-party software to enable in rc.conf(5). @@ -17,6 +17,7 @@ vm_extra_install_base() { fetch -o ${DESTDIR}/usr/sbin/waagent \ http://people.freebsd.org/~gjb/waagent chmod +x ${DESTDIR}/usr/sbin/waagent + rm -f ${DESTDIR}/etc/resolv.conf return 0 } @@ -32,6 +33,8 @@ vm_extra_pre_umount() { echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } Modified: projects/release-vmimage/release/tools/openstack.conf ============================================================================== --- projects/release-vmimage/release/tools/openstack.conf Fri Nov 21 02:28:56 2014 (r274774) +++ projects/release-vmimage/release/tools/openstack.conf Fri Nov 21 02:30:37 2014 (r274775) @@ -4,7 +4,7 @@ # # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="net/cloud-init ports-mgmt/pkg" +export VM_EXTRA_PACKAGES="net/cloud-init" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="cloudinit" @@ -13,6 +13,7 @@ vm_extra_install_base() { fetch -o ${DESTDIR}/usr/sbin/waagent \ http://people.freebsd.org/~gjb/waagent chmod +x ${DESTDIR}/usr/sbin/waagent + rm -f ${DESTDIR}/etc/resolv.conf return 0 } @@ -21,5 +22,7 @@ vm_extra_pre_umount() { echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Fri Nov 21 02:28:56 2014 (r274774) +++ projects/release-vmimage/release/tools/vmimage.subr Fri Nov 21 02:30:37 2014 (r274775) @@ -90,6 +90,8 @@ vm_install_base() { chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart umount ${DESTDIR}/dev + cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf + return 0 } @@ -112,18 +114,15 @@ vm_extra_enable_services() { } vm_extra_install_packages() { + mkdir -p ${DESTDIR}/dev + mount -t devfs devfs ${DESTDIR}/dev + chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg bootstrap -y if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then - PKGSDIR=`mktemp -d` - ABI=`/usr/sbin/pkg -c ${DESTDIR} config abi` - /usr/sbin/pkg -o ABI=${ABI} fetch -o ${PKGSDIR} -d -y ${VM_EXTRA_PACKAGES} - for PKG in ${PKGSDIR}/All/*; do - /usr/sbin/pkg -c ${DESTDIR} add -M - < ${PKG} - done - rm -r ${PKGSDIR} - if [ -z "${NOREPOSQLITE}" ]; then - cp /var/db/pkg/repo-FreeBSD.sqlite ${DESTDIR}/var/db/pkg - fi + chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} fi + umount ${DESTDIR}/dev return 0 } @@ -139,6 +138,8 @@ vm_extra_pre_umount() { # Prototype. When overridden, installs additional ports within the # virtual machine environment. + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 14:57:25 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C726386; Fri, 21 Nov 2014 14:57:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 19ADAB4E; Fri, 21 Nov 2014 14:57:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALEvOCn020390; Fri, 21 Nov 2014 14:57:24 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALEvOqG020388; Fri, 21 Nov 2014 14:57:24 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411211457.sALEvOqG020388@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 21 Nov 2014 14:57:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274793 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 14:57:25 -0000 Author: glebius Date: Fri Nov 21 14:57:24 2014 New Revision: 274793 URL: https://svnweb.freebsd.org/changeset/base/274793 Log: Catch up on r274689. Modified: projects/sendfile/sys/kern/vfs_default.c Modified: projects/sendfile/sys/kern/vfs_default.c ============================================================================== --- projects/sendfile/sys/kern/vfs_default.c Fri Nov 21 14:53:42 2014 (r274792) +++ projects/sendfile/sys/kern/vfs_default.c Fri Nov 21 14:57:24 2014 (r274793) @@ -736,7 +736,6 @@ vop_stdgetpages_async(struct vop_getpage int error; error = VOP_GETPAGES(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage); - vm_page_xunbusy(ap->a_m[ap->a_reqpage]); ap->a_vop_getpages_iodone(ap->a_arg, ap->a_m, ap->a_reqpage, error); return (error); } From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 19:56:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B19D707; Fri, 21 Nov 2014 19:56:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 082F21B0; Fri, 21 Nov 2014 19:56:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALJuRfK081073; Fri, 21 Nov 2014 19:56:27 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALJuRWM081071; Fri, 21 Nov 2014 19:56:27 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411211956.sALJuRWM081071@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Fri, 21 Nov 2014 19:56:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274815 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 19:56:28 -0000 Author: sjg Date: Fri Nov 21 19:56:27 2014 New Revision: 274815 URL: https://svnweb.freebsd.org/changeset/base/274815 Log: Use latest version Modified: projects/bmake/share/mk/auto.obj.mk Modified: projects/bmake/share/mk/auto.obj.mk ============================================================================== --- projects/bmake/share/mk/auto.obj.mk Fri Nov 21 19:44:27 2014 (r274814) +++ projects/bmake/share/mk/auto.obj.mk Fri Nov 21 19:56:27 2014 (r274815) @@ -34,6 +34,9 @@ Mkdirs= Mkdirs() { \ # if MKOBJDIRS is set to auto (and NOOBJ isn't defined) do some magic... # This will automatically create objdirs as needed. # Skip it if we are just doing 'clean'. +.if ${MK_AUTO_OBJ:Uno} == "yes" +MKOBJDIRS= auto +.endif .if !defined(NOOBJ) && !defined(NO_OBJ) && ${MKOBJDIRS:Uno} == auto # Use __objdir here so it is easier to tweak without impacting # the logic. From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:03:31 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE3EA247; Fri, 21 Nov 2014 23:03:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91302A53; Fri, 21 Nov 2014 23:03:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALN3VRB039337; Fri, 21 Nov 2014 23:03:31 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALN3VrU039336; Fri, 21 Nov 2014 23:03:31 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411212303.sALN3VrU039336@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 21 Nov 2014 23:03:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274824 - projects/sendfile/sys/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:03:31 -0000 Author: glebius Date: Fri Nov 21 23:03:30 2014 New Revision: 274824 URL: https://svnweb.freebsd.org/changeset/base/274824 Log: Revert r260825. We will use typedefs for function arguments. Suggested by: kib Modified: projects/sendfile/sys/tools/vnode_if.awk Modified: projects/sendfile/sys/tools/vnode_if.awk ============================================================================== --- projects/sendfile/sys/tools/vnode_if.awk Fri Nov 21 21:34:19 2014 (r274823) +++ projects/sendfile/sys/tools/vnode_if.awk Fri Nov 21 23:03:30 2014 (r274824) @@ -254,26 +254,16 @@ while ((getline < srcfile) > 0) { if (sub(/;$/, "") < 1) die("Missing end-of-line ; in \"%s\".", $0); - # pick off argument name - if ((argp = match($0, /[A-Za-z0-9_]+$/)) > 0) { - args[numargs] = substr($0, argp); - $0 = substr($0, 1, argp - 1); - sub(/ $/, ""); - delete fargs[numargs]; - types[numargs] = $0; - } else { # try to parse a function pointer argument - if ((argp = match($0, - /\(\*[A-Za-z0-9_]+\)\([A-Za-z0-9_*, ]+\)$/)) < 1) - die("Missing var name \"a_foo\" in \"%s\".", - $0); - args[numargs] = substr($0, argp + 2); - sub(/\).+/, "", args[numargs]); - fargs[numargs] = substr($0, argp); - sub(/^\([^)]+\)/, "", fargs[numargs]); - $0 = substr($0, 1, argp - 1); - sub(/ $/, ""); - types[numargs] = $0; - } + # pick off variable name + if ((argp = match($0, /[A-Za-z0-9_]+$/)) < 1) + die("Missing var name \"a_foo\" in \"%s\".", $0); + args[numargs] = substr($0, argp); + $0 = substr($0, 1, argp - 1); + + # what is left must be type + # remove trailing space (if any) + sub(/ $/, ""); + types[numargs] = $0; } if (numargs > 4) ctrargs = 4; @@ -296,13 +286,8 @@ while ((getline < srcfile) > 0) { if (hfile) { # Print out the vop_F_args structure. printh("struct "name"_args {\n\tstruct vop_generic_args a_gen;"); - for (i = 0; i < numargs; ++i) { - if (fargs[i]) { - printh("\t" t_spc(types[i]) "(*a_" args[i] \ - ")" fargs[i] ";"); - } else - printh("\t" t_spc(types[i]) "a_" args[i] ";"); - } + for (i = 0; i < numargs; ++i) + printh("\t" t_spc(types[i]) "a_" args[i] ";"); printh("};"); printh(""); @@ -316,14 +301,8 @@ while ((getline < srcfile) > 0) { printh(""); printh("static __inline int " uname "("); for (i = 0; i < numargs; ++i) { - if (fargs[i]) { - printh("\t" t_spc(types[i]) "(*" args[i] \ - ")" fargs[i] \ - (i < numargs - 1 ? "," : ")")); - } else { - printh("\t" t_spc(types[i]) args[i] \ - (i < numargs - 1 ? "," : ")")); - } + printh("\t" t_spc(types[i]) args[i] \ + (i < numargs - 1 ? "," : ")")); } printh("{"); printh("\tstruct " name "_args a;"); From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:05:10 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B560E54D; Fri, 21 Nov 2014 23:05:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A158FA66; Fri, 21 Nov 2014 23:05:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALN5AZO040333; Fri, 21 Nov 2014 23:05:10 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALN59Du040317; Fri, 21 Nov 2014 23:05:09 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411212305.sALN59Du040317@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 21 Nov 2014 23:05:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274826 - in projects/sendfile/sys: kern sys vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:05:10 -0000 Author: glebius Date: Fri Nov 21 23:05:08 2014 New Revision: 274826 URL: https://svnweb.freebsd.org/changeset/base/274826 Log: Use typedefs typedef void vop_getpages_iodone_t(void *, vm_page_t *, int, int) typedef void pgo_getpages_iodone_t(void *, vm_page_t *, int, int) to define callback function type. Suggested by: kib Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/vfs_default.c projects/sendfile/sys/kern/vnode_if.src projects/sendfile/sys/sys/vnode.h projects/sendfile/sys/vm/vm_pager.h projects/sendfile/sys/vm/vnode_pager.c projects/sendfile/sys/vm/vnode_pager.h Modified: projects/sendfile/sys/kern/vfs_default.c ============================================================================== --- projects/sendfile/sys/kern/vfs_default.c Fri Nov 21 23:04:12 2014 (r274825) +++ projects/sendfile/sys/kern/vfs_default.c Fri Nov 21 23:05:08 2014 (r274826) @@ -736,7 +736,7 @@ vop_stdgetpages_async(struct vop_getpage int error; error = VOP_GETPAGES(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage); - ap->a_vop_getpages_iodone(ap->a_arg, ap->a_m, ap->a_reqpage, error); + ap->a_iodone(ap->a_arg, ap->a_m, ap->a_reqpage, error); return (error); } Modified: projects/sendfile/sys/kern/vnode_if.src ============================================================================== --- projects/sendfile/sys/kern/vnode_if.src Fri Nov 21 23:04:12 2014 (r274825) +++ projects/sendfile/sys/kern/vnode_if.src Fri Nov 21 23:05:08 2014 (r274826) @@ -484,7 +484,7 @@ vop_getpages_async { IN int count; IN int reqpage; IN vm_ooffset_t offset; - IN void (*vop_getpages_iodone)(void *, vm_page_t *, int, int); + IN vop_getpages_iodone_t *iodone; IN void *arg; }; Modified: projects/sendfile/sys/sys/vnode.h ============================================================================== --- projects/sendfile/sys/sys/vnode.h Fri Nov 21 23:04:12 2014 (r274825) +++ projects/sendfile/sys/sys/vnode.h Fri Nov 21 23:05:08 2014 (r274826) @@ -574,6 +574,7 @@ vn_canvmio(struct vnode *vp) /* * Finally, include the default set of vnode operations. */ +typedef void vop_getpages_iodone_t(void *, vm_page_t *, int, int); #include "vnode_if.h" /* vn_open_flags */ Modified: projects/sendfile/sys/vm/vm_pager.h ============================================================================== --- projects/sendfile/sys/vm/vm_pager.h Fri Nov 21 23:04:12 2014 (r274825) +++ projects/sendfile/sys/vm/vm_pager.h Fri Nov 21 23:05:08 2014 (r274826) @@ -51,8 +51,9 @@ typedef vm_object_t pgo_alloc_t(void *, struct ucred *); typedef void pgo_dealloc_t(vm_object_t); typedef int pgo_getpages_t(vm_object_t, vm_page_t *, int, int); +typedef void pgo_getpages_iodone_t(void *, vm_page_t *, int, int); typedef int pgo_getpages_async_t(vm_object_t, vm_page_t *, int, int, - void(*)(void *, vm_page_t *, int, int), void *); + pgo_getpages_iodone_t *, void *); typedef void pgo_putpages_t(vm_object_t, vm_page_t *, int, int, int *); typedef boolean_t pgo_haspage_t(vm_object_t, vm_pindex_t, int *, int *); typedef void pgo_pageunswapped_t(vm_page_t); @@ -140,7 +141,7 @@ vm_pager_get_pages( static inline int vm_pager_get_pages_async(vm_object_t object, vm_page_t *m, int count, - int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) + int reqpage, pgo_getpages_iodone_t iodone, void *arg) { int r; Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Fri Nov 21 23:04:12 2014 (r274825) +++ projects/sendfile/sys/vm/vnode_pager.c Fri Nov 21 23:05:08 2014 (r274826) @@ -83,10 +83,10 @@ static int vnode_pager_input_smlfs(vm_ob static int vnode_pager_input_old(vm_object_t object, vm_page_t m); static void vnode_pager_dealloc(vm_object_t); static int vnode_pager_local_getpages0(struct vnode *, vm_page_t *, int, int, - void (*)(void *, vm_page_t *, int, int), void *); + vop_getpages_iodone_t, void *); static int vnode_pager_getpages(vm_object_t, vm_page_t *, int, int); static int vnode_pager_getpages_async(vm_object_t, vm_page_t *, int, int, - void(*)(void *, vm_page_t *, int, int), void *); + vop_getpages_iodone_t, void *); static void vnode_pager_putpages(vm_object_t, vm_page_t *, int, int, int *); static boolean_t vnode_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); static vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t, @@ -673,7 +673,7 @@ vnode_pager_getpages(vm_object_t object, static int vnode_pager_getpages_async(vm_object_t object, vm_page_t *m, int count, - int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) + int reqpage, vop_getpages_iodone_t iodone, void *arg) { int rtval; struct vnode *vp; @@ -706,12 +706,12 @@ vnode_pager_local_getpages_async(struct { return (vnode_pager_local_getpages0(ap->a_vp, ap->a_m, ap->a_count, - ap->a_reqpage, ap->a_vop_getpages_iodone, ap->a_arg)); + ap->a_reqpage, ap->a_iodone, ap->a_arg)); } static int vnode_pager_local_getpages0(struct vnode *vp, vm_page_t *m, int bytecount, - int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) + int reqpage, vop_getpages_iodone_t iodone, void *arg) { vm_page_t mreq; @@ -747,7 +747,7 @@ vnode_pager_local_getpages0(struct vnode */ int vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount, - int reqpage, void (*iodone)(void *, vm_page_t *, int, int), void *arg) + int reqpage, vop_getpages_iodone_t iodone, void *arg) { vm_object_t object; off_t foff; Modified: projects/sendfile/sys/vm/vnode_pager.h ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.h Fri Nov 21 23:04:12 2014 (r274825) +++ projects/sendfile/sys/vm/vnode_pager.h Fri Nov 21 23:05:08 2014 (r274826) @@ -41,8 +41,7 @@ #ifdef _KERNEL int vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, - int count, int reqpage, void (*iodone)(void *, vm_page_t *, int, int), - void *arg); + int count, int reqpage, vop_getpages_iodone_t iodone, void *arg); int vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *m, int count, boolean_t sync, int *rtvals); From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:09:00 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE0AE6A9; Fri, 21 Nov 2014 23:09:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97546A89; Fri, 21 Nov 2014 23:09:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALN90nM042156; Fri, 21 Nov 2014 23:09:00 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALN8qSx042048; Fri, 21 Nov 2014 23:08:52 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411212308.sALN8qSx042048@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 21 Nov 2014 23:08:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274827 - in projects/sendfile: . contrib/binutils/binutils contrib/binutils/include/elf lib/libc/gen lib/libc/include lib/libc/mips/gen lib/libc/sys lib/libkiconv lib/libmd lib/libthr/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:09:00 -0000 Author: glebius Date: Fri Nov 21 23:08:51 2014 New Revision: 274827 URL: https://svnweb.freebsd.org/changeset/base/274827 Log: Merge head r258543 through r274826. Added: projects/sendfile/sys/dev/terasic/mtl/terasic_mtl_vt.c - copied unchanged from r274826, head/sys/dev/terasic/mtl/terasic_mtl_vt.c Modified: projects/sendfile/Makefile.inc1 projects/sendfile/contrib/binutils/binutils/readelf.c projects/sendfile/contrib/binutils/include/elf/common.h projects/sendfile/lib/libc/gen/errlst.c projects/sendfile/lib/libc/gen/isnan.c projects/sendfile/lib/libc/gen/tls.c projects/sendfile/lib/libc/include/errlst.h projects/sendfile/lib/libc/mips/gen/_setjmp.S projects/sendfile/lib/libc/mips/gen/setjmp.S projects/sendfile/lib/libc/sys/stack_protector.c projects/sendfile/lib/libc/sys/stack_protector_compat.c projects/sendfile/lib/libkiconv/quirks.c projects/sendfile/lib/libkiconv/xlat16_iconv.c projects/sendfile/lib/libkiconv/xlat16_sysctl.c projects/sendfile/lib/libmd/rmd160c.c projects/sendfile/lib/libmd/sha1c.c projects/sendfile/lib/libthr/thread/thr_exit.c projects/sendfile/lib/libthr/thread/thr_private.h projects/sendfile/lib/msun/src/s_isnan.c projects/sendfile/libexec/rtld-elf/rtld.c projects/sendfile/sbin/fsck/fsck.c projects/sendfile/share/man/man4/iicbus.4 projects/sendfile/share/man/man9/Makefile projects/sendfile/share/mk/bsd.README projects/sendfile/sys/amd64/amd64/elf_machdep.c projects/sendfile/sys/amd64/amd64/fpu.c projects/sendfile/sys/amd64/amd64/ptrace_machdep.c projects/sendfile/sys/amd64/include/asm.h projects/sendfile/sys/arm/include/asm.h projects/sendfile/sys/boot/fdt/dts/mips/beri-sim.dts projects/sendfile/sys/boot/fdt/dts/mips/beripad-de4.dts projects/sendfile/sys/cam/cam_xpt.c projects/sendfile/sys/cam/ctl/ctl.c projects/sendfile/sys/cam/ctl/ctl_cmd_table.c projects/sendfile/sys/cam/ctl/ctl_frontend.c projects/sendfile/sys/cam/ctl/ctl_frontend.h projects/sendfile/sys/cam/ctl/ctl_frontend_cam_sim.c projects/sendfile/sys/cam/ctl/ctl_frontend_internal.c projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.h projects/sendfile/sys/cam/ctl/ctl_ha.h projects/sendfile/sys/cam/ctl/ctl_private.h projects/sendfile/sys/cam/ctl/ctl_tpc_local.c projects/sendfile/sys/cam/ctl/scsi_ctl.c projects/sendfile/sys/compat/ia32/ia32_sysvec.c projects/sendfile/sys/dev/advansys/advansys.c projects/sendfile/sys/dev/advansys/adwcam.c projects/sendfile/sys/dev/aha/aha.c projects/sendfile/sys/dev/ahb/ahb.c projects/sendfile/sys/dev/ahci/ahci.c projects/sendfile/sys/dev/aic/aic.c projects/sendfile/sys/dev/altera/avgen/altera_avgen.c projects/sendfile/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c projects/sendfile/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c projects/sendfile/sys/dev/arcmsr/arcmsr.c projects/sendfile/sys/dev/asr/asr.c projects/sendfile/sys/dev/buslogic/bt.c projects/sendfile/sys/dev/ciss/ciss.c projects/sendfile/sys/dev/dpt/dpt_scsi.c projects/sendfile/sys/dev/firewire/sbp.c projects/sendfile/sys/dev/glxiic/glxiic.c projects/sendfile/sys/dev/hpt27xx/hpt27xx_os_bsd.c projects/sendfile/sys/dev/hptnr/hptnr_os_bsd.c projects/sendfile/sys/dev/hptrr/hptrr_os_bsd.c projects/sendfile/sys/dev/hwpmc/hwpmc_mod.c projects/sendfile/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/sendfile/sys/dev/iir/iir.c projects/sendfile/sys/dev/isci/isci_io_request.c projects/sendfile/sys/dev/isci/isci_timer.c projects/sendfile/sys/dev/mpr/mpr_sas.c projects/sendfile/sys/dev/mps/mps_sas.c projects/sendfile/sys/dev/mpt/mpt.c projects/sendfile/sys/dev/mpt/mpt.h projects/sendfile/sys/dev/mpt/mpt_cam.c projects/sendfile/sys/dev/mrsas/mrsas_cam.c projects/sendfile/sys/dev/mvs/mvs.c projects/sendfile/sys/dev/siis/siis.c projects/sendfile/sys/dev/sym/sym_hipd.c projects/sendfile/sys/dev/terasic/mtl/terasic_mtl.c projects/sendfile/sys/dev/terasic/mtl/terasic_mtl.h projects/sendfile/sys/dev/terasic/mtl/terasic_mtl_fdt.c projects/sendfile/sys/dev/terasic/mtl/terasic_mtl_nexus.c projects/sendfile/sys/dev/terasic/mtl/terasic_mtl_reg.c projects/sendfile/sys/dev/terasic/mtl/terasic_mtl_text.c projects/sendfile/sys/dev/trm/trm.c projects/sendfile/sys/dev/tws/tws_cam.c projects/sendfile/sys/dev/virtio/scsi/virtio_scsi.c projects/sendfile/sys/fs/smbfs/smbfs_vfsops.c projects/sendfile/sys/i386/i386/elf_machdep.c projects/sendfile/sys/i386/i386/ptrace_machdep.c projects/sendfile/sys/i386/include/asm.h projects/sendfile/sys/i386/isa/npx.c projects/sendfile/sys/kern/imgact_elf.c projects/sendfile/sys/mips/beri/files.beri projects/sendfile/sys/mips/conf/BERI_DE4_BASE projects/sendfile/sys/mips/include/asm.h projects/sendfile/sys/mips/mips/cpu.c projects/sendfile/sys/powerpc/include/asm.h projects/sendfile/sys/powerpc/include/profile.h projects/sendfile/sys/powerpc/powerpc/db_trace.c projects/sendfile/sys/sparc64/include/asm.h projects/sendfile/sys/sys/elf_common.h projects/sendfile/sys/sys/imgact_elf.h projects/sendfile/sys/x86/include/fpu.h projects/sendfile/sys/x86/include/ptrace.h projects/sendfile/tools/tools/nanobsd/nanobsd.sh projects/sendfile/usr.bin/gcore/elfcore.c projects/sendfile/usr.sbin/autofs/auto_master.5 projects/sendfile/usr.sbin/ctld/ctld.c projects/sendfile/usr.sbin/ctld/isns.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/contrib/binutils/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/dev/hyperv/ (props changed) Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/Makefile.inc1 Fri Nov 21 23:08:51 2014 (r274827) @@ -97,11 +97,22 @@ SUBDIR+=contrib/ofed # SUBDIR+=etc -# These are last, since it is nice to at least get the base system -# rebuilt before you do them. -.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS} +# Local directories are last, since it is nice to at least get the base +# system rebuilt before you do them. +.for _DIR in ${LOCAL_DIRS} .if exists(${.CURDIR}/${_DIR}/Makefile) -SUBDIR+= ${_DIR} +SUBDIR+= ${_DIR} +.endif +.endfor +# Add LOCAL_LIB_DIRS, but only if they will not be picked up as a SUBDIR +# of a LOCAL_DIRS directory. This allows LOCAL_DIRS=foo and +# LOCAL_LIB_DIRS=foo/lib to behave as expected. +.for _DIR in ${LOCAL_DIRS:M*/} ${LOCAL_DIRS:N*/:S|$|/|} +_REDUNDENT_LIB_DIRS+= ${LOCAL_LIB_DIRS:M${_DIR}*} +.endfor +.for _DIR in ${LOCAL_LIB_DIRS} +.if empty(_REDUNDENT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile) +SUBDIR+= ${_DIR} .endif .endfor .endif @@ -691,6 +702,11 @@ buildworld_epilogue: buildenvvars: @echo ${WMAKEENV:Q} +.if ${.TARGETS:Mbuildenv} +.if ${.MAKEFLAGS:M-j} +.error The buildenv target is incompatible with -j +.endif +.endif buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} @cd ${.CURDIR} && env ${WMAKEENV} ${BUILDENV_SHELL} || true Modified: projects/sendfile/contrib/binutils/binutils/readelf.c ============================================================================== --- projects/sendfile/contrib/binutils/binutils/readelf.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/contrib/binutils/binutils/readelf.c Fri Nov 21 23:08:51 2014 (r274827) @@ -9159,6 +9159,8 @@ get_freebsd_note_type (unsigned e_type) return _("NT_PROCSTAT_PSSTRINGS (ps_strings data)"); case NT_PROCSTAT_AUXV: return _("NT_PROCSTAT_AUXV (auxv data)"); + case NT_X86_XSTATE: + return _("NT_X86_XSTATE (x86 XSAVE extended state)"); default: return get_note_type(e_type); } Modified: projects/sendfile/contrib/binutils/include/elf/common.h ============================================================================== --- projects/sendfile/contrib/binutils/include/elf/common.h Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/contrib/binutils/include/elf/common.h Fri Nov 21 23:08:51 2014 (r274827) @@ -414,6 +414,7 @@ #define NT_PROCSTAT_OSREL 14 #define NT_PROCSTAT_PSSTRINGS 15 #define NT_PROCSTAT_AUXV 16 +#define NT_X86_XSTATE 0x202 /* Note segments for core files on NetBSD systems. Note name Modified: projects/sendfile/lib/libc/gen/errlst.c ============================================================================== --- projects/sendfile/lib/libc/gen/errlst.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libc/gen/errlst.c Fri Nov 21 23:08:51 2014 (r274827) @@ -158,7 +158,7 @@ const char *const sys_errlist[] = { }; const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]); -#ifdef PIC +#ifdef __PIC__ __strong_reference(sys_errlist, __hidden_sys_errlist); __strong_reference(sys_nerr, __hidden_sys_nerr); #endif Modified: projects/sendfile/lib/libc/gen/isnan.c ============================================================================== --- projects/sendfile/lib/libc/gen/isnan.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libc/gen/isnan.c Fri Nov 21 23:08:51 2014 (r274827) @@ -40,7 +40,7 @@ * time, when calling both functions. */ -#ifdef PIC +#ifdef __PIC__ __weak_reference(__isnan, isnan); __weak_reference(__isnanf, isnanf); @@ -61,4 +61,4 @@ __isnanf(float f) u.f = f; return (u.bits.exp == 255 && u.bits.man != 0); } -#endif /* PIC */ +#endif /* __PIC__ */ Modified: projects/sendfile/lib/libc/gen/tls.c ============================================================================== --- projects/sendfile/lib/libc/gen/tls.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libc/gen/tls.c Fri Nov 21 23:08:51 2014 (r274827) @@ -78,7 +78,7 @@ void __libc_free_tls(void *tls, size_t t #define TLS_VARIANT_II #endif -#ifndef PIC +#ifndef __PIC__ #define round(size, align) \ (((size) + (align) - 1) & ~((align) - 1)) @@ -107,7 +107,7 @@ __libc_tls_get_addr(void *ti __unused) return (0); } -#ifndef PIC +#ifndef __PIC__ #ifdef TLS_VARIANT_I @@ -264,14 +264,14 @@ __libc_free_tls(void *tcb __unused, size { } -#endif /* PIC */ +#endif /* __PIC__ */ extern char **environ; void _init_tls() { -#ifndef PIC +#ifndef __PIC__ Elf_Addr *sp; Elf_Auxinfo *aux, *auxp; Elf_Phdr *phdr; Modified: projects/sendfile/lib/libc/include/errlst.h ============================================================================== --- projects/sendfile/lib/libc/include/errlst.h Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libc/include/errlst.h Fri Nov 21 23:08:51 2014 (r274827) @@ -31,7 +31,7 @@ #include -#ifdef PIC +#ifdef __PIC__ /* If the main executable imports these, do not use its copy from libc.so. */ extern const char *const __hidden_sys_errlist[] __hidden; extern const int __hidden_sys_nerr __hidden; Modified: projects/sendfile/lib/libc/mips/gen/_setjmp.S ============================================================================== --- projects/sendfile/lib/libc/mips/gen/_setjmp.S Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libc/mips/gen/_setjmp.S Fri Nov 21 23:08:51 2014 (r274827) @@ -61,9 +61,16 @@ __FBSDID("$FreeBSD$"); LEAF(_setjmp) REG_PROLOGUE - REG_LI v0, _JB_MAGIC__SETJMP + REG_LI v0, _JB_MAGIC__SETJMP # sigcontext magic number REG_S v0, (_JB_MAGIC * SZREG)(a0) REG_S ra, (_JB_REG_RA * SZREG)(a0) + /* + * From "MIPSpro N32 ABI Handbook", Table 2-1: + * Registers s0..s7 are callee-saved. + * The sp register is callee-saved. + * The fp (or s8) register is callee-saved. + * The gp register is callee-saved (for n32/n64). + */ REG_S s0, (_JB_REG_S0 * SZREG)(a0) REG_S s1, (_JB_REG_S1 * SZREG)(a0) REG_S s2, (_JB_REG_S2 * SZREG)(a0) @@ -72,11 +79,41 @@ LEAF(_setjmp) REG_S s5, (_JB_REG_S5 * SZREG)(a0) REG_S s6, (_JB_REG_S6 * SZREG)(a0) REG_S s7, (_JB_REG_S7 * SZREG)(a0) + REG_S sp, (_JB_REG_SP * SZREG)(a0) REG_S s8, (_JB_REG_S8 * SZREG)(a0) #if defined(__mips_n32) || defined(__mips_n64) REG_S gp, (_JB_REG_GP * SZREG)(a0) # newabi gp is callee-saved #endif - REG_S sp, (_JB_REG_SP * SZREG)(a0) + /* + * From "MIPSpro N32 ABI Handbook", Table 2-1: + * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved. + * In N64, FP registers F24 .. F31 are callee-saved. + * In O32, FP registers F20 .. F23 are callee-saved. + */ +#ifndef SOFTFLOAT + cfc1 v0, $31 # too bad can't check if FP used +#if defined(__mips_n64) || defined(__mips_n32) + FP_S $f30, (_JB_FPREG_F30 * SZREG)(a0) + FP_S $f28, (_JB_FPREG_F28 * SZREG)(a0) + FP_S $f26, (_JB_FPREG_F26 * SZREG)(a0) + FP_S $f24, (_JB_FPREG_F24 * SZREG)(a0) +#endif +#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64) + FP_S $f22, (_JB_FPREG_F22 * SZREG)(a0) + FP_S $f20, (_JB_FPREG_F20 * SZREG)(a0) +#endif +#if defined(__mips_o32) || defined(__mips_o64) + FP_S $f21, (_JB_FPREG_F21 * SZREG)(a0) + FP_S $f23, (_JB_FPREG_F23 * SZREG)(a0) +#endif +#if defined(__mips_n64) + FP_S $f25, (_JB_FPREG_F25 * SZREG)(a0) + FP_S $f27, (_JB_FPREG_F27 * SZREG)(a0) + FP_S $f29, (_JB_FPREG_F29 * SZREG)(a0) + FP_S $f31, (_JB_FPREG_F31 * SZREG)(a0) +#endif + INT_S v0, (_JB_FPREG_FCSR * SZREG)(a0) +#endif /* ! SOFTFLOAT */ REG_EPILOGUE j ra @@ -94,6 +131,13 @@ LEAF(_longjmp) REG_LI t0, _JB_MAGIC__SETJMP bne v0, t0, botch # jump if error PTR_ADDU sp, sp, CALLFRAME_SIZ # does not matter, sanity + /* + * From "MIPSpro N32 ABI Handbook", Table 2-1: + * Registers s0..s7 are callee-saved. + * The sp register is callee-saved. + * The fp (or s8) register is callee-saved. + * The gp register is callee-saved (for n32/n64). + */ REG_L s0, (_JB_REG_S0 * SZREG)(a0) REG_L s1, (_JB_REG_S1 * SZREG)(a0) REG_L s2, (_JB_REG_S2 * SZREG)(a0) @@ -102,11 +146,42 @@ LEAF(_longjmp) REG_L s5, (_JB_REG_S5 * SZREG)(a0) REG_L s6, (_JB_REG_S6 * SZREG)(a0) REG_L s7, (_JB_REG_S7 * SZREG)(a0) + REG_L sp, (_JB_REG_SP * SZREG)(a0) + REG_L s8, (_JB_REG_S8 * SZREG)(a0) #if defined(__mips_n32) || defined(__mips_n64) REG_L gp, (_JB_REG_GP * SZREG)(a0) #endif - REG_L sp, (_JB_REG_SP * SZREG)(a0) - REG_L s8, (_JB_REG_S8 * SZREG)(a0) +#ifndef SOFTFLOAT + # get fpu status + INT_L v0, (_JB_FPREG_FCSR * SZREG)(a0) + ctc1 v0, $31 + /* + * From "MIPSpro N32 ABI Handbook", Table 2-1: + * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved. + * In N64, FP registers F24 .. F31 are callee-saved. + * In O32, FP registers F20 .. F23 are callee-saved. + */ +#if defined(__mips_n64) || defined(__mips_n32) + FP_L $f30, (_JB_FPREG_F30 * SZREG)(a0) + FP_L $f28, (_JB_FPREG_F28 * SZREG)(a0) + FP_L $f26, (_JB_FPREG_F26 * SZREG)(a0) + FP_L $f24, (_JB_FPREG_F24 * SZREG)(a0) +#endif +#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64) + FP_L $f22, (_JB_FPREG_F22 * SZREG)(a0) + FP_L $f20, (_JB_FPREG_F20 * SZREG)(a0) +#endif +#if defined(__mips_o32) || defined(__mips_o64) + FP_L $f21, (_JB_FPREG_F21 * SZREG)(a0) + FP_L $f23, (_JB_FPREG_F23 * SZREG)(a0) +#endif +#if defined(__mips_n64) + FP_L $f25, (_JB_FPREG_F25 * SZREG)(a0) + FP_L $f27, (_JB_FPREG_F27 * SZREG)(a0) + FP_L $f29, (_JB_FPREG_F29 * SZREG)(a0) + FP_L $f31, (_JB_FPREG_F31 * SZREG)(a0) +#endif +#endif /* ! SOFTFLOAT */ REG_EPILOGUE move v0, a1 # get return value in 1st arg Modified: projects/sendfile/lib/libc/mips/gen/setjmp.S ============================================================================== --- projects/sendfile/lib/libc/mips/gen/setjmp.S Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libc/mips/gen/setjmp.S Fri Nov 21 23:08:51 2014 (r274827) @@ -86,6 +86,13 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra) REG_LI v0, _JB_MAGIC_SETJMP REG_S v0, (_JB_MAGIC * SZREG)(a0) REG_S ra, (_JB_REG_RA * SZREG)(a0) + /* + * From "MIPSpro N32 ABI Handbook", Table 2-1: + * Registers s0..s7 are callee-saved. + * The sp register is callee-saved. + * The fp (or s8) register is callee-saved. + * The gp register is callee-saved (for n32/n64). + */ REG_S s0, (_JB_REG_S0 * SZREG)(a0) REG_S s1, (_JB_REG_S1 * SZREG)(a0) REG_S s2, (_JB_REG_S2 * SZREG)(a0) @@ -99,6 +106,36 @@ NESTED(setjmp, SETJMP_FRAME_SIZE, ra) #if defined(__mips_n32) || defined(__mips_n64) REG_S gp, (_JB_REG_GP * SZREG)(a0) #endif +#ifndef SOFTFLOAT + /* + * From "MIPSpro N32 ABI Handbook", Table 2-1: + * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved. + * In N64, FP registers F24 .. F31 are callee-saved. + * In O32, FP registers F20 .. F23 are callee-saved. + */ + cfc1 v0, $31 + INT_S v0, (_JB_FPREG_FCSR * SZREG)(a0) +#if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32) + FP_S $f20, (_JB_FPREG_F20 * SZREG)(a0) + FP_S $f22, (_JB_FPREG_F22 * SZREG)(a0) +#endif +#if defined(__mips_o32) || defined(__mips_o64) + FP_S $f21, (_JB_FPREG_F21 * SZREG)(a0) + FP_S $f23, (_JB_FPREG_F23 * SZREG)(a0) +#endif +#if defined(__mips_n32) || defined(__mips_n64) + FP_S $f24, (_JB_FPREG_F24 * SZREG)(a0) + FP_S $f26, (_JB_FPREG_F26 * SZREG)(a0) + FP_S $f28, (_JB_FPREG_F28 * SZREG)(a0) + FP_S $f30, (_JB_FPREG_F30 * SZREG)(a0) +#endif +#if defined(__mips_n64) + FP_S $f25, (_JB_FPREG_F25 * SZREG)(a0) + FP_S $f27, (_JB_FPREG_F27 * SZREG)(a0) + FP_S $f29, (_JB_FPREG_F29 * SZREG)(a0) + FP_S $f31, (_JB_FPREG_F31 * SZREG)(a0) +#endif +#endif /* ! SOFTFLOAT */ move v0, zero jr ra @@ -133,6 +170,13 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) REG_L a1, (CALLFRAME_SIZ + SZREG)(sp) # restore return value REG_L ra, (_JB_REG_RA * SZREG)(a0) + /* + * From "MIPSpro N32 ABI Handbook", Table 2-1: + * Registers s0..s7 are callee-saved. + * The sp register is callee-saved. + * The fp (or s8) register is callee-saved. + * The gp register is callee-saved (for n32/n64). + */ REG_L s0, (_JB_REG_S0 * SZREG)(a0) REG_L s1, (_JB_REG_S1 * SZREG)(a0) REG_L s2, (_JB_REG_S2 * SZREG)(a0) @@ -146,6 +190,36 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) #if defined(__mips_n32) || defined(__mips_n64) REG_L gp, (_JB_REG_GP * SZREG)(a0) #endif +#ifndef SOFTFLOAT + /* + * From "MIPSpro N32 ABI Handbook", Table 2-1: + * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved. + * In N64, FP registers F23 .. F31 are callee-saved. + * In O32, FP registers F20 .. F23 are callee-saved. + */ + INT_L v0, (_JB_FPREG_FCSR * SZREG)(a0) + ctc1 v0, $31 +#if defined(__mips_n64) || defined(__mips_n32) + FP_L $f30, (_JB_FPREG_F30 * SZREG)(a0) + FP_L $f28, (_JB_FPREG_F28 * SZREG)(a0) + FP_L $f26, (_JB_FPREG_F26 * SZREG)(a0) + FP_L $f24, (_JB_FPREG_F24 * SZREG)(a0) +#endif +#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64) + FP_L $f22, (_JB_FPREG_F22 * SZREG)(a0) + FP_L $f20, (_JB_FPREG_F20 * SZREG)(a0) +#endif +#if defined(__mips_o32) || defined(__mips_o64) + FP_L $f21, (_JB_FPREG_F21 * SZREG)(a0) + FP_L $f23, (_JB_FPREG_F23 * SZREG)(a0) +#endif +#if defined(__mips_n64) + FP_L $f25, (_JB_FPREG_F25 * SZREG)(a0) + FP_L $f27, (_JB_FPREG_F27 * SZREG)(a0) + FP_L $f29, (_JB_FPREG_F29 * SZREG)(a0) + FP_L $f31, (_JB_FPREG_F31 * SZREG)(a0) +#endif +#endif /* ! SOFTFLOAT */ move v0, a1 j ra Modified: projects/sendfile/lib/libc/sys/stack_protector.c ============================================================================== --- projects/sendfile/lib/libc/sys/stack_protector.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libc/sys/stack_protector.c Fri Nov 21 23:08:51 2014 (r274827) @@ -115,6 +115,6 @@ __chk_fail(void) __fail("buffer overflow detected; terminated"); } -#ifndef PIC +#ifndef __PIC__ __weak_reference(__stack_chk_fail, __stack_chk_fail_local); #endif Modified: projects/sendfile/lib/libc/sys/stack_protector_compat.c ============================================================================== --- projects/sendfile/lib/libc/sys/stack_protector_compat.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libc/sys/stack_protector_compat.c Fri Nov 21 23:08:51 2014 (r274827) @@ -8,7 +8,7 @@ __FBSDID("$FreeBSD$"); void __stack_chk_fail(void); -#ifdef PIC +#ifdef __PIC__ void __stack_chk_fail_local_hidden(void) { Modified: projects/sendfile/lib/libkiconv/quirks.c ============================================================================== --- projects/sendfile/lib/libkiconv/quirks.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libkiconv/quirks.c Fri Nov 21 23:08:51 2014 (r274827) @@ -31,7 +31,7 @@ * when statically linked. */ -#ifdef PIC +#ifdef __PIC__ /* * Why do we need quirks? @@ -193,4 +193,4 @@ kiconv_quirkcs(const char* base __unused return (base); } -#endif /* PIC */ +#endif /* __PIC__ */ Modified: projects/sendfile/lib/libkiconv/xlat16_iconv.c ============================================================================== --- projects/sendfile/lib/libkiconv/xlat16_iconv.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libkiconv/xlat16_iconv.c Fri Nov 21 23:08:51 2014 (r274827) @@ -31,7 +31,7 @@ * when statically linked. */ -#ifdef PIC +#ifdef __PIC__ #include #include @@ -462,4 +462,4 @@ kiconv_add_xlat16_cspairs(const char *to return (-1); } -#endif /* PIC */ +#endif /* __PIC__ */ Modified: projects/sendfile/lib/libkiconv/xlat16_sysctl.c ============================================================================== --- projects/sendfile/lib/libkiconv/xlat16_sysctl.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libkiconv/xlat16_sysctl.c Fri Nov 21 23:08:51 2014 (r274827) @@ -37,7 +37,7 @@ * when statically linked. */ -#ifdef PIC +#ifdef __PIC__ #include #include @@ -82,4 +82,4 @@ kiconv_add_xlat16_table(const char *to _ return (EINVAL); } -#endif /* PIC */ +#endif /* __PIC__ */ Modified: projects/sendfile/lib/libmd/rmd160c.c ============================================================================== --- projects/sendfile/lib/libmd/rmd160c.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libmd/rmd160c.c Fri Nov 21 23:08:51 2014 (r274827) @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); * The assembly-language code is not position-independent, so don't * try to use it in a shared library. */ -#ifdef PIC +#ifdef __PIC__ #undef RMD160_ASM #endif Modified: projects/sendfile/lib/libmd/sha1c.c ============================================================================== --- projects/sendfile/lib/libmd/sha1c.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libmd/sha1c.c Fri Nov 21 23:08:51 2014 (r274827) @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); * The assembly-language code is not position-independent, so don't * try to use it in a shared library. */ -#ifdef PIC +#ifdef __PIC__ #undef SHA1_ASM #endif Modified: projects/sendfile/lib/libthr/thread/thr_exit.c ============================================================================== --- projects/sendfile/lib/libthr/thread/thr_exit.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libthr/thread/thr_exit.c Fri Nov 21 23:08:51 2014 (r274827) @@ -54,7 +54,7 @@ __weak_reference(_pthread_exit, pthread_ static int message_printed; static void thread_unwind(void) __dead2; -#ifdef PIC +#ifdef __PIC__ static void thread_uw_init(void); static _Unwind_Reason_Code thread_unwind_stop(int version, _Unwind_Action actions, @@ -114,7 +114,7 @@ _Unwind_GetCFA(struct _Unwind_Context *c #else #pragma weak _Unwind_GetCFA #pragma weak _Unwind_ForcedUnwind -#endif /* PIC */ +#endif /* __PIC__ */ static void thread_unwind_cleanup(_Unwind_Reason_Code code, struct _Unwind_Exception *e) @@ -222,11 +222,11 @@ _pthread_exit_mask(void *status, sigset_ curthread->ret = status; #ifdef _PTHREAD_FORCED_UNWIND -#ifdef PIC +#ifdef __PIC__ thread_uw_init(); -#endif /* PIC */ +#endif /* __PIC__ */ -#ifdef PIC +#ifdef __PIC__ if (uwl_forcedunwind != NULL) { #else if (_Unwind_ForcedUnwind != NULL) { Modified: projects/sendfile/lib/libthr/thread/thr_private.h ============================================================================== --- projects/sendfile/lib/libthr/thread/thr_private.h Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/libthr/thread/thr_private.h Fri Nov 21 23:08:51 2014 (r274827) @@ -100,7 +100,7 @@ TAILQ_HEAD(mutex_queue, pthread_mutex); #define THR_ASSERT(cond, msg) #endif -#ifdef PIC +#ifdef __PIC__ # define STATIC_LIB_REQUIRE(name) #else # define STATIC_LIB_REQUIRE(name) __asm (".globl " #name) Modified: projects/sendfile/lib/msun/src/s_isnan.c ============================================================================== --- projects/sendfile/lib/msun/src/s_isnan.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/lib/msun/src/s_isnan.c Fri Nov 21 23:08:51 2014 (r274827) @@ -31,7 +31,7 @@ #include "fpmath.h" /* Provided by libc.so */ -#ifndef PIC +#ifndef __PIC__ #undef isnan int isnan(double d) @@ -41,7 +41,7 @@ isnan(double d) u.d = d; return (u.bits.exp == 2047 && (u.bits.manl != 0 || u.bits.manh != 0)); } -#endif /* !PIC */ +#endif /* !__PIC__ */ int __isnanf(float f) Modified: projects/sendfile/libexec/rtld-elf/rtld.c ============================================================================== --- projects/sendfile/libexec/rtld-elf/rtld.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/libexec/rtld-elf/rtld.c Fri Nov 21 23:08:51 2014 (r274827) @@ -1817,7 +1817,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo * objtmp.path = NULL; objtmp.rtld = true; objtmp.mapbase = mapbase; -#ifdef PIC +#ifdef __PIC__ objtmp.relocbase = mapbase; #endif if (RTLD_IS_DYNAMIC()) { Modified: projects/sendfile/sbin/fsck/fsck.c ============================================================================== --- projects/sendfile/sbin/fsck/fsck.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/sbin/fsck/fsck.c Fri Nov 21 23:08:51 2014 (r274827) @@ -41,8 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#define FSTYPENAMES -#include +#include #include #include @@ -81,10 +80,21 @@ static void addentry(struct fstypelist * static void maketypelist(char *); static void catopt(char **, const char *); static void mangle(char *, int *, const char ** volatile *, int *); -static const char *getfslab(const char *); +static const char *getfstype(const char *); static void usage(void) __dead2; static int isok(struct fstab *); +static struct { + const char *ptype; + const char *name; +} ptype_map[] = { + { "ufs", "ffs" }, + { "ffs", "ffs" }, + { "fat", "msdosfs" }, + { "efi", "msdosfs" }, + { NULL, NULL }, +}; + int main(int argc, char *argv[]) { @@ -203,7 +213,7 @@ main(int argc, char *argv[]) if ((fs = getfsfile(spec)) == NULL && (fs = getfsspec(spec)) == NULL) { if (vfstype == NULL) - vfstype = getfslab(spec); + vfstype = getfstype(spec); if (vfstype == NULL) errx(1, "Could not determine filesystem type"); type = vfstype; @@ -535,41 +545,27 @@ mangle(char *opts, int *argcp, const cha *maxargcp = maxargc; } - static const char * -getfslab(const char *str) +getfstype(const char *str) { - struct disklabel dl; - int fd; - char p; - const char *vfstype; - u_char t; + struct diocgattr_arg attr; + int fd, i; - /* deduce the file system type from the disk label */ if ((fd = open(str, O_RDONLY)) == -1) err(1, "cannot open `%s'", str); - if (ioctl(fd, DIOCGDINFO, &dl) == -1) { + strncpy(attr.name, "PART::type", sizeof(attr.name)); + memset(&attr.value, 0, sizeof(attr.value)); + attr.len = sizeof(attr.value); + if (ioctl(fd, DIOCGATTR, &attr) == -1) { (void) close(fd); return(NULL); } - (void) close(fd); - - p = str[strlen(str) - 1]; - - if ((p - 'a') >= dl.d_npartitions) - errx(1, "partition `%s' is not defined on disk", str); - - if ((t = dl.d_partitions[p - 'a'].p_fstype) >= FSMAXTYPES) - errx(1, "partition `%s' is not of a legal vfstype", - str); - - if ((vfstype = fstypenames[t]) == NULL) - errx(1, "vfstype `%s' on partition `%s' is not supported", - fstypenames[t], str); - - return vfstype; + for (i = 0; ptype_map[i].ptype != NULL; i++) + if (strstr(attr.value.str, ptype_map[i].ptype) != NULL) + return (ptype_map[i].name); + return (NULL); } Modified: projects/sendfile/share/man/man4/iicbus.4 ============================================================================== --- projects/sendfile/share/man/man4/iicbus.4 Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/share/man/man4/iicbus.4 Fri Nov 21 23:08:51 2014 (r274827) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 24, 2014 +.Dd November 17, 2014 .Dt IICBUS 4 .Os .Sh NAME @@ -103,12 +103,59 @@ Some I2C interfaces are available: .It Sy lpbb Ta "parallel port specific bit-banging interface" .It Sy bktr Ta "Brooktree848 video chipset, hardware and software master-only interface" .El +.Sh BUS FREQUENCY CONFIGURATION +The operating frequency of an I2C bus may be fixed or configurable. +The bus may be used as part of some larger standard interface, and that +interface specification may require a fixed frequency. +The driver for that hardware would not honor an attempt to configure a +different speed. +A general purpose I2C bus, such as those found in many embedded systems, +will often support multiple bus frequencies. +.Pp +When a system supports multiple I2C busses, a different frequency can +be configured for each bus by number, represented by the +.Va %d +in the variable names below. +Busses can be configured using any combination of device hints, +Flattened Device Tree (FDT) data, tunables set via +.Xr loader 8 , +or at runtime using +.Xr sysctl 8 . +When configuration is supplied using more than one method, FDT and +hint data will be overridden by a tunable, which can be overriden by +.Xr sysctl 8 . +.Ss Device Hints +Set +.Va hint.iicbus.%d.frequency +to the frequency in Hz, on systems that use device hints to configure +I2C devices. +The hint is also honored by systems that use FDT data if +no frequency is configured using FDT. +.Ss Flattened Device Tree Data +Configure the I2C bus speed using the FDT standard +.Va clock-frequency +property of the node describing the I2C controller hardware. +.Ss Sysctl and Tunable +Set +.Va dev.iicbus.%d.frequency +in +.Xr loader.conf 5 . +The same variable can be changed at any time with +.Xr sysctl 8 . +Reset the bus using +.Xr i2c 8 +or the +.Xr iic 4 +.Va I2CRSTCARD +ioctl to make the change take effect. .Sh SEE ALSO .Xr bktr 4 , +.Xr fdt 4 , .Xr iic 4 , .Xr iicbb 4 , .Xr lpbb 4 , -.Xr pcf 4 +.Xr pcf 4 , +.Xr i2c 8 .Sh HISTORY The .Nm Modified: projects/sendfile/share/man/man9/Makefile ============================================================================== --- projects/sendfile/share/man/man9/Makefile Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/share/man/man9/Makefile Fri Nov 21 23:08:51 2014 (r274827) @@ -1733,6 +1733,7 @@ MLINKS+=VOP_OPENCLOSE.9 VOP_CLOSE.9 \ MLINKS+=VOP_RDWR.9 VOP_READ.9 \ VOP_RDWR.9 VOP_WRITE.9 MLINKS+=VOP_REMOVE.9 VOP_RMDIR.9 +MLINKS+=vnet.9 vimage.9 MLINKS+=vref.9 VREF.9 MLINKS+=vrele.9 vput.9 \ vrele.9 vunref.9 Modified: projects/sendfile/share/mk/bsd.README ============================================================================== --- projects/sendfile/share/mk/bsd.README Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/share/mk/bsd.README Fri Nov 21 23:08:51 2014 (r274827) @@ -146,7 +146,7 @@ MAN The manual pages to be installed (u MLINKS List of manual page links (using a .1 - .9 suffix). The linked-to file must come first, the linked file second, - and there may be multiple pairs. The files are soft-linked. + and there may be multiple pairs. The files are hard-linked. The include file includes a file named "../Makefile.inc" if it exists. Modified: projects/sendfile/sys/amd64/amd64/elf_machdep.c ============================================================================== --- projects/sendfile/sys/amd64/amd64/elf_machdep.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/sys/amd64/amd64/elf_machdep.c Fri Nov 21 23:08:51 2014 (r274827) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include struct sysentvec elf64_freebsd_sysvec = { @@ -133,11 +134,26 @@ SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_AN &kfreebsd_brand_info); void -elf64_dump_thread(struct thread *td __unused, void *dst __unused, - size_t *off __unused) +elf64_dump_thread(struct thread *td, void *dst, size_t *off) { -} + void *buf; + size_t len; + len = 0; + if (use_xsave) { + if (dst != NULL) { + fpugetregs(td); + len += elf64_populate_note(NT_X86_XSTATE, + get_pcb_user_save_td(td), dst, + cpu_max_ext_state_size, &buf); + *(uint64_t *)((char *)buf + X86_XSTATE_XCR0_OFFSET) = + xsave_mask; + } else + len += elf64_populate_note(NT_X86_XSTATE, NULL, NULL, + cpu_max_ext_state_size, NULL); + } + *off = len; +} /* Process one elf relocation with addend. */ static int Modified: projects/sendfile/sys/amd64/amd64/fpu.c ============================================================================== --- projects/sendfile/sys/amd64/amd64/fpu.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/sys/amd64/amd64/fpu.c Fri Nov 21 23:08:51 2014 (r274827) @@ -127,6 +127,13 @@ CTASSERT(sizeof(struct savefpu_ymm) == 8 */ CTASSERT(sizeof(struct pcb) % XSAVE_AREA_ALIGN == 0); +/* + * Ensure the copy of XCR0 saved in a core is contained in the padding + * area. + */ +CTASSERT(X86_XSTATE_XCR0_OFFSET >= offsetof(struct savefpu, sv_pad) && + X86_XSTATE_XCR0_OFFSET + sizeof(uint64_t) <= sizeof(struct savefpu)); + static void fpu_clean_state(void); SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, Modified: projects/sendfile/sys/amd64/amd64/ptrace_machdep.c ============================================================================== --- projects/sendfile/sys/amd64/amd64/ptrace_machdep.c Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/sys/amd64/amd64/ptrace_machdep.c Fri Nov 21 23:08:51 2014 (r274827) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); static int cpu_ptrace_xstate(struct thread *td, int req, void *addr, int data) { + struct ptrace_xstate_info info; char *savefpu; int error; @@ -49,14 +50,14 @@ cpu_ptrace_xstate(struct thread *td, int return (EOPNOTSUPP); switch (req) { - case PT_GETXSTATE: + case PT_GETXSTATE_OLD: fpugetregs(td); savefpu = (char *)(get_pcb_user_save_td(td) + 1); error = copyout(savefpu, addr, cpu_max_ext_state_size - sizeof(struct savefpu)); break; - case PT_SETXSTATE: + case PT_SETXSTATE_OLD: if (data > cpu_max_ext_state_size - sizeof(struct savefpu)) { error = EINVAL; break; @@ -70,6 +71,36 @@ cpu_ptrace_xstate(struct thread *td, int free(savefpu, M_TEMP); break; + case PT_GETXSTATE_INFO: + if (data != sizeof(info)) { + error = EINVAL; + break; + } + info.xsave_len = cpu_max_ext_state_size; + info.xsave_mask = xsave_mask; + error = copyout(&info, addr, data); + break; + + case PT_GETXSTATE: + fpugetregs(td); + savefpu = (char *)(get_pcb_user_save_td(td)); + error = copyout(savefpu, addr, cpu_max_ext_state_size); + break; + + case PT_SETXSTATE: + if (data > cpu_max_ext_state_size) { + error = EINVAL; + break; + } + savefpu = malloc(data, M_TEMP, M_WAITOK); + error = copyin(addr, savefpu, data); + if (error == 0) + error = fpusetregs(td, (struct savefpu *)savefpu, + savefpu + sizeof(struct savefpu), data - + sizeof(struct savefpu)); + free(savefpu, M_TEMP); + break; + default: error = EINVAL; break; @@ -81,8 +112,6 @@ cpu_ptrace_xstate(struct thread *td, int #ifdef COMPAT_FREEBSD32 #define PT_I386_GETXMMREGS (PT_FIRSTMACH + 0) #define PT_I386_SETXMMREGS (PT_FIRSTMACH + 1) -#define PT_I386_GETXSTATE (PT_FIRSTMACH + 2) -#define PT_I386_SETXSTATE (PT_FIRSTMACH + 3) static int cpu32_ptrace(struct thread *td, int req, void *addr, int data) @@ -104,12 +133,12 @@ cpu32_ptrace(struct thread *td, int req, fpstate->sv_env.en_mxcsr &= cpu_mxcsr_mask; break; - case PT_I386_GETXSTATE: - error = cpu_ptrace_xstate(td, PT_GETXSTATE, addr, data); - break; - - case PT_I386_SETXSTATE: - error = cpu_ptrace_xstate(td, PT_SETXSTATE, addr, data); + case PT_GETXSTATE_OLD: + case PT_SETXSTATE_OLD: + case PT_GETXSTATE_INFO: + case PT_GETXSTATE: + case PT_SETXSTATE: + error = cpu_ptrace_xstate(td, req, addr, data); break; default: @@ -131,13 +160,16 @@ cpu_ptrace(struct thread *td, int req, v return (cpu32_ptrace(td, req, addr, data)); #endif - /* Support old values of PT_GETXSTATE and PT_SETXSTATE. */ + /* Support old values of PT_GETXSTATE_OLD and PT_SETXSTATE_OLD. */ if (req == PT_FIRSTMACH + 0) - req = PT_GETXSTATE; + req = PT_GETXSTATE_OLD; if (req == PT_FIRSTMACH + 1) - req = PT_SETXSTATE; + req = PT_SETXSTATE_OLD; switch (req) { + case PT_GETXSTATE_OLD: + case PT_SETXSTATE_OLD: + case PT_GETXSTATE_INFO: case PT_GETXSTATE: case PT_SETXSTATE: error = cpu_ptrace_xstate(td, req, addr, data); Modified: projects/sendfile/sys/amd64/include/asm.h ============================================================================== --- projects/sendfile/sys/amd64/include/asm.h Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/sys/amd64/include/asm.h Fri Nov 21 23:08:51 2014 (r274827) @@ -38,7 +38,7 @@ #include -#ifdef PIC +#ifdef __PIC__ #define PIC_PLT(x) x@PLT #define PIC_GOT(x) x@GOTPCREL(%rip) #else Modified: projects/sendfile/sys/arm/include/asm.h ============================================================================== --- projects/sendfile/sys/arm/include/asm.h Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/sys/arm/include/asm.h Fri Nov 21 23:08:51 2014 (r274827) @@ -104,7 +104,7 @@ #define ASMSTR .asciz -#if defined(PIC) +#if defined(__PIC__) #define PLT_SYM(x) PIC_SYM(x, PLT) #define GOT_SYM(x) PIC_SYM(x, GOT) #define GOT_GET(x,got,sym) \ @@ -131,7 +131,7 @@ #define GOT_INIT(got,gotsym,pclabel) #define GOT_INITSYM(gotsym,pclabel) #define PIC_SYM(x,y) x -#endif /* PIC */ +#endif /* __PIC__ */ #undef __FBSDID #if !defined(lint) && !defined(STRIP_FBSDID) Modified: projects/sendfile/sys/boot/fdt/dts/mips/beri-sim.dts ============================================================================== --- projects/sendfile/sys/boot/fdt/dts/mips/beri-sim.dts Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/sys/boot/fdt/dts/mips/beri-sim.dts Fri Nov 21 23:08:51 2014 (r274827) @@ -97,7 +97,7 @@ reg = <0x0 0x4000000>; // 64M at 0x0 }; - beripic: beripic@7f804000 { + beripic0: beripic@7f804000 { compatible = "sri-cambridge,beri-pic"; interrupt-controller; #address-cells = <0>; @@ -115,7 +115,7 @@ compatible = "altera,jtag_uart-11_0"; reg = <0x7f000000 0x40>; interrupts = <0>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; serial@7f001000 { Modified: projects/sendfile/sys/boot/fdt/dts/mips/beripad-de4.dts ============================================================================== --- projects/sendfile/sys/boot/fdt/dts/mips/beripad-de4.dts Fri Nov 21 23:05:08 2014 (r274826) +++ projects/sendfile/sys/boot/fdt/dts/mips/beripad-de4.dts Fri Nov 21 23:08:51 2014 (r274827) @@ -97,7 +97,7 @@ reg = <0x0 0x40000000>; // 1G at 0x0 }; - beripic: beripic@7f804000 { + beripic0: beripic@7f804000 { compatible = "sri-cambridge,beri-pic"; interrupt-controller; #address-cells = <0>; @@ -117,14 +117,14 @@ reg-shift = <2>; clock-frequency = <50000000>; interrupts = <6>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; serial@7f000000 { compatible = "altera,jtag_uart-11_0"; reg = <0x7f000000 0x40>; interrupts = <0>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; serial@7f001000 { @@ -198,7 +198,7 @@ 0x7f007420 0x20>; // RX, TX interrupts = <1 2>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; ethernet@7f005000 { @@ -211,11 +211,12 @@ 0x7f005420 0x20>; // RX, TX interrupts = <11 12>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; touchscreen@70400000 { compatible = "sri-cambridge,mtl"; + panel-size = < 800 480 >; reg = <0x70400000 0x1000 0x70000000 0x177000 0x70177000 0x2000>; @@ -227,7 +228,7 @@ 0x7f140000 0x4>; // IRQ 4 is DC, IRQ 5 is HC. interrupts = <4 5>; - interrupt-parent = <&beripic>; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:18:39 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1BA56898; Fri, 21 Nov 2014 23:18:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 08C16B7B; Fri, 21 Nov 2014 23:18:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALNIctt050248; Fri, 21 Nov 2014 23:18:38 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALNIcpb050247; Fri, 21 Nov 2014 23:18:38 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411212318.sALNIcpb050247@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 21 Nov 2014 23:18:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274828 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:18:39 -0000 Author: glebius Date: Fri Nov 21 23:18:38 2014 New Revision: 274828 URL: https://svnweb.freebsd.org/changeset/base/274828 Log: Use typedefs instead of copy-paste. Modified: projects/sendfile/sys/vm/swap_pager.c Modified: projects/sendfile/sys/vm/swap_pager.c ============================================================================== --- projects/sendfile/sys/vm/swap_pager.c Fri Nov 21 23:08:51 2014 (r274827) +++ projects/sendfile/sys/vm/swap_pager.c Fri Nov 21 23:18:38 2014 (r274828) @@ -362,7 +362,7 @@ static vm_object_t static void swap_pager_dealloc(vm_object_t object); static int swap_pager_getpages(vm_object_t, vm_page_t *, int, int); static int swap_pager_getpages_async(vm_object_t, vm_page_t *, int, int, - void(*)(void *, vm_page_t *, int, int), void *); + pgo_getpages_iodone_t *, void *); static void swap_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *); static boolean_t swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, int *after); @@ -1267,7 +1267,7 @@ swap_pager_getpages(vm_object_t object, */ static int swap_pager_getpages_async(vm_object_t object, vm_page_t *m, int count, - int reqpage, void(*iodone)(void *, vm_page_t *, int, int), void *arg) + int reqpage, pgo_getpages_iodone_t *iodone, void *arg) { int r; From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:25:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3299AA41; Fri, 21 Nov 2014 23:25:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F43EC38; Fri, 21 Nov 2014 23:25:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALNPRGi056798; Fri, 21 Nov 2014 23:25:27 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALNPR0B056797; Fri, 21 Nov 2014 23:25:27 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411212325.sALNPR0B056797@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 21 Nov 2014 23:25:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274829 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:25:28 -0000 Author: glebius Date: Fri Nov 21 23:25:27 2014 New Revision: 274829 URL: https://svnweb.freebsd.org/changeset/base/274829 Log: Use typedef instead of copy-paste. Modified: projects/sendfile/sys/vm/vm_pager.h Modified: projects/sendfile/sys/vm/vm_pager.h ============================================================================== --- projects/sendfile/sys/vm/vm_pager.h Fri Nov 21 23:18:38 2014 (r274828) +++ projects/sendfile/sys/vm/vm_pager.h Fri Nov 21 23:25:27 2014 (r274829) @@ -108,7 +108,7 @@ void vm_pager_bufferinit(void); void vm_pager_deallocate(vm_object_t); static __inline int vm_pager_get_pages(vm_object_t, vm_page_t *, int, int); static inline int vm_pager_get_pages_async(vm_object_t, vm_page_t *, int, - int, void(*)(void *, vm_page_t *, int, int), void *); + int, pgo_getpages_iodone_t *, void *); static __inline boolean_t vm_pager_has_page(vm_object_t, vm_pindex_t, int *, int *); void vm_pager_init(void); vm_object_t vm_pager_object_lookup(struct pagerlst *, void *); From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:36:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22E7CDB7; Fri, 21 Nov 2014 23:36:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03F0AD10; Fri, 21 Nov 2014 23:36:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALNaMf3065646; Fri, 21 Nov 2014 23:36:22 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALNaMbo065632; Fri, 21 Nov 2014 23:36:22 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411212336.sALNaMbo065632@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 21 Nov 2014 23:36:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274830 - in projects/routing/sys: netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:36:23 -0000 Author: melifaro Date: Fri Nov 21 23:36:21 2014 New Revision: 274830 URL: https://svnweb.freebsd.org/changeset/base/274830 Log: Finish r274774: add more headers/fix build for non-debug case. Modified: projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet/toecore.c projects/routing/sys/netinet6/scope6.c Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Fri Nov 21 23:25:27 2014 (r274829) +++ projects/routing/sys/netinet/if_ether.c Fri Nov 21 23:36:21 2014 (r274830) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Fri Nov 21 23:25:27 2014 (r274829) +++ projects/routing/sys/netinet/in.c Fri Nov 21 23:36:21 2014 (r274830) @@ -1078,10 +1078,9 @@ in_lltable_delete(struct lltable *llt, u const struct sockaddr *l3addr) { const struct sockaddr_in *sin = (const struct sockaddr_in *)l3addr; - struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_WLOCK_ASSERT(ifp); + IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); @@ -1191,11 +1190,10 @@ in_lltable_unlink(struct llentry *lle) static struct llentry * in_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) { - struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; struct in_addr dst; - IF_AFDATA_LOCK_ASSERT(ifp); + IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); Modified: projects/routing/sys/netinet/toecore.c ============================================================================== --- projects/routing/sys/netinet/toecore.c Fri Nov 21 23:25:27 2014 (r274829) +++ projects/routing/sys/netinet/toecore.c Fri Nov 21 23:36:21 2014 (r274830) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet6/scope6.c ============================================================================== --- projects/routing/sys/netinet6/scope6.c Fri Nov 21 23:25:27 2014 (r274829) +++ projects/routing/sys/netinet6/scope6.c Fri Nov 21 23:36:21 2014 (r274830) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:37:15 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA978E9D; Fri, 21 Nov 2014 23:37:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97694D1C; Fri, 21 Nov 2014 23:37:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALNbFLn065947; Fri, 21 Nov 2014 23:37:15 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALNbFvu065946; Fri, 21 Nov 2014 23:37:15 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411212337.sALNbFvu065946@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 21 Nov 2014 23:37:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274831 - projects/routing/sys/netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:37:15 -0000 Author: melifaro Date: Fri Nov 21 23:37:14 2014 New Revision: 274831 URL: https://svnweb.freebsd.org/changeset/base/274831 Log: Another r274774 fix. Modified: projects/routing/sys/netinet6/in6.c Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Fri Nov 21 23:36:21 2014 (r274830) +++ projects/routing/sys/netinet6/in6.c Fri Nov 21 23:37:14 2014 (r274831) @@ -2181,10 +2181,9 @@ in6_lltable_delete(struct lltable *llt, const struct sockaddr *l3addr) { const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; - struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_LOCK_ASSERT(ifp); + IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); @@ -2288,10 +2287,9 @@ in6_lltable_lookup(struct lltable *llt, const struct sockaddr *l3addr) { const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; - struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_LOCK_ASSERT(ifp); + IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:38:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D26FF89; Fri, 21 Nov 2014 23:38:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 306B6D24; Fri, 21 Nov 2014 23:38:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALNc0m2066371; Fri, 21 Nov 2014 23:38:00 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALNc054066367; Fri, 21 Nov 2014 23:38:00 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411212338.sALNc054066367@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 21 Nov 2014 23:38:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274832 - in projects/routing/sys: net netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:38:01 -0000 Author: melifaro Date: Fri Nov 21 23:37:59 2014 New Revision: 274832 URL: https://svnweb.freebsd.org/changeset/base/274832 Log: Mark ifaddr/rtsock static entries RLLE_VALID. Modified: projects/routing/sys/net/if_llatbl.c projects/routing/sys/netinet/if_ether.c Modified: projects/routing/sys/net/if_llatbl.c ============================================================================== --- projects/routing/sys/net/if_llatbl.c Fri Nov 21 23:37:14 2014 (r274831) +++ projects/routing/sys/net/if_llatbl.c Fri Nov 21 23:37:59 2014 (r274832) @@ -328,6 +328,7 @@ lla_rt_output(struct rt_msghdr *rtm, str if (rtm->rtm_rmx.rmx_expire == 0) { lle->la_flags |= LLE_STATIC; + lle->r_flags |= RLLE_VALID; lle->la_expire = 0; } else lle->la_expire = rtm->rtm_rmx.rmx_expire; Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Fri Nov 21 23:37:14 2014 (r274831) +++ projects/routing/sys/netinet/if_ether.c Fri Nov 21 23:37:59 2014 (r274832) @@ -1089,6 +1089,8 @@ arp_ifinit(struct ifnet *ifp, struct ifa IF_AFDATA_LOCK(ifp); lle = lla_create(LLTABLE(ifp), LLE_IFADDR | LLE_STATIC, (struct sockaddr *)IA_SIN(ifa)); + if (lle != NULL) + lle->r_flags |= RLLE_VALID; IF_AFDATA_UNLOCK(ifp); if (lle == NULL) log(LOG_INFO, "arp_ifinit: cannot create arp " From owner-svn-src-projects@FreeBSD.ORG Sat Nov 22 12:44:32 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54EBA720; Sat, 22 Nov 2014 12:44:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41917CB9; Sat, 22 Nov 2014 12:44:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMCiWhO045806; Sat, 22 Nov 2014 12:44:32 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMCiWnF045805; Sat, 22 Nov 2014 12:44:32 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411221244.sAMCiWnF045805@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sat, 22 Nov 2014 12:44:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274848 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 12:44:32 -0000 Author: glebius Date: Sat Nov 22 12:44:31 2014 New Revision: 274848 URL: https://svnweb.freebsd.org/changeset/base/274848 Log: Improve logging message. Modified: projects/sendfile/sys/vm/vnode_pager.c Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Sat Nov 22 12:13:05 2014 (r274847) +++ projects/sendfile/sys/vm/vnode_pager.c Sat Nov 22 12:44:31 2014 (r274848) @@ -1084,9 +1084,8 @@ vnode_pager_generic_getpages_done(struct vm_page_readahead_finish(mt); } VM_OBJECT_WUNLOCK(object); - if (error) { - printf("vnode_pager_getpages: I/O read error\n"); - } + if (error) + printf("%s: I/O read error %d\n", __func__, error); return (error); } From owner-svn-src-projects@FreeBSD.ORG Sat Nov 22 13:06:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB6E3CB6; Sat, 22 Nov 2014 13:06:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8726EAF; Sat, 22 Nov 2014 13:06:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMD6mx7055659; Sat, 22 Nov 2014 13:06:48 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMD6mif055658; Sat, 22 Nov 2014 13:06:48 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411221306.sAMD6mif055658@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sat, 22 Nov 2014 13:06:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274850 - projects/sendfile/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 13:06:48 -0000 Author: glebius Date: Sat Nov 22 13:06:47 2014 New Revision: 274850 URL: https://svnweb.freebsd.org/changeset/base/274850 Log: Iodone callback should receive UNIX error code. Noticed by: kib Modified: projects/sendfile/sys/vm/swap_pager.c Modified: projects/sendfile/sys/vm/swap_pager.c ============================================================================== --- projects/sendfile/sys/vm/swap_pager.c Sat Nov 22 12:48:09 2014 (r274849) +++ projects/sendfile/sys/vm/swap_pager.c Sat Nov 22 13:06:47 2014 (r274850) @@ -1269,11 +1269,24 @@ static int swap_pager_getpages_async(vm_object_t object, vm_page_t *m, int count, int reqpage, pgo_getpages_iodone_t *iodone, void *arg) { - int r; + int r, error; r = swap_pager_getpages(object, m, count, reqpage); VM_OBJECT_WUNLOCK(object); - (iodone)(arg, m, count, r); + switch (r) { + case VM_PAGER_OK: + error = 0; + break; + case VM_PAGER_ERROR: + error = EIO; + break; + case VM_PAGER_FAIL: + error = EINVAL; + break; + default: + error = EDOOFUS; + } + (iodone)(arg, m, count, error); VM_OBJECT_WLOCK(object); return (r); From owner-svn-src-projects@FreeBSD.ORG Sat Nov 22 16:27:53 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 50FBCAEF; Sat, 22 Nov 2014 16:27:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C4C936A; Sat, 22 Nov 2014 16:27:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMGRr40055677; Sat, 22 Nov 2014 16:27:53 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMGRptb055672; Sat, 22 Nov 2014 16:27:51 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411221627.sAMGRptb055672@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 22 Nov 2014 16:27:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274855 - projects/routing/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 16:27:53 -0000 Author: melifaro Date: Sat Nov 22 16:27:51 2014 New Revision: 274855 URL: https://svnweb.freebsd.org/changeset/base/274855 Log: Convert &in_ifaddr_lock to dual-locking model: use rwlock accessible via external functions (IN_IFADDR_CFG_* -> in_ifaddr_cfg_*()) for all control plane tasks use rmlock (IN_IFADDR_RUN_*) for fast-path lookups. Modified: projects/routing/sys/netinet/in.c projects/routing/sys/netinet/in_mcast.c projects/routing/sys/netinet/in_pcb.c projects/routing/sys/netinet/in_var.h projects/routing/sys/netinet/ip_input.c Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sat Nov 22 16:03:18 2014 (r274854) +++ projects/routing/sys/netinet/in.c Sat Nov 22 16:27:51 2014 (r274855) @@ -92,6 +92,62 @@ VNET_DECLARE(struct inpcbinfo, ripcbinfo static struct sx in_control_sx; SX_SYSINIT(in_control_sx, &in_control_sx, "in_control"); +struct rmlock in_ifaddr_lock; /* XXX: padding ? */ +struct rwlock in_ifaddr_cfg_lock; +RM_SYSINIT(in_ifaddr_lock, &in_ifaddr_lock, "in_ifaddr_lock"); +RW_SYSINIT(in_ifaddr_cfg_lock, &in_ifaddr_cfg_lock, "in_ifaddr_cfg_lock"); + +void +in_ifaddr_cfg_rlock() +{ + + rw_rlock(&in_ifaddr_cfg_lock); +} + +void +in_ifaddr_cfg_runlock() +{ + + rw_runlock(&in_ifaddr_cfg_lock); +} + +void +in_ifaddr_cfg_wlock() +{ + + rw_wlock(&in_ifaddr_cfg_lock); +} + +void +in_ifaddr_cfg_wunlock() +{ + + rw_wunlock(&in_ifaddr_cfg_lock); +} + +void +in_ifaddr_cfg_lock_assert(int what) +{ + + rw_assert(&in_ifaddr_cfg_lock, what); +} + +void +in_ifaddr_wlock() +{ + + in_ifaddr_cfg_wlock(); + IN_IFADDR_RUN_WLOCK(); +} + +void +in_ifaddr_wunlock() +{ + + in_ifaddr_cfg_wunlock(); + IN_IFADDR_RUN_WUNLOCK(); +} + /* * Return 1 if an internet address is for a ``local'' host * (one to which we have a connection). @@ -101,15 +157,16 @@ in_localaddr(struct in_addr in) { register u_long i = ntohl(in.s_addr); register struct in_ifaddr *ia; + IN_IFADDR_RUN_TRACKER; - IN_IFADDR_RLOCK(); + IN_IFADDR_RUN_RLOCK(); TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { if ((i & ia->ia_subnetmask) == ia->ia_subnet) { IN_IFADDR_RUNLOCK(); return (1); } } - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); return (0); } @@ -121,15 +178,16 @@ int in_localip(struct in_addr in) { struct in_ifaddr *ia; + IN_IFADDR_RUN_TRACKER; - IN_IFADDR_RLOCK(); + IN_IFADDR_RUN_RLOCK(); LIST_FOREACH(ia, INADDR_HASH(in.s_addr), ia_hash) { if (IA_SIN(ia)->sin_addr.s_addr == in.s_addr) { IN_IFADDR_RUNLOCK(); return (1); } } - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); return (0); } @@ -142,8 +200,9 @@ in_localip_more(struct in_ifaddr *ia) { in_addr_t in = IA_SIN(ia)->sin_addr.s_addr; struct in_ifaddr *it; + IN_IFADDR_RUN_TRACKER; - IN_IFADDR_RLOCK(); + IN_IFADDR_RUN_RLOCK(); LIST_FOREACH(it, INADDR_HASH(in), ia_hash) { if (it != ia && IA_SIN(it)->sin_addr.s_addr == in) { ifa_ref(&it->ia_ifa); @@ -151,7 +210,7 @@ in_localip_more(struct in_ifaddr *ia) return (it); } } - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); return (NULL); } Modified: projects/routing/sys/netinet/in_mcast.c ============================================================================== --- projects/routing/sys/netinet/in_mcast.c Sat Nov 22 16:03:18 2014 (r274854) +++ projects/routing/sys/netinet/in_mcast.c Sat Nov 22 16:27:51 2014 (r274855) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -86,6 +87,8 @@ static MALLOC_DEFINE(M_IPMOPTS, "ip_mopt static MALLOC_DEFINE(M_IPMSOURCE, "ip_msource", "IPv4 multicast IGMP-layer source filter"); +IN_IFADDR_FAST_LOCK_DECLARATION; + /* * Locking: * - Lock order is: Giant, INP_WLOCK, IN_MULTI_LOCK, IGMP_LOCK, IF_ADDR_LOCK. @@ -1887,6 +1890,7 @@ inp_lookup_mcast_ifp(const struct inpcb const struct sockaddr_in *gsin, const struct in_addr ina) { struct ifnet *ifp; + IN_IFADDR_RUN_TRACKER; KASSERT(gsin->sin_family == AF_INET, ("%s: not AF_INET", __func__)); KASSERT(IN_MULTICAST(ntohl(gsin->sin_addr.s_addr)), @@ -1906,7 +1910,7 @@ inp_lookup_mcast_ifp(const struct inpcb struct ifnet *mifp; mifp = NULL; - IN_IFADDR_RLOCK(); + IN_IFADDR_RUN_RLOCK(); TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { mifp = ia->ia_ifp; if (!(mifp->if_flags & IFF_LOOPBACK) && @@ -1915,7 +1919,7 @@ inp_lookup_mcast_ifp(const struct inpcb break; } } - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); } } Modified: projects/routing/sys/netinet/in_pcb.c ============================================================================== --- projects/routing/sys/netinet/in_pcb.c Sat Nov 22 16:03:18 2014 (r274854) +++ projects/routing/sys/netinet/in_pcb.c Sat Nov 22 16:27:51 2014 (r274855) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -101,6 +102,8 @@ __FBSDID("$FreeBSD$"); #include +IN_IFADDR_FAST_LOCK_DECLARATION; + static struct callout ipport_tick_callout; /* @@ -1006,6 +1009,7 @@ in_pcbconnect_setup(struct inpcb *inp, s struct in_addr laddr, faddr; u_short lport, fport; int error; + IN_IFADDR_RUN_TRACKER; /* * Because a global state change doesn't actually occur here, a read @@ -1036,20 +1040,20 @@ in_pcbconnect_setup(struct inpcb *inp, s * choose the broadcast address for that interface. */ if (faddr.s_addr == INADDR_ANY) { - IN_IFADDR_RLOCK(); + IN_IFADDR_RUN_RLOCK(); faddr = IA_SIN(TAILQ_FIRST(&V_in_ifaddrhead))->sin_addr; - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); if (cred != NULL && (error = prison_get_ip4(cred, &faddr)) != 0) return (error); } else if (faddr.s_addr == (u_long)INADDR_BROADCAST) { - IN_IFADDR_RLOCK(); + IN_IFADDR_RUN_RLOCK(); if (TAILQ_FIRST(&V_in_ifaddrhead)->ia_ifp->if_flags & IFF_BROADCAST) faddr = satosin(&TAILQ_FIRST( &V_in_ifaddrhead)->ia_broadaddr)->sin_addr; - IN_IFADDR_RUNLOCK(); + IN_IFADDR_RUN_RUNLOCK(); } } if (laddr.s_addr == INADDR_ANY) { Modified: projects/routing/sys/netinet/in_var.h ============================================================================== --- projects/routing/sys/netinet/in_var.h Sat Nov 22 16:03:18 2014 (r274854) +++ projects/routing/sys/netinet/in_var.h Sat Nov 22 16:27:51 2014 (r274855) @@ -118,15 +118,39 @@ VNET_DECLARE(u_long, in_ifaddrhmask); / #define INADDR_HASH(x) \ (&V_in_ifaddrhashtbl[INADDR_HASHVAL(x) & V_in_ifaddrhmask]) -extern struct rwlock in_ifaddr_lock; - -#define IN_IFADDR_LOCK_ASSERT() rw_assert(&in_ifaddr_lock, RA_LOCKED) -#define IN_IFADDR_RLOCK() rw_rlock(&in_ifaddr_lock) -#define IN_IFADDR_RLOCK_ASSERT() rw_assert(&in_ifaddr_lock, RA_RLOCKED) -#define IN_IFADDR_RUNLOCK() rw_runlock(&in_ifaddr_lock) -#define IN_IFADDR_WLOCK() rw_wlock(&in_ifaddr_lock) -#define IN_IFADDR_WLOCK_ASSERT() rw_assert(&in_ifaddr_lock, RA_WLOCKED) -#define IN_IFADDR_WUNLOCK() rw_wunlock(&in_ifaddr_lock) +/* ifaddr lock: control plane */ +#define IN_IFADDR_CFG_RLOCK() in_ifaddr_cfg_rlock() +#define IN_IFADDR_CFG_RUNLOCK() in_ifaddr_cfg_runlock() +#define IN_IFADDR_CFG_WLOCK() in_ifaddr_cfg_wlock() +#define IN_IFADDR_CFG_WUNLOCK() in_ifaddr_cfg_wunlock() +#define IN_IFADDR_CFG_LOCK_ASSERT() in_ifaddr_cfg_lock_assert(RA_LOCKED) +#define IN_IFADDR_CFG_RLOCK_ASSERT() in_ifaddr_cfg_lock_assert(RA_RLOCKED) +#define IN_IFADDR_CFG_WLOCK_ASSERT() in_ifaddr_cfg_lock_assert(RA_WLOCKED) +void in_ifaddr_cfg_rlock(void); +void in_ifaddr_cfg_runlock(void); +void in_ifaddr_cfg_wlock(void); +void in_ifaddr_cfg_wunlock(void); +void in_ifaddr_cfg_lock_assert(int what); + +/* ifaddr: wrappers */ +#define IN_IFADDR_RLOCK IN_IFADDR_CFG_RLOCK +#define IN_IFADDR_RUNLOCK IN_IFADDR_CFG_RUNLOCK +#define IN_IFADDR_WLOCK() in_ifaddr_wlock() +#define IN_IFADDR_WUNLOCK() in_ifaddr_wunlock() +void in_ifaddr_wlock(void); +void in_ifaddr_wunlock(void); + +/* ifaddr lock: fast path */ +#define IN_IFADDR_FAST_LOCK_DECLARATION extern struct rmlock in_ifaddr_lock + +#define IN_IFADDR_RUN_RLOCK() rm_rlock(&in_ifaddr_lock, &ifa_rm_tracker) +#define IN_IFADDR_RUN_RUNLOCK() rm_runlock(&in_ifaddr_lock, &ifa_rm_tracker) +#define IN_IFADDR_RUN_WLOCK() rm_wlock(&in_ifaddr_lock) +#define IN_IFADDR_RUN_WUNLOCK() rm_wunlock(&in_ifaddr_lock) +#define IN_IFADDR_RUN_TRACKER struct rm_priotracker ifa_rm_tracker +#define IN_IFADDR_RUN_LOCK_ASSERT() rm_assert(&in_ifaddr_lock, RA_LOCKED) +#define IN_IFADDR_RUN_RLOCK_ASSERT() rm_assert(&in_ifaddr_lock, RA_RLOCKED) +#define IN_IFADDR_RUN_WLOCK_ASSERT() rm_assert(&in_ifaddr_lock, RA_WLOCKED) /* * Macro for finding the internet address structure (in_ifaddr) Modified: projects/routing/sys/netinet/ip_input.c ============================================================================== --- projects/routing/sys/netinet/ip_input.c Sat Nov 22 16:03:18 2014 (r274854) +++ projects/routing/sys/netinet/ip_input.c Sat Nov 22 16:27:51 2014 (r274855) @@ -90,9 +90,6 @@ __FBSDID("$FreeBSD$"); CTASSERT(sizeof(struct ip) == 20); #endif -struct rwlock in_ifaddr_lock; -RW_SYSINIT(in_ifaddr_lock, &in_ifaddr_lock, "in_ifaddr_lock"); - VNET_DEFINE(int, rsvp_on); VNET_DEFINE(int, ipforwarding); @@ -646,7 +643,7 @@ passin: /* * Check for exact addresses in the hash bucket. */ - /* IN_IFADDR_RLOCK(); */ + /* IN_IFADDR_RUN_RLOCK(); */ LIST_FOREACH(ia, INADDR_HASH(ip->ip_dst.s_addr), ia_hash) { /* * If the address matches, verify that the packet @@ -662,7 +659,7 @@ passin: goto ours; } } - /* IN_IFADDR_RUNLOCK(); */ + /* IN_IFADDR_RUN_RUNLOCK(); */ /* * Check for broadcast addresses. From owner-svn-src-projects@FreeBSD.ORG Sat Nov 22 17:30:38 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 528E2AD5; Sat, 22 Nov 2014 17:30:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3EEEDBDB; Sat, 22 Nov 2014 17:30:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMHUcEX089455; Sat, 22 Nov 2014 17:30:38 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMHUbEK089453; Sat, 22 Nov 2014 17:30:37 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411221730.sAMHUbEK089453@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 22 Nov 2014 17:30:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274864 - projects/routing/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 17:30:38 -0000 Author: melifaro Date: Sat Nov 22 17:30:37 2014 New Revision: 274864 URL: https://svnweb.freebsd.org/changeset/base/274864 Log: Fix non-debug build after r274855. Modified: projects/routing/sys/netinet/in_mcast.c projects/routing/sys/netinet/in_pcb.c Modified: projects/routing/sys/netinet/in_mcast.c ============================================================================== --- projects/routing/sys/netinet/in_mcast.c Sat Nov 22 17:26:43 2014 (r274863) +++ projects/routing/sys/netinet/in_mcast.c Sat Nov 22 17:30:37 2014 (r274864) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet/in_pcb.c ============================================================================== --- projects/routing/sys/netinet/in_pcb.c Sat Nov 22 17:26:43 2014 (r274863) +++ projects/routing/sys/netinet/in_pcb.c Sat Nov 22 17:30:37 2014 (r274864) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include From owner-svn-src-projects@FreeBSD.ORG Sat Nov 22 17:57:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C1840C39; Sat, 22 Nov 2014 17:57:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ACB87E89; Sat, 22 Nov 2014 17:57:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMHvwU7001716; Sat, 22 Nov 2014 17:57:58 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMHvtlN001693; Sat, 22 Nov 2014 17:57:55 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411221757.sAMHvtlN001693@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 22 Nov 2014 17:57:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274874 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 17:57:59 -0000 Author: melifaro Date: Sat Nov 22 17:57:54 2014 New Revision: 274874 URL: https://svnweb.freebsd.org/changeset/base/274874 Log: Temporarily revert r274774. Modified: projects/routing/sys/net/if.c projects/routing/sys/net/if_llatbl.c projects/routing/sys/net/if_var.h projects/routing/sys/net/rt_nhops.c projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet/toecore.c projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/nd6.c projects/routing/sys/netinet6/nd6_nbr.c projects/routing/sys/netinet6/nd6_rtr.c projects/routing/sys/netinet6/scope6.c Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/net/if.c Sat Nov 22 17:57:54 2014 (r274874) @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -774,11 +773,8 @@ if_attachdomain1(struct ifnet *ifp) * Since dp->dom_ifattach calls malloc() with M_WAITOK, we * cannot lock ifp->if_afdata initialization, entirely. */ -#if 0 if (IF_AFDATA_TRYLOCK(ifp) == 0) return; -#endif - IF_AFDATA_LOCK(ifp); if (ifp->if_afdata_initialized >= domain_init_status) { IF_AFDATA_UNLOCK(ifp); log(LOG_WARNING, "%s called more than once on %s\n", Modified: projects/routing/sys/net/if_llatbl.c ============================================================================== --- projects/routing/sys/net/if_llatbl.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/net/if_llatbl.c Sat Nov 22 17:57:54 2014 (r274874) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #ifdef DDB #include @@ -143,7 +142,6 @@ llentry_alloc(struct ifnet *ifp, struct struct sockaddr_storage *dst) { struct llentry *la; - IF_AFDATA_TRACKER; IF_AFDATA_RLOCK(ifp); la = lla_lookup(lt, LLE_EXCLUSIVE, (struct sockaddr *)dst); Modified: projects/routing/sys/net/if_var.h ============================================================================== --- projects/routing/sys/net/if_var.h Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/net/if_var.h Sat Nov 22 17:57:54 2014 (r274874) @@ -192,7 +192,7 @@ struct ifnet { int if_amcount; /* number of all-multicast requests */ struct ifaddr *if_addr; /* pointer to link-level address */ const u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */ - struct rmlock if_afdata_lock; + struct rwlock if_afdata_lock; void *if_afdata[AF_MAX]; int if_afdata_initialized; @@ -340,22 +340,21 @@ EVENTHANDLER_DECLARE(group_change_event, #endif /* _SYS_EVENTHANDLER_H_ */ #define IF_AFDATA_LOCK_INIT(ifp) \ - rm_init(&(ifp)->if_afdata_lock, "if_afdata") + rw_init(&(ifp)->if_afdata_lock, "if_afdata") -#define IF_AFDATA_WLOCK(ifp) rm_wlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_RLOCK(ifp) rm_rlock(&(ifp)->if_afdata_lock, &tracker) -#define IF_AFDATA_WUNLOCK(ifp) rm_wunlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_RUNLOCK(ifp) rm_runlock(&(ifp)->if_afdata_lock, &tracker) +#define IF_AFDATA_WLOCK(ifp) rw_wlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_RLOCK(ifp) rw_rlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_WUNLOCK(ifp) rw_wunlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_RUNLOCK(ifp) rw_runlock(&(ifp)->if_afdata_lock) #define IF_AFDATA_LOCK(ifp) IF_AFDATA_WLOCK(ifp) #define IF_AFDATA_UNLOCK(ifp) IF_AFDATA_WUNLOCK(ifp) -#define IF_AFDATA_TRYLOCK(ifp) rm_try_wlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_DESTROY(ifp) rm_destroy(&(ifp)->if_afdata_lock) -#define IF_AFDATA_TRACKER struct rm_priotracker tracker - -#define IF_AFDATA_LOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_LOCKED) -#define IF_AFDATA_RLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_RLOCKED) -#define IF_AFDATA_WLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_WLOCKED) -#define IF_AFDATA_UNLOCK_ASSERT(ifp) rm_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED) +#define IF_AFDATA_TRYLOCK(ifp) rw_try_wlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_DESTROY(ifp) rw_destroy(&(ifp)->if_afdata_lock) + +#define IF_AFDATA_LOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_LOCKED) +#define IF_AFDATA_RLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_RLOCKED) +#define IF_AFDATA_WLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_WLOCKED) +#define IF_AFDATA_UNLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED) /* * 72 was chosen below because it is the size of a TCP/IP Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/net/rt_nhops.c Sat Nov 22 17:57:54 2014 (r274874) @@ -681,7 +681,6 @@ fib6_storelladdr(struct ifnet *ifp, stru { struct llentry *ln; struct sockaddr_in6 dst_sa; - IF_AFDATA_TRACKER; if (mm_flags & M_MCAST) { ETHER_MAP_IPV6_MULTICAST(&dst, desten); Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet/if_ether.c Sat Nov 22 17:57:54 2014 (r274874) @@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include #include @@ -356,7 +354,6 @@ arpresolve_fast(struct ifnet *ifp, struc struct llentry *la; struct sockaddr_in sin; const struct sockaddr *sa_dst; - IF_AFDATA_TRACKER; if (mflags & M_BCAST) { memcpy(dst_addr, ifp->if_broadcastaddr, ifp->if_addrlen); @@ -440,7 +437,6 @@ arpresolve(struct ifnet *ifp, struct rte const struct sockaddr *dst, u_char *desten, struct llentry **lle) { struct llentry *la = NULL; - IF_AFDATA_TRACKER; int is_gw; *lle = NULL; @@ -483,7 +479,6 @@ arpresolve_slow(struct ifnet *ifp, int i struct mbuf *curr = NULL; struct mbuf *next = NULL; int create, error; - IF_AFDATA_TRACKER; create = 0; *lle = NULL; @@ -704,7 +699,6 @@ in_arpinput(struct mbuf *m) sin.sin_len = sizeof(struct sockaddr_in); sin.sin_family = AF_INET; sin.sin_addr.s_addr = 0; - IF_AFDATA_TRACKER; if (ifp->if_bridge) bridged = 1; Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet/in.c Sat Nov 22 17:57:54 2014 (r274874) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -1137,9 +1136,10 @@ in_lltable_delete(struct lltable *llt, u const struct sockaddr *l3addr) { const struct sockaddr_in *sin = (const struct sockaddr_in *)l3addr; + struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); + IF_AFDATA_WLOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); @@ -1249,10 +1249,11 @@ in_lltable_unlink(struct llentry *lle) static struct llentry * in_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) { + struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; struct in_addr dst; - IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); + IF_AFDATA_LOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); Modified: projects/routing/sys/netinet/toecore.c ============================================================================== --- projects/routing/sys/netinet/toecore.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet/toecore.c Sat Nov 22 17:57:54 2014 (r274874) @@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include #include @@ -458,7 +456,6 @@ toe_nd6_resolve(struct ifnet *ifp, struc struct llentry *lle; struct sockaddr_in6 *sin6 = (void *)sa; int rc, flags = 0; - IF_AFDATA_TRACKER; restart: IF_AFDATA_RLOCK(ifp); Modified: projects/routing/sys/netinet6/icmp6.c ============================================================================== --- projects/routing/sys/netinet6/icmp6.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet6/icmp6.c Sat Nov 22 17:57:54 2014 (r274874) @@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -2505,7 +2504,6 @@ icmp6_redirect_output(struct mbuf *m0, s struct sockaddr_in6 src_sa; struct route_info ri; struct nhop6_basic nh6; - IF_AFDATA_TRACKER; int e; icmp6_errcount(ND_REDIRECT, 0); Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet6/in6.c Sat Nov 22 17:57:54 2014 (r274874) @@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -2181,9 +2180,10 @@ in6_lltable_delete(struct lltable *llt, const struct sockaddr *l3addr) { const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; + struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); + IF_AFDATA_LOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); @@ -2287,9 +2287,10 @@ in6_lltable_lookup(struct lltable *llt, const struct sockaddr *l3addr) { const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; + struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); + IF_AFDATA_LOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); Modified: projects/routing/sys/netinet6/nd6.c ============================================================================== --- projects/routing/sys/netinet6/nd6.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet6/nd6.c Sat Nov 22 17:57:54 2014 (r274874) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -998,7 +997,6 @@ nd6_is_addr_neighbor(struct sockaddr_in6 { struct llentry *lle; int rc = 0; - IF_AFDATA_TRACKER; IF_AFDATA_UNLOCK_ASSERT(ifp); if (nd6_is_new_addr_neighbor(addr, ifp)) @@ -1168,7 +1166,6 @@ nd6_nud_hint(struct rtentry *rt, struct { struct llentry *ln; struct ifnet *ifp; - IF_AFDATA_TRACKER; if ((dst6 == NULL) || (rt == NULL)) return; @@ -1256,7 +1253,6 @@ nd6_ioctl(u_long cmd, caddr_t data, stru struct nd_defrouter *dr; struct nd_prefix *pr; int i = 0, error = 0; - IF_AFDATA_TRACKER; if (ifp->if_afdata[AF_INET6] == NULL) return (EPFNOSUPPORT); @@ -1582,7 +1578,6 @@ nd6_cache_lladdr(struct ifnet *ifp, stru struct sockaddr_in6 sin6; struct mbuf *chain = NULL; int static_route = 0; - IF_AFDATA_TRACKER; IF_AFDATA_UNLOCK_ASSERT(ifp); @@ -1872,7 +1867,6 @@ nd6_output(struct ifnet *ifp, struct ifn { struct llentry *ln = NULL; int error = 0; - IF_AFDATA_TRACKER; /* discard the packet if IPv6 operation is disabled on the interface */ if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED)) { @@ -1969,7 +1963,6 @@ nd6_output_lle(struct ifnet *ifp, struct int error = 0; int has_lle = 0; int ip6len; - IF_AFDATA_TRACKER; #ifdef INVARIANTS if (lle != NULL) { @@ -2311,7 +2304,6 @@ nd6_storelladdr(struct ifnet *ifp, struc const struct sockaddr *dst, u_char *desten, struct llentry **lle) { struct llentry *ln; - IF_AFDATA_TRACKER; *lle = NULL; IF_AFDATA_UNLOCK_ASSERT(ifp); Modified: projects/routing/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_nbr.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet6/nd6_nbr.c Sat Nov 22 17:57:54 2014 (r274874) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -610,7 +609,6 @@ nd6_na_input(struct mbuf *m, int off, in struct mbuf *chain = NULL; struct m_tag *mtag; struct sockaddr_in6 sin6; - IF_AFDATA_TRACKER; char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN]; if (ip6->ip6_hlim != 255) { Modified: projects/routing/sys/netinet6/nd6_rtr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_rtr.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet6/nd6_rtr.c Sat Nov 22 17:57:54 2014 (r274874) @@ -626,7 +626,6 @@ defrouter_select(void) { struct nd_defrouter *dr, *selected_dr = NULL, *installed_dr = NULL; struct llentry *ln = NULL; - IF_AFDATA_TRACKER; /* * Let's handle easy case (3) first: @@ -1300,7 +1299,6 @@ find_pfxlist_reachable_router(struct nd_ struct nd_pfxrouter *pfxrtr; struct llentry *ln; int canreach; - IF_AFDATA_TRACKER; LIST_FOREACH(pfxrtr, &pr->ndpr_advrtrs, pfr_entry) { IF_AFDATA_RLOCK(pfxrtr->router->ifp); Modified: projects/routing/sys/netinet6/scope6.c ============================================================================== --- projects/routing/sys/netinet6/scope6.c Sat Nov 22 17:56:03 2014 (r274873) +++ projects/routing/sys/netinet6/scope6.c Sat Nov 22 17:57:54 2014 (r274874) @@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include #include @@ -210,7 +208,6 @@ static int scope6_get(struct ifnet *ifp, struct scope6_id *idlist) { struct scope6_id *sid; - IF_AFDATA_TRACKER; /* We only need to lock the interface's afdata for SID() to work. */ IF_AFDATA_RLOCK(ifp); @@ -413,7 +410,6 @@ in6_setscope(struct in6_addr *in6, struc int scope; u_int32_t zoneid = 0; struct scope6_id *sid; - IF_AFDATA_TRACKER; /* * special case: the loopback address can only belong to a loopback From owner-svn-src-projects@FreeBSD.ORG Sat Nov 22 19:53:39 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 02E99F61; Sat, 22 Nov 2014 19:53:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E2A09C6D; Sat, 22 Nov 2014 19:53:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMJrcn7064097; Sat, 22 Nov 2014 19:53:38 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMJrb16064087; Sat, 22 Nov 2014 19:53:37 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411221953.sAMJrb16064087@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 22 Nov 2014 19:53:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274887 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 19:53:39 -0000 Author: melifaro Date: Sat Nov 22 19:53:36 2014 New Revision: 274887 URL: https://svnweb.freebsd.org/changeset/base/274887 Log: Use less-invasive approach for IF_AFDATA lock: convert into 2 locks: use rwlock accessible via external functions (IF_AFDATA_CFG_* -> if_afdata_cfg_*()) for all control plane tasks use rmlock (IF_AFDATA_RUN_*) for fast-path lookups. Modified: projects/routing/sys/net/if.c projects/routing/sys/net/if_var.h projects/routing/sys/net/rt_nhops.c projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet6/in6.c Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Sat Nov 22 19:48:14 2014 (r274886) +++ projects/routing/sys/net/if.c Sat Nov 22 19:53:36 2014 (r274887) @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -773,7 +774,7 @@ if_attachdomain1(struct ifnet *ifp) * Since dp->dom_ifattach calls malloc() with M_WAITOK, we * cannot lock ifp->if_afdata initialization, entirely. */ - if (IF_AFDATA_TRYLOCK(ifp) == 0) + if (IF_AFDATA_TRY_WLOCK(ifp) == 0) return; if (ifp->if_afdata_initialized >= domain_init_status) { IF_AFDATA_UNLOCK(ifp); @@ -3937,3 +3938,65 @@ drbr_enqueue_drv(if_t ifh, struct buf_ri return drbr_enqueue(ifh, br, m); } + +void +if_afdata_cfg_rlock(struct ifnet *ifp) +{ + + rw_rlock(&ifp->if_afdata_cfg_lock); +} + +void +if_afdata_cfg_runlock(struct ifnet *ifp) +{ + + rw_runlock(&ifp->if_afdata_cfg_lock); +} + +void +if_afdata_cfg_wlock(struct ifnet *ifp) +{ + + rw_wlock(&ifp->if_afdata_cfg_lock); +} + +void +if_afdata_cfg_wunlock(struct ifnet *ifp) +{ + + rw_wunlock(&ifp->if_afdata_cfg_lock); +} + +void +if_afdata_cfg_lock_assert(struct ifnet *ifp, int what) +{ + + rw_assert(&ifp->if_afdata_cfg_lock, what); +} + +void +if_afdata_wlock(struct ifnet *ifp) +{ + + if_afdata_cfg_wlock(ifp); + IF_AFDATA_RUN_WLOCK(ifp); +} + +void +if_afdata_wunlock(struct ifnet *ifp) +{ + + if_afdata_cfg_wunlock(ifp); + IF_AFDATA_RUN_WUNLOCK(ifp); +} + +int +if_afdata_try_wlock(struct ifnet *ifp) +{ + if (rw_try_wlock(&ifp->if_afdata_cfg_lock) == 0) + return (0); + + IF_AFDATA_RUN_WLOCK(ifp); + return (1); +} + Modified: projects/routing/sys/net/if_var.h ============================================================================== --- projects/routing/sys/net/if_var.h Sat Nov 22 19:48:14 2014 (r274886) +++ projects/routing/sys/net/if_var.h Sat Nov 22 19:53:36 2014 (r274887) @@ -192,7 +192,7 @@ struct ifnet { int if_amcount; /* number of all-multicast requests */ struct ifaddr *if_addr; /* pointer to link-level address */ const u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */ - struct rwlock if_afdata_lock; + struct rmlock if_afdata_run_lock; void *if_afdata[AF_MAX]; int if_afdata_initialized; @@ -253,6 +253,7 @@ struct ifnet { u_int if_hw_tsomaxsegcount; /* TSO maximum segment count */ u_int if_hw_tsomaxsegsize; /* TSO maximum segment size in bytes */ + struct rwlock if_afdata_cfg_lock; /* * Spare fields to be added before branching a stable branch, so * that structure can be enhanced without changing the kernel @@ -339,22 +340,59 @@ typedef void (*group_change_event_handle EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t); #endif /* _SYS_EVENTHANDLER_H_ */ -#define IF_AFDATA_LOCK_INIT(ifp) \ - rw_init(&(ifp)->if_afdata_lock, "if_afdata") +#define IF_AFDATA_LOCK_INIT(ifp) do { \ + rw_init(&(ifp)->if_afdata_cfg_lock, "if_afdata_cfg"); \ + rm_init(&(ifp)->if_afdata_run_lock, "if_afdata_run"); \ +} while (0) + +#define IF_AFDATA_DESTROY(ifp) do { \ + rw_destroy(&(ifp)->if_afdata_cfg_lock); \ + rm_destroy(&(ifp)->if_afdata_run_lock); \ +} while(0) + +/* if_afdata lock: control plane functions */ +#define IF_AFDATA_CFG_RLOCK(ifp) if_afdata_cfg_rlock(ifp) +#define IF_AFDATA_CFG_RUNLOCK(ifp) if_afdata_cfg_runlock(ifp) +#define IF_AFDATA_CFG_WLOCK(ifp) if_afdata_cfg_wlock(ifp) +#define IF_AFDATA_CFG_WUNLOCK(ifp) if_afdata_cfg_wunlock(ifp) + +#define IF_AFDATA_CFG_LOCK_ASSERT(i) if_afdata_cfg_lock_assert(i, RA_LOCKED) +#define IF_AFDATA_CFG_RLOCK_ASSERT(i) if_afdata_cfg_lock_assert(i, RA_RLOCKED) +#define IF_AFDATA_CFG_WLOCK_ASSERT(i) if_afdata_cfg_lock_assert(i, RA_WLOCKED) +#define IF_AFDATA_CFG_UNLOCK_ASSERT(i) if_afdata_cfg_lock_assert(i,RA_UNLOCKED) + +void if_afdata_cfg_rlock(struct ifnet *ifp); +void if_afdata_cfg_runlock(struct ifnet *ifp); +void if_afdata_cfg_wlock(struct ifnet *ifp); +void if_afdata_cfg_wunlock(struct ifnet *ifp); +void if_afdata_cfg_lock_assert(struct ifnet *ifp, int what); + +/* if_afdata lock: fast path */ +#define IF_AFDATA_RUN_WLOCK(ifp) rm_wlock(&(ifp)->if_afdata_run_lock) +#define IF_AFDATA_RUN_WUNLOCK(ifp) rm_wunlock(&(ifp)->if_afdata_run_lock) +#define IF_AFDATA_RUN_RLOCK(ifp) \ + rm_rlock(&(ifp)->if_afdata_run_lock, &if_afdata_tracker) +#define IF_AFDATA_RUN_RUNLOCK(ifp) \ + rm_runlock(&(ifp)->if_afdata_run_lock, &if_afdata_tracker) +#define IF_AFDATA_RUN_TRACKER struct rm_priotracker if_afdata_tracker + +/* Common wrappers */ +#define IF_AFDATA_RLOCK(ifp) IF_AFDATA_CFG_RLOCK(ifp) +#define IF_AFDATA_RUNLOCK(ifp) IF_AFDATA_CFG_RUNLOCK(ifp) +#define IF_AFDATA_WLOCK(ifp) if_afdata_wlock(ifp) +#define IF_AFDATA_WUNLOCK(ifp) if_afdata_wunlock(ifp) -#define IF_AFDATA_WLOCK(ifp) rw_wlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_RLOCK(ifp) rw_rlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_WUNLOCK(ifp) rw_wunlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_RUNLOCK(ifp) rw_runlock(&(ifp)->if_afdata_lock) +#define IF_AFDATA_TRY_WLOCK(ifp) if_afdata_try_wlock(ifp) #define IF_AFDATA_LOCK(ifp) IF_AFDATA_WLOCK(ifp) #define IF_AFDATA_UNLOCK(ifp) IF_AFDATA_WUNLOCK(ifp) -#define IF_AFDATA_TRYLOCK(ifp) rw_try_wlock(&(ifp)->if_afdata_lock) -#define IF_AFDATA_DESTROY(ifp) rw_destroy(&(ifp)->if_afdata_lock) - -#define IF_AFDATA_LOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_LOCKED) -#define IF_AFDATA_RLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_RLOCKED) -#define IF_AFDATA_WLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_WLOCKED) -#define IF_AFDATA_UNLOCK_ASSERT(ifp) rw_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED) +void if_afdata_wlock(struct ifnet *ifp); +void if_afdata_wunlock(struct ifnet *ifp); +int if_afdata_try_wlock(struct ifnet *ifp); + +#define IF_AFDATA_LOCK_ASSERT(ifp) IF_AFDATA_CFG_LOCK_ASSERT(ifp) +#define IF_AFDATA_RLOCK_ASSERT(ifp) IF_AFDATA_CFG_RLOCK_ASSERT(ifp) +#define IF_AFDATA_WLOCK_ASSERT(ifp) IF_AFDATA_CFG_WLOCK_ASSERT(ifp) +#define IF_AFDATA_UNLOCK_ASSERT(ifp) IF_AFDATA_CFG_UNLOCK_ASSERT(ifp) /* * 72 was chosen below because it is the size of a TCP/IP Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Sat Nov 22 19:48:14 2014 (r274886) +++ projects/routing/sys/net/rt_nhops.c Sat Nov 22 19:53:36 2014 (r274887) @@ -681,6 +681,7 @@ fib6_storelladdr(struct ifnet *ifp, stru { struct llentry *ln; struct sockaddr_in6 dst_sa; + IF_AFDATA_RUN_TRACKER; if (mm_flags & M_MCAST) { ETHER_MAP_IPV6_MULTICAST(&dst, desten); @@ -697,7 +698,7 @@ fib6_storelladdr(struct ifnet *ifp, stru /* * the entry should have been created in nd6_store_lladdr */ - IF_AFDATA_RLOCK(ifp); + IF_AFDATA_RUN_RLOCK(ifp); ln = lla_lookup(LLTABLE6(ifp), 0, (struct sockaddr *)&dst_sa); /* @@ -712,12 +713,12 @@ fib6_storelladdr(struct ifnet *ifp, stru ln->ln_state != ND6_LLINFO_DELAY)) { if (ln != NULL) LLE_RUNLOCK(ln); - IF_AFDATA_RUNLOCK(ifp); + IF_AFDATA_RUN_RUNLOCK(ifp); return (1); } bcopy(&ln->ll_addr, desten, ifp->if_addrlen); LLE_RUNLOCK(ln); - IF_AFDATA_RUNLOCK(ifp); + IF_AFDATA_RUN_RUNLOCK(ifp); return (0); } Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Sat Nov 22 19:48:14 2014 (r274886) +++ projects/routing/sys/netinet/if_ether.c Sat Nov 22 19:53:36 2014 (r274887) @@ -47,6 +47,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include #include #include @@ -354,6 +356,7 @@ arpresolve_fast(struct ifnet *ifp, struc struct llentry *la; struct sockaddr_in sin; const struct sockaddr *sa_dst; + IF_AFDATA_RUN_TRACKER; if (mflags & M_BCAST) { memcpy(dst_addr, ifp->if_broadcastaddr, ifp->if_addrlen); @@ -370,17 +373,17 @@ arpresolve_fast(struct ifnet *ifp, struc sin.sin_len = sizeof(sin); sa_dst = (const struct sockaddr *)&sin; - IF_AFDATA_RLOCK(ifp); + IF_AFDATA_RUN_RLOCK(ifp); la = lla_lookup(LLTABLE(ifp), LLE_UNLOCKED, sa_dst); if (la != NULL && (la->r_flags & RLLE_VALID) != 0) { /* Entry found, let's copy lle info */ bcopy(&la->ll_addr, dst_addr, ifp->if_addrlen); if (la->r_kick != 0) la->r_kick = 0; /* Notify that entry was used */ - IF_AFDATA_RUNLOCK(ifp); + IF_AFDATA_RUN_RUNLOCK(ifp); return (0); } - IF_AFDATA_RUNLOCK(ifp); + IF_AFDATA_RUN_RUNLOCK(ifp); return (EAGAIN); @@ -438,6 +441,7 @@ arpresolve(struct ifnet *ifp, struct rte { struct llentry *la = NULL; int is_gw; + IF_AFDATA_RUN_TRACKER; *lle = NULL; if (m != NULL) { @@ -454,18 +458,18 @@ arpresolve(struct ifnet *ifp, struct rte } } - IF_AFDATA_RLOCK(ifp); + IF_AFDATA_RUN_RLOCK(ifp); la = lla_lookup(LLTABLE(ifp), LLE_UNLOCKED, dst); if (la != NULL && (la->r_flags & RLLE_VALID) != 0) { /* Entry found, let's copy lle info */ bcopy(&la->ll_addr, desten, ifp->if_addrlen); if (la->r_kick != 0) la->r_kick = 0; /* Notify that entry was used */ - IF_AFDATA_RUNLOCK(ifp); + IF_AFDATA_RUN_RUNLOCK(ifp); *lle = la; return (0); } - IF_AFDATA_RUNLOCK(ifp); + IF_AFDATA_RUN_RUNLOCK(ifp); is_gw = (rt0 != NULL && (rt0->rt_flags & RTF_GATEWAY)) ? 1 : 0; return (arpresolve_slow(ifp, is_gw, m, dst, desten, lle)); Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sat Nov 22 19:48:14 2014 (r274886) +++ projects/routing/sys/netinet/in.c Sat Nov 22 19:53:36 2014 (r274887) @@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include #include #include @@ -1249,11 +1251,14 @@ in_lltable_unlink(struct llentry *lle) static struct llentry * in_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) { - struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; struct in_addr dst; - IF_AFDATA_LOCK_ASSERT(ifp); + /* + * Do not check for AFDATA lock since search can be protected + * by different locks. + * IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); + */ KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Sat Nov 22 19:48:14 2014 (r274886) +++ projects/routing/sys/netinet6/in6.c Sat Nov 22 19:53:36 2014 (r274887) @@ -2180,10 +2180,9 @@ in6_lltable_delete(struct lltable *llt, const struct sockaddr *l3addr) { const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; - struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_LOCK_ASSERT(ifp); + IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); @@ -2287,10 +2286,13 @@ in6_lltable_lookup(struct lltable *llt, const struct sockaddr *l3addr) { const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; - struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_LOCK_ASSERT(ifp); + /* + * Do not check for AFDATA lock since search can be protected + * by different locks. + * IF_AFDATA_LOCK_ASSERT(llt->llt_ifp); + */ KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family));