From owner-p4-projects@FreeBSD.ORG Wed Feb 26 18:03:39 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 001CEC8E; Wed, 26 Feb 2014 18:03:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id B5D0EC8C
for <perforce@freebsd.org>; Wed, 26 Feb 2014 18:03:38 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id A09B01666
for <perforce@freebsd.org>; Wed, 26 Feb 2014 18:03:38 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QI3cf9098533
for <perforce@freebsd.org>; Wed, 26 Feb 2014 18:03:38 GMT
(envelope-from brueffer@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s1QI3cX4098530
for perforce@freebsd.org; Wed, 26 Feb 2014 18:03:38 GMT
(envelope-from brueffer@freebsd.org)
Date: Wed, 26 Feb 2014 18:03:38 GMT
Message-Id: <201402261803.s1QI3cX4098530@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brueffer@freebsd.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Subject: PERFORCE change 1191346 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Feb 2014 18:03:39 -0000
http://p4web.freebsd.org/@@1191346?ac=10
Change 1191346 by brueffer@brueffer_freefall on 2014/02/26 18:03:01
In print_header32_tok(), correct printing in the XML case. This lead to
invalid XML files before.
PR: 176259
Submitted by: zi
Affected files ...
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#76 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#76 (text+ko) ====
@@ -32,7 +32,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#75 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#76 $
*/
#include <sys/types.h>
@@ -949,7 +949,7 @@
{
print_tok_type(fp, tok->id, "header", oflags);
- if (oflags & AU_OFLAG_RAW) {
+ if (oflags & AU_OFLAG_XML) {
open_attr(fp, "version");
print_1_byte(fp, tok->tt.hdr32.version, "%u");
close_attr(fp);
From owner-p4-projects@FreeBSD.ORG Wed Feb 26 18:06:42 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B2D6BE1C; Wed, 26 Feb 2014 18:06:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 5B746E1A
for <perforce@freebsd.org>; Wed, 26 Feb 2014 18:06:42 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 43DA616B0
for <perforce@freebsd.org>; Wed, 26 Feb 2014 18:06:42 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QI6gNm098755
for <perforce@freebsd.org>; Wed, 26 Feb 2014 18:06:42 GMT
(envelope-from brueffer@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s1QI6g3x098752
for perforce@freebsd.org; Wed, 26 Feb 2014 18:06:42 GMT
(envelope-from brueffer@freebsd.org)
Date: Wed, 26 Feb 2014 18:06:42 GMT
Message-Id: <201402261806.s1QI6g3x098752@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brueffer@freebsd.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Subject: PERFORCE change 1191347 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Feb 2014 18:06:43 -0000
http://p4web.freebsd.org/@@1191347?ac=10
Change 1191347 by brueffer@brueffer_freefall on 2014/02/26 18:05:48
Fix typos and grammar in comments.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#77 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#77 (text+ko) ====
@@ -32,7 +32,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#76 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#77 $
*/
#include <sys/types.h>
@@ -268,7 +268,7 @@
}
/*
- * Prints the beggining of attribute.
+ * Prints the beginning of an attribute.
*/
static void
open_attr(FILE *fp, const char *str)
@@ -278,7 +278,7 @@
}
/*
- * Prints the end of attribute.
+ * Prints the end of an attribute.
*/
static void
close_attr(FILE *fp)
@@ -288,7 +288,7 @@
}
/*
- * Prints the end of tag.
+ * Prints the end of a tag.
*/
static void
close_tag(FILE *fp, u_char type)
From owner-p4-projects@FreeBSD.ORG Thu Feb 27 11:41:06 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6E68BC77; Thu, 27 Feb 2014 11:41:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 1797FC75
for <perforce@freebsd.org>; Thu, 27 Feb 2014 11:41:06 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 01B451CB2
for <perforce@freebsd.org>; Thu, 27 Feb 2014 11:41:06 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s1RBf5kK010498
for <perforce@freebsd.org>; Thu, 27 Feb 2014 11:41:05 GMT
(envelope-from brueffer@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s1RBf5A0010495
for perforce@freebsd.org; Thu, 27 Feb 2014 11:41:05 GMT
(envelope-from brueffer@freebsd.org)
Date: Thu, 27 Feb 2014 11:41:05 GMT
Message-Id: <201402271141.s1RBf5A0010495@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brueffer@freebsd.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Subject: PERFORCE change 1191365 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Feb 2014 11:41:06 -0000
http://p4web.freebsd.org/@@1191365?ac=10
Change 1191365 by brueffer@brueffer_freefall on 2014/02/27 11:40:34
Typo fix.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/README#42 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/README#42 (text+ko) ====
@@ -10,7 +10,7 @@
OpenBSM includes several command line tools, including auditreduce(8) and
praudit(8) for reducing and printing audit trails, as well as the libbsm(3)
library to manage configuration files, generate audit records, and parse and
-print audit trils.
+print audit trails.
Coupled with a kernel audit implementation, OpenBSM can be used to maintain
system audit streams, and is a foundation for a full audit-enabled system.
@@ -65,4 +65,4 @@
http://www.TrustedBSD.org/
-$P4: //depot/projects/trustedbsd/openbsm/README#41 $
+$P4: //depot/projects/trustedbsd/openbsm/README#42 $
From owner-p4-projects@FreeBSD.ORG Mon Mar 3 10:10:44 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8898B9D0; Mon, 3 Mar 2014 10:10:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 4A7D39CE
for <perforce@freebsd.org>; Mon, 3 Mar 2014 10:10:44 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 367D5213
for <perforce@freebsd.org>; Mon, 3 Mar 2014 10:10:44 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s23AAich039312
for <perforce@freebsd.org>; Mon, 3 Mar 2014 10:10:44 GMT
(envelope-from novazeta@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s23AAiRn039309
for perforce@freebsd.org; Mon, 3 Mar 2014 10:10:44 GMT
(envelope-from novazeta@FreeBSD.org)
Date: Mon, 3 Mar 2014 10:10:44 GMT
Message-Id: <201403031010.s23AAiRn039309@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
novazeta@FreeBSD.org using -f
From: Khilan Gudka <novazeta@FreeBSD.org>
Subject: PERFORCE change 1191460 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 10:10:44 -0000
http://p4web.freebsd.org/@@1191460?ac=10
Change 1191460 by novazeta@novazeta_zenith on 2014/03/03 10:10:29
Comment out new definition of __weak_reference for clang until further testing
Affected files ...
.. //depot/projects/ctsrd/tesla/src/sys/sys/cdefs.h#5 edit
Differences ...
==== //depot/projects/ctsrd/tesla/src/sys/sys/cdefs.h#5 (text+ko) ====
@@ -508,14 +508,14 @@
extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)))
#endif
#ifdef __STDC__
-#ifdef __clang__
+//#ifdef __clang__
+//#define __weak_reference(sym,alias) \
+// extern __typeof (sym) alias __attribute__ ((weak, __alias__ (#sym)))
+//#else
#define __weak_reference(sym,alias) \
- extern __typeof (sym) alias __attribute__ ((weak, __alias__ (#sym)))
-#else
-#define __weak_reference(sym,alias) \
__asm__(".weak " #alias); \
__asm__(".equ " #alias ", " #sym)
-#endif /* __clang__ */
+//#endif /* __clang__ */
#define __warn_references(sym,msg) \
__asm__(".section .gnu.warning." #sym); \
__asm__(".asciz \"" msg "\""); \
From owner-p4-projects@FreeBSD.ORG Fri Mar 7 20:26:24 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 709B0369; Fri, 7 Mar 2014 20:26:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 33DB5367
for <perforce@freebsd.org>; Fri, 7 Mar 2014 20:26:24 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 1F79CAF7
for <perforce@freebsd.org>; Fri, 7 Mar 2014 20:26:24 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s27KQN6Z006395
for <perforce@freebsd.org>; Fri, 7 Mar 2014 20:26:23 GMT
(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s27KQNU6006392
for perforce@freebsd.org; Fri, 7 Mar 2014 20:26:23 GMT
(envelope-from brooks@freebsd.org)
Date: Fri, 7 Mar 2014 20:26:23 GMT
Message-Id: <201403072026.s27KQNU6006392@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 1191596 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Mar 2014 20:26:24 -0000
http://p4web.freebsd.org/@@1191596?ac=10
Change 1191596 by brooks@brooks_zenith on 2014/03/07 20:26:19
cast away a singed vs unsigned comparison warning.
Affected files ...
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_update.c#16 edit
Differences ...
==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_update.c#16 (text+ko) ====
@@ -194,7 +194,7 @@
// it has already been taken.
struct tesla_instance *inst = NULL;
- for (uint32_t i = 0; i < autom->ta_alphabet_size; i++) {
+ for (uint32_t i = 0; i < (uint32_t)autom->ta_alphabet_size; i++) {
const tesla_transitions *trans =
autom->ta_transitions + i;
From owner-p4-projects@FreeBSD.ORG Fri Mar 7 22:30:47 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id DF445EFF; Fri, 7 Mar 2014 22:30:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id A06F5EFD
for <perforce@freebsd.org>; Fri, 7 Mar 2014 22:30:46 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 721C47EF
for <perforce@freebsd.org>; Fri, 7 Mar 2014 22:30:46 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s27MUkmG033817
for <perforce@freebsd.org>; Fri, 7 Mar 2014 22:30:46 GMT
(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s27MUkCs033814
for perforce@freebsd.org; Fri, 7 Mar 2014 22:30:46 GMT
(envelope-from brooks@freebsd.org)
Date: Fri, 7 Mar 2014 22:30:46 GMT
Message-Id: <201403072230.s27MUkCs033814@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 1191605 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Mar 2014 22:30:47 -0000
http://p4web.freebsd.org/@@1191605?ac=10
Change 1191605 by brooks@brooks_zenith on 2014/03/07 22:30:22
Rename TESLA_MAC to TESLA_MAC_ALL before splitting the assertions.
Affected files ...
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA#5 edit
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_ALL#3 edit
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_ALL_REGRESSION#3 edit
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC#2 edit
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC_PROC#2 edit
.. //depot/projects/ctsrd/tesla/src/sys/conf/options#6 edit
.. //depot/projects/ctsrd/tesla/src/sys/kern/kern_prot.c#8 edit
.. //depot/projects/ctsrd/tesla/src/sys/kern/uipc_socket.c#6 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_cred.c#4 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_pipe.c#4 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_process.c#5 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_socket.c#4 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_vfs.c#4 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#17 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_acl.c#4 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_lookup.c#6 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_vnops.c#7 edit
Differences ...
==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA#5 (text+ko) ====
@@ -3,6 +3,6 @@
options TESLA
options TESLA_CAPSICUM
-options TESLA_MAC
+options TESLA_MAC_ALL
options TESLA_PRIV
options TESLA_PROC
==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_ALL#3 (text+ko) ====
@@ -3,7 +3,7 @@
options TESLA
options TESLA_CAPSICUM
-options TESLA_MAC
+options TESLA_MAC_ALL
options TESLA_PRIV
options TESLA_PROC
options TESLA_TEST
==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_ALL_REGRESSION#3 (text+ko) ====
@@ -4,6 +4,6 @@
options REGRESSION
options TESLA
options TESLA_CAPSICUM
-options TESLA_MAC
+options TESLA_MAC_ALL
options TESLA_PRIV
options TESLA_PROC
==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC#2 (text+ko) ====
@@ -2,4 +2,4 @@
ident TESLA_ND_MAC
options TESLA
-options TESLA_MAC
+options TESLA_MAC_ALL
==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC_PROC#2 (text+ko) ====
@@ -2,5 +2,5 @@
ident TESLA_ND_MAC_PROC
options TESLA
-options TESLA_MAC
+options TESLA_MAC_ALL
options TESLA_PROC
==== //depot/projects/ctsrd/tesla/src/sys/conf/options#6 (text+ko) ====
@@ -673,7 +673,7 @@
KTR_VERBOSE opt_ktr.h
TESLA opt_global.h
TESLA_CAPSICUM opt_global.h
-TESLA_MAC opt_global.h
+TESLA_MAC_ALL opt_global.h
TESLA_PRIV opt_global.h
TESLA_PROC opt_global.h
TESLA_TEST opt_global.h
==== //depot/projects/ctsrd/tesla/src/sys/kern/kern_prot.c#8 (text+ko) ====
@@ -2149,7 +2149,7 @@
euid = euip->ui_uid;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
/* XXXRW: In the exec() case, really want imgp->attr.uid. */
TESLA_SYSCALL(
previously(mac_cred_check_setuid(ANY(ptr), euid) == 0) ||
@@ -2183,7 +2183,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
/* XXXRW: In the exec() case, really want imgp->attr.gid. */
TESLA_SYSCALL(
previously(mac_cred_check_setegid(ANY(ptr), egid) == 0) ||
@@ -2217,7 +2217,7 @@
uid_t ruid = ruip->ui_uid;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
/* XXXRW: In the exec() case, really want imgp->attr.uid. */
TESLA_SYSCALL(
previously(mac_cred_check_setuid(ANY(ptr), ruid) == 0) ||
@@ -2253,7 +2253,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
/* XXXRW: In the exec() case, really want imgp->attr.gid. */
TESLA_SYSCALL(
previously(mac_cred_check_setgid(ANY(ptr), rgid) == 0) ||
@@ -2284,7 +2284,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
/* XXXRW: In the exec() case, really want imgp->attr.uid. */
TESLA_SYSCALL(
previously(mac_cred_check_setuid(ANY(ptr), ANY(int)) == 0) ||
@@ -2315,7 +2315,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
/* XXXRW: In the exec() case, really want imgp->attr.gid. */
TESLA_SYSCALL(
previously(mac_cred_check_setgid(ANY(ptr), ANY(int)) == 0) ||
==== //depot/projects/ctsrd/tesla/src/sys/kern/uipc_socket.c#6 (text+ko) ====
@@ -425,7 +425,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_create(cred, dom, type,
proto) == 0);
#endif
@@ -627,7 +627,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_bind(ANY(ptr), so, nam) ==
0);
#endif
@@ -645,7 +645,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_bind(ANY(ptr), so, nam) ==
0);
#endif
@@ -675,7 +675,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_listen(ANY(ptr), so) == 0);
#endif
#endif
@@ -929,7 +929,7 @@
#ifdef MAC
/* Access-control check is on head rather than so. */
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_accept(ANY(ptr), ANY(ptr)) ==
0);
#endif
@@ -951,7 +951,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_connect(td->td_ucred, so,
nam) == 0);
#endif
@@ -1495,7 +1495,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_send(ANY(ptr), so) == 0);
#endif
#endif
@@ -2457,7 +2457,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_receive(ANY(ptr), so) == 0);
#endif
#endif
@@ -3140,7 +3140,7 @@
* XXXRW: Should be active_cred but actually fp->f_cred is getting
* passed down the stack, so the wrong cred here!
*/
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_poll(ANY(ptr), so) == 0);
#endif
#endif
@@ -3191,7 +3191,7 @@
struct sockbuf *sb;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_poll(ANY(ptr), so) == 0);
#endif
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_cred.c#4 (text+ko) ====
@@ -196,7 +196,7 @@
mac_cred_relabel(struct ucred *cred, struct label *newlabel)
{
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL(previously(mac_cred_check_relabel(cred, newlabel) ==
0));
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_pipe.c#4 (text+ko) ====
@@ -143,7 +143,7 @@
struct label *newlabel)
{
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_pipe_check_relabel(cred, pp, newlabel)
== 0);
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_process.c#5 (text+ko) ====
@@ -172,7 +172,7 @@
}
imgp->execlabel = label;
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_EVENTUALLY(called(mac_execve_exit));
#endif
@@ -183,7 +183,7 @@
mac_execve_exit(struct image_params *imgp)
{
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(called(mac_execve_enter(imgp, ANY(ptr))));
#endif
@@ -204,7 +204,7 @@
} else
*interpvplabel = NULL;
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_EVENTUALLY(called(mac_execve_interpreter_exit));
#endif
}
@@ -215,7 +215,7 @@
if (interpvplabel != NULL) {
/* Awkwardly, _exit() may be called even if _enter() wasn't. */
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(called(
mac_execve_interpreter_enter(ANY(ptr), ANY(ptr))));
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_socket.c#4 (text+ko) ====
@@ -258,7 +258,7 @@
struct label *newlabel)
{
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_relabel(cred, so, newlabel)
== 0);
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_vfs.c#4 (text+ko) ====
@@ -949,7 +949,7 @@
struct label *newlabel)
{
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL(previously(mac_vnode_check_relabel(cred, vp, newlabel)
== 0));
#endif
==== //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#17 (text+ko) ====
@@ -440,7 +440,7 @@
vp = ap->a_vp;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL(
incallstack(ufs_readdir) ||
previously(called(vn_rdwr(ANY(int), vp, ANY(ptr), ANY(int),
@@ -674,7 +674,7 @@
vp = ap->a_vp;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL(
previously(called(vn_rdwr(ANY(int), vp, ANY(ptr), ANY(int),
ANY(int), ANY(int), flags(IO_NOMACCHECK), ANY(ptr), ANY(ptr),
@@ -1495,7 +1495,7 @@
u_char *eae, *p;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL(incallstack(ufs_setacl) ||
previously(mac_vnode_check_deleteextattr(ANY(ptr), ap->a_vp,
ap->a_attrnamespace, ap->a_name) == 0));
@@ -1590,7 +1590,7 @@
int error, ealen;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL(incallstack(ufs_getacl) ||
previously(mac_vnode_check_getextattr(ANY(ptr), ap->a_vp,
ap->a_attrnamespace, ap->a_name) == 0));
@@ -1654,7 +1654,7 @@
int error, ealen;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_listextattr(ANY(ptr),
ap->a_vp, ap->a_attrnamespace) == 0);
#endif
@@ -1725,7 +1725,7 @@
u_char *eae, *p;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL(incallstack(ufs_setacl) ||
previously(mac_vnode_check_setextattr(ANY(ptr), ap->a_vp,
ap->a_attrnamespace, ap->a_name) == 0));
==== //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_acl.c#4 (text+ko) ====
@@ -364,7 +364,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_getacl(ANY(ptr), ap->a_vp,
ap->a_type) == 0);
#endif
@@ -622,7 +622,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
if (ap->a_aclp == NULL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_deleteacl(ANY(ptr),
ap->a_vp, ap->a_type) == 0);
==== //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_lookup.c#6 (text+ko) ====
@@ -53,7 +53,7 @@
#include <sys/sysctl.h>
#include <sys/tesla-kernel.h>
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
#include <security/mac/mac_framework.h>
#endif
@@ -217,7 +217,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_lookup(ANY(ptr), ap->a_dvp,
ap->a_cnp) == 0);
#endif
==== //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_vnops.c#7 (text+ko) ====
@@ -274,7 +274,7 @@
struct inode *ip;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL(
previously(mac_kld_check_load(ANY(ptr), vp) == 0) ||
previously(mac_vnode_check_exec(ANY(ptr), vp, ANY(ptr)) == 0) ||
@@ -542,7 +542,7 @@
}
if (vap->va_flags != VNOVAL) {
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_setflags(ANY(ptr),
vp, ANY(int)) == 0);
#endif
@@ -611,7 +611,7 @@
}
if (vap->va_size != VNOVAL) {
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_write(ANY(ptr),
ANY(ptr), vp) == 0);
#endif
@@ -661,7 +661,7 @@
* XXXRW: TESLA can't currently instrument functions with
* struct arguments.
*/
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_setutimes(ANY(ptr),
vp, ANY(timespec), ANY(timespec)) == 0);
#endif
@@ -802,7 +802,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_setmode(ANY(ptr), vp, mode)
== 0);
#endif
@@ -875,7 +875,7 @@
#endif
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_setowner(ANY(ptr), vp, uid,
gid) == 0);
#endif
@@ -994,7 +994,7 @@
struct thread *td;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_unlink(ANY(ptr), dvp, vp,
ap->a_cnp) == 0);
#endif
@@ -1050,7 +1050,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_link(ANY(ptr), tdvp, vp,
cnp) == 0);
#endif
@@ -1220,7 +1220,7 @@
ino_t ino;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_rename_from(ANY(ptr), fdvp,
fvp, fcnp) == 0);
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_rename_to(ANY(ptr), tdvp,
@@ -1884,7 +1884,7 @@
long blkoff;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_create(ANY(ptr), dvp, cnp,
vap) == 0);
#endif
@@ -2125,7 +2125,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_unlink(ANY(ptr), dvp, vp,
cnp) == 0);
#endif
@@ -2276,7 +2276,7 @@
off_t off;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_readdir(ANY(ptr), ap->a_vp)
== 0);
#endif
@@ -2392,7 +2392,7 @@
doff_t isize;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_readlink(ANY(ptr), vp) == 0);
#endif
#endif
@@ -2695,7 +2695,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC
+#ifdef TESLA_MAC_ALL
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_create(ANY(ptr), dvp, cnp,
ANY(ptr)) == 0);
#endif
From owner-p4-projects@FreeBSD.ORG Sun Mar 9 19:25:27 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CF85B910; Sun, 9 Mar 2014 19:25:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 77A4D90E
for <perforce@freebsd.org>; Sun, 9 Mar 2014 19:25:27 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 47E0EBF9
for <perforce@freebsd.org>; Sun, 9 Mar 2014 19:25:27 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s29JPR3c052427
for <perforce@freebsd.org>; Sun, 9 Mar 2014 19:25:27 GMT
(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s29JPRtU052424
for perforce@freebsd.org; Sun, 9 Mar 2014 19:25:27 GMT
(envelope-from brooks@freebsd.org)
Date: Sun, 9 Mar 2014 19:25:27 GMT
Message-Id: <201403091925.s29JPRtU052424@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 1191638 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Mar 2014 19:25:28 -0000
http://p4web.freebsd.org/@@1191638?ac=10
Change 1191638 by brooks@brooks_zenith on 2014/03/09 19:24:35
Split MAC assertions in to FS, PROC, SOCKET, and MISC to aid
benchmarking. The split isn't terriably principled and may need
adjustment as we work toward something upstreamable.
Affected files ...
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC_FS_SOCKET#1 add
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC_PROC_SOCKET#1 add
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC_SOCKET#1 add
.. //depot/projects/ctsrd/tesla/src/sys/conf/options#7 edit
.. //depot/projects/ctsrd/tesla/src/sys/kern/kern_prot.c#9 edit
.. //depot/projects/ctsrd/tesla/src/sys/kern/uipc_socket.c#7 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_cred.c#5 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_pipe.c#5 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_process.c#6 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_socket.c#5 edit
.. //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_vfs.c#5 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#18 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_acl.c#5 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_lookup.c#7 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_vnops.c#8 edit
Differences ...
==== //depot/projects/ctsrd/tesla/src/sys/conf/options#7 (text+ko) ====
@@ -674,6 +674,10 @@
TESLA opt_global.h
TESLA_CAPSICUM opt_global.h
TESLA_MAC_ALL opt_global.h
+TESLA_MAC_FS opt_global.h
+TESLA_MAC_MISC opt_global.h
+TESLA_MAC_PROC opt_global.h
+TESLA_MAC_SOCKET opt_global.h
TESLA_PRIV opt_global.h
TESLA_PROC opt_global.h
TESLA_TEST opt_global.h
==== //depot/projects/ctsrd/tesla/src/sys/kern/kern_prot.c#9 (text+ko) ====
@@ -2149,7 +2149,7 @@
euid = euip->ui_uid;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
/* XXXRW: In the exec() case, really want imgp->attr.uid. */
TESLA_SYSCALL(
previously(mac_cred_check_setuid(ANY(ptr), euid) == 0) ||
@@ -2183,7 +2183,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
/* XXXRW: In the exec() case, really want imgp->attr.gid. */
TESLA_SYSCALL(
previously(mac_cred_check_setegid(ANY(ptr), egid) == 0) ||
@@ -2217,7 +2217,7 @@
uid_t ruid = ruip->ui_uid;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
/* XXXRW: In the exec() case, really want imgp->attr.uid. */
TESLA_SYSCALL(
previously(mac_cred_check_setuid(ANY(ptr), ruid) == 0) ||
@@ -2253,7 +2253,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
/* XXXRW: In the exec() case, really want imgp->attr.gid. */
TESLA_SYSCALL(
previously(mac_cred_check_setgid(ANY(ptr), rgid) == 0) ||
@@ -2284,7 +2284,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
/* XXXRW: In the exec() case, really want imgp->attr.uid. */
TESLA_SYSCALL(
previously(mac_cred_check_setuid(ANY(ptr), ANY(int)) == 0) ||
@@ -2315,7 +2315,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
/* XXXRW: In the exec() case, really want imgp->attr.gid. */
TESLA_SYSCALL(
previously(mac_cred_check_setgid(ANY(ptr), ANY(int)) == 0) ||
==== //depot/projects/ctsrd/tesla/src/sys/kern/uipc_socket.c#7 (text+ko) ====
@@ -425,7 +425,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_create(cred, dom, type,
proto) == 0);
#endif
@@ -627,7 +627,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_bind(ANY(ptr), so, nam) ==
0);
#endif
@@ -645,7 +645,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_bind(ANY(ptr), so, nam) ==
0);
#endif
@@ -675,7 +675,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_listen(ANY(ptr), so) == 0);
#endif
#endif
@@ -929,7 +929,7 @@
#ifdef MAC
/* Access-control check is on head rather than so. */
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_accept(ANY(ptr), ANY(ptr)) ==
0);
#endif
@@ -951,7 +951,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_connect(td->td_ucred, so,
nam) == 0);
#endif
@@ -1495,7 +1495,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_send(ANY(ptr), so) == 0);
#endif
#endif
@@ -2457,7 +2457,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_receive(ANY(ptr), so) == 0);
#endif
#endif
@@ -3140,7 +3140,7 @@
* XXXRW: Should be active_cred but actually fp->f_cred is getting
* passed down the stack, so the wrong cred here!
*/
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_poll(ANY(ptr), so) == 0);
#endif
#endif
@@ -3191,7 +3191,7 @@
struct sockbuf *sb;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_poll(ANY(ptr), so) == 0);
#endif
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_cred.c#5 (text+ko) ====
@@ -196,7 +196,7 @@
mac_cred_relabel(struct ucred *cred, struct label *newlabel)
{
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_MISC) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL(previously(mac_cred_check_relabel(cred, newlabel) ==
0));
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_pipe.c#5 (text+ko) ====
@@ -143,7 +143,7 @@
struct label *newlabel)
{
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_MISC) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_pipe_check_relabel(cred, pp, newlabel)
== 0);
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_process.c#6 (text+ko) ====
@@ -172,7 +172,7 @@
}
imgp->execlabel = label;
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_EVENTUALLY(called(mac_execve_exit));
#endif
@@ -183,7 +183,7 @@
mac_execve_exit(struct image_params *imgp)
{
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(called(mac_execve_enter(imgp, ANY(ptr))));
#endif
@@ -204,7 +204,7 @@
} else
*interpvplabel = NULL;
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_EVENTUALLY(called(mac_execve_interpreter_exit));
#endif
}
@@ -215,7 +215,7 @@
if (interpvplabel != NULL) {
/* Awkwardly, _exit() may be called even if _enter() wasn't. */
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_PROC) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(called(
mac_execve_interpreter_enter(ANY(ptr), ANY(ptr))));
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_socket.c#5 (text+ko) ====
@@ -258,7 +258,7 @@
struct label *newlabel)
{
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_SOCKET) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_socket_check_relabel(cred, so, newlabel)
== 0);
#endif
==== //depot/projects/ctsrd/tesla/src/sys/security/mac/mac_vfs.c#5 (text+ko) ====
@@ -949,7 +949,7 @@
struct label *newlabel)
{
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL(previously(mac_vnode_check_relabel(cred, vp, newlabel)
== 0));
#endif
==== //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#18 (text+ko) ====
@@ -440,7 +440,7 @@
vp = ap->a_vp;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL(
incallstack(ufs_readdir) ||
previously(called(vn_rdwr(ANY(int), vp, ANY(ptr), ANY(int),
@@ -674,7 +674,7 @@
vp = ap->a_vp;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL(
previously(called(vn_rdwr(ANY(int), vp, ANY(ptr), ANY(int),
ANY(int), ANY(int), flags(IO_NOMACCHECK), ANY(ptr), ANY(ptr),
@@ -1495,7 +1495,7 @@
u_char *eae, *p;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL(incallstack(ufs_setacl) ||
previously(mac_vnode_check_deleteextattr(ANY(ptr), ap->a_vp,
ap->a_attrnamespace, ap->a_name) == 0));
@@ -1590,7 +1590,7 @@
int error, ealen;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL(incallstack(ufs_getacl) ||
previously(mac_vnode_check_getextattr(ANY(ptr), ap->a_vp,
ap->a_attrnamespace, ap->a_name) == 0));
@@ -1654,7 +1654,7 @@
int error, ealen;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_listextattr(ANY(ptr),
ap->a_vp, ap->a_attrnamespace) == 0);
#endif
@@ -1725,7 +1725,7 @@
u_char *eae, *p;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL(incallstack(ufs_setacl) ||
previously(mac_vnode_check_setextattr(ANY(ptr), ap->a_vp,
ap->a_attrnamespace, ap->a_name) == 0));
==== //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_acl.c#5 (text+ko) ====
@@ -364,7 +364,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_getacl(ANY(ptr), ap->a_vp,
ap->a_type) == 0);
#endif
@@ -622,7 +622,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
if (ap->a_aclp == NULL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_deleteacl(ANY(ptr),
ap->a_vp, ap->a_type) == 0);
==== //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_lookup.c#7 (text+ko) ====
@@ -53,7 +53,7 @@
#include <sys/sysctl.h>
#include <sys/tesla-kernel.h>
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
#include <security/mac/mac_framework.h>
#endif
@@ -217,7 +217,7 @@
{
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_lookup(ANY(ptr), ap->a_dvp,
ap->a_cnp) == 0);
#endif
==== //depot/projects/ctsrd/tesla/src/sys/ufs/ufs/ufs_vnops.c#8 (text+ko) ====
@@ -274,7 +274,7 @@
struct inode *ip;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL(
previously(mac_kld_check_load(ANY(ptr), vp) == 0) ||
previously(mac_vnode_check_exec(ANY(ptr), vp, ANY(ptr)) == 0) ||
@@ -542,7 +542,7 @@
}
if (vap->va_flags != VNOVAL) {
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_setflags(ANY(ptr),
vp, ANY(int)) == 0);
#endif
@@ -611,7 +611,7 @@
}
if (vap->va_size != VNOVAL) {
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_write(ANY(ptr),
ANY(ptr), vp) == 0);
#endif
@@ -661,7 +661,7 @@
* XXXRW: TESLA can't currently instrument functions with
* struct arguments.
*/
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_setutimes(ANY(ptr),
vp, ANY(timespec), ANY(timespec)) == 0);
#endif
@@ -802,7 +802,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_setmode(ANY(ptr), vp, mode)
== 0);
#endif
@@ -875,7 +875,7 @@
#endif
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_setowner(ANY(ptr), vp, uid,
gid) == 0);
#endif
@@ -994,7 +994,7 @@
struct thread *td;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_unlink(ANY(ptr), dvp, vp,
ap->a_cnp) == 0);
#endif
@@ -1050,7 +1050,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_link(ANY(ptr), tdvp, vp,
cnp) == 0);
#endif
@@ -1220,7 +1220,7 @@
ino_t ino;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_rename_from(ANY(ptr), fdvp,
fvp, fcnp) == 0);
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_rename_to(ANY(ptr), tdvp,
@@ -1884,7 +1884,7 @@
long blkoff;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_create(ANY(ptr), dvp, cnp,
vap) == 0);
#endif
@@ -2125,7 +2125,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_unlink(ANY(ptr), dvp, vp,
cnp) == 0);
#endif
@@ -2276,7 +2276,7 @@
off_t off;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_readdir(ANY(ptr), ap->a_vp)
== 0);
#endif
@@ -2392,7 +2392,7 @@
doff_t isize;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_readlink(ANY(ptr), vp) == 0);
#endif
#endif
@@ -2695,7 +2695,7 @@
int error;
#ifdef MAC
-#ifdef TESLA_MAC_ALL
+#if defined(TESLA_MAC_FS) || defined(TESLA_MAC_ALL)
TESLA_SYSCALL_PREVIOUSLY(mac_vnode_check_create(ANY(ptr), dvp, cnp,
ANY(ptr)) == 0);
#endif
From owner-p4-projects@FreeBSD.ORG Mon Mar 10 16:42:07 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5D243607; Mon, 10 Mar 2014 16:42:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 2014A605
for <perforce@freebsd.org>; Mon, 10 Mar 2014 16:42:07 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id E6844F5F
for <perforce@freebsd.org>; Mon, 10 Mar 2014 16:42:06 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s2AGg6cG026742
for <perforce@freebsd.org>; Mon, 10 Mar 2014 16:42:06 GMT
(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s2AGg66U026739
for perforce@freebsd.org; Mon, 10 Mar 2014 16:42:06 GMT
(envelope-from brooks@freebsd.org)
Date: Mon, 10 Mar 2014 16:42:06 GMT
Message-Id: <201403101642.s2AGg66U026739@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 1191663 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Mar 2014 16:42:07 -0000
http://p4web.freebsd.org/@@1191663?ac=10
Change 1191663 by brooks@brooks_zenith on 2014/03/10 16:41:39
Add a TESLA_ND_MAC_FS kernel with just FS MAC probes.
Affected files ...
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC_FS#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Mon Mar 10 17:33:05 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 50FA8D2F; Mon, 10 Mar 2014 17:33:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 1257AD2D
for <perforce@freebsd.org>; Mon, 10 Mar 2014 17:33:05 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id D89E97E1
for <perforce@freebsd.org>; Mon, 10 Mar 2014 17:33:04 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s2AHX434037597
for <perforce@freebsd.org>; Mon, 10 Mar 2014 17:33:04 GMT
(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s2AHX4Ee037594
for perforce@freebsd.org; Mon, 10 Mar 2014 17:33:04 GMT
(envelope-from brooks@freebsd.org)
Date: Mon, 10 Mar 2014 17:33:04 GMT
Message-Id: <201403101733.s2AHX4Ee037594@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 1191664 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Mar 2014 17:33:05 -0000
http://p4web.freebsd.org/@@1191664?ac=10
Change 1191664 by brooks@brooks_zenith on 2014/03/10 17:33:03
Correct the kernel ident
Affected files ...
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC_FS#2 edit
Differences ...
==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ND_MAC_FS#2 (text+ko) ====
@@ -1,5 +1,5 @@
include GENERIC_NODEBUG
-ident TESLA_ND_MAC_FS_SOCKET
+ident TESLA_ND_MAC_FS
options TESLA
options TESLA_MAC_FS
From owner-p4-projects@FreeBSD.ORG Tue Mar 11 15:14:16 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 94BDEF23; Tue, 11 Mar 2014 15:14:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 55D0FF21
for <perforce@freebsd.org>; Tue, 11 Mar 2014 15:14:16 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 268FC1A4
for <perforce@freebsd.org>; Tue, 11 Mar 2014 15:14:16 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BFEGXg060359
for <perforce@freebsd.org>; Tue, 11 Mar 2014 15:14:16 GMT
(envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s2BFEFne060356
for perforce@freebsd.org; Tue, 11 Mar 2014 15:14:15 GMT
(envelope-from jonathan@freebsd.org)
Date: Tue, 11 Mar 2014 15:14:15 GMT
Message-Id: <201403111514.s2BFEFne060356@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 1191710 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Mar 2014 15:14:16 -0000
http://p4web.freebsd.org/@@1191710?ac=10
Change 1191710 by jonathan@jonathan-on-joe on 2014/03/11 15:13:52
Add TESLA_ALL kernel configuration: it's like TESLA_ND_ALL, but not ND (NODEBUG).
Affected files ...
.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA_ALL#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Sun Mar 16 12:44:28 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1D64451F; Sun, 16 Mar 2014 12:44:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D32ED51D
for <perforce@freebsd.org>; Sun, 16 Mar 2014 12:44:27 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id BD4102E6
for <perforce@freebsd.org>; Sun, 16 Mar 2014 12:44:27 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s2GCiRXV032881
for <perforce@freebsd.org>; Sun, 16 Mar 2014 12:44:27 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s2GCiRpr032877
for perforce@freebsd.org; Sun, 16 Mar 2014 12:44:27 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 16 Mar 2014 12:44:27 GMT
Message-Id: <201403161244.s2GCiRpr032877@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 1191887 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Mar 2014 12:44:28 -0000
http://p4web.freebsd.org/@@1191887?ac=10
Change 1191887 by rwatson@rwatson_cinnamon on 2014/03/16 12:43:46
Synchronise whitespace in audit_kevents.h to a cleanup that took
place in the FreeBSD version of the file.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#11 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#11 (text+ko) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#11 $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -35,8 +35,8 @@
/*
* The reserved event numbers for kernel events are 1...2047 and 43001..44900.
*/
-#define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \
- ((e) > 43000 && (e) < 45000))
+#define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \
+ ((e) > 43000 && (e) < 45000))
/*
* Values marked as AUE_NULL are not required to be audited as per CAPP.
From owner-p4-projects@FreeBSD.ORG Sun Mar 16 12:47:31 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id ACFAB638; Sun, 16 Mar 2014 12:47:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 57CDD634
for <perforce@freebsd.org>; Sun, 16 Mar 2014 12:47:31 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 41A0E306
for <perforce@freebsd.org>; Sun, 16 Mar 2014 12:47:31 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s2GClVIV033106
for <perforce@freebsd.org>; Sun, 16 Mar 2014 12:47:31 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s2GClV8R033103
for perforce@freebsd.org; Sun, 16 Mar 2014 12:47:31 GMT
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 16 Mar 2014 12:47:31 GMT
Message-Id: <201403161247.s2GClV8R033103@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 1191888 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Mar 2014 12:47:31 -0000
http://p4web.freebsd.org/@@1191888?ac=10
Change 1191888 by rwatson@rwatson_cinnamon on 2014/03/16 12:47:15
Synchronise Capsicum-related kernel audit events in OpenBSM to
FreeBSD.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#12 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#12 (text+ko) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#11 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#12 $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -587,7 +587,8 @@
#define AUE_OPENAT 43184 /* FreeBSD. */
#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */
#define AUE_CAP_NEW 43186 /* TrustedBSD. */
-#define AUE_CAP_GETRIGHTS 43187 /* TrustedBSD. */
+#define AUE_CAP_RIGHTS_GET 43187 /* TrustedBSD. */
+#define AUE_CAP_GETRIGHTS AUE_CAP_RIGHTS_GET
#define AUE_CAP_ENTER 43188 /* TrustedBSD. */
#define AUE_CAP_GETMODE 43189 /* TrustedBSD. */
#define AUE_POSIX_SPAWN 43190 /* Darwin. */
@@ -602,6 +603,14 @@
#define AUE_PDGETPID 43199 /* FreeBSD. */
#define AUE_PDWAIT 43200 /* FreeBSD. */
#define AUE_WAIT6 43201 /* FreeBSD. */
+#define AUE_CAP_RIGHTS_LIMIT 43202 /* TrustedBSD. */
+#define AUE_CAP_IOCTLS_LIMIT 43203 /* TrustedBSD. */
+#define AUE_CAP_IOCTLS_GET 43204 /* TrustedBSD. */
+#define AUE_CAP_FCNTLS_LIMIT 43205 /* TrustedBSD. */
+#define AUE_CAP_FCNTLS_GET 43206 /* TrustedBSD. */
+#define AUE_BINDAT 43207 /* TrustedBSD. */
+#define AUE_CONNECTAT 43208 /* TrustedBSD. */
+#define AUE_CHFLAGSAT 43209 /* FreeBSD-specific. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
From owner-p4-projects@FreeBSD.ORG Wed Mar 26 18:11:57 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9D09347B; Wed, 26 Mar 2014 18:11:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 5DBB0479
for <perforce@freebsd.org>; Wed, 26 Mar 2014 18:11:57 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 467307C7
for <perforce@freebsd.org>; Wed, 26 Mar 2014 18:11:57 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s2QIBvca090573
for <perforce@freebsd.org>; Wed, 26 Mar 2014 18:11:57 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s2QIBudg090568
for perforce@freebsd.org; Wed, 26 Mar 2014 18:11:56 GMT
(envelope-from jhb@freebsd.org)
Date: Wed, 26 Mar 2014 18:11:56 GMT
Message-Id: <201403261811.s2QIBudg090568@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1192285 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Mar 2014 18:11:57 -0000
http://p4web.freebsd.org/@@1192285?ac=10
Change 1192285 by jhb@jhb_jhbbsd on 2014/03/26 18:11:46
IFC @1192284
Affected files ...
.. //depot/projects/pci/sys/Makefile#7 integrate
.. //depot/projects/pci/sys/amd64/amd64/apic_vector.S#5 integrate
.. //depot/projects/pci/sys/amd64/amd64/cpu_switch.S#5 integrate
.. //depot/projects/pci/sys/amd64/amd64/fpu.c#5 integrate
.. //depot/projects/pci/sys/amd64/amd64/genassym.c#8 integrate
.. //depot/projects/pci/sys/amd64/amd64/locore.S#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/machdep.c#14 integrate
.. //depot/projects/pci/sys/amd64/amd64/mem.c#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/mp_machdep.c#11 integrate
.. //depot/projects/pci/sys/amd64/amd64/mpboot.S#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/pmap.c#16 integrate
.. //depot/projects/pci/sys/amd64/amd64/sys_machdep.c#8 integrate
.. //depot/projects/pci/sys/amd64/amd64/trap.c#8 integrate
.. //depot/projects/pci/sys/amd64/amd64/uio_machdep.c#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/uma_machdep.c#4 integrate
.. //depot/projects/pci/sys/amd64/amd64/vm_machdep.c#9 integrate
.. //depot/projects/pci/sys/amd64/amd64/xen-locore.S#1 branch
.. //depot/projects/pci/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/pci/sys/amd64/conf/NOTES#14 integrate
.. //depot/projects/pci/sys/amd64/include/asmacros.h#3 integrate
.. //depot/projects/pci/sys/amd64/include/clock.h#7 integrate
.. //depot/projects/pci/sys/amd64/include/fpu.h#4 integrate
.. //depot/projects/pci/sys/amd64/include/md_var.h#6 integrate
.. //depot/projects/pci/sys/amd64/include/pc/bios.h#3 integrate
.. //depot/projects/pci/sys/amd64/include/pmap.h#10 integrate
.. //depot/projects/pci/sys/amd64/include/smp.h#7 integrate
.. //depot/projects/pci/sys/amd64/include/vmm.h#10 integrate
.. //depot/projects/pci/sys/amd64/include/vmm_dev.h#7 integrate
.. //depot/projects/pci/sys/amd64/include/xen/hypercall.h#3 integrate
.. //depot/projects/pci/sys/amd64/linux32/linux32_machdep.c#6 integrate
.. //depot/projects/pci/sys/amd64/vmm/amd/amdv.c#6 integrate
.. //depot/projects/pci/sys/amd64/vmm/intel/vmx.c#14 integrate
.. //depot/projects/pci/sys/amd64/vmm/intel/vmx.h#9 integrate
.. //depot/projects/pci/sys/amd64/vmm/io/vatpic.c#1 branch
.. //depot/projects/pci/sys/amd64/vmm/io/vatpic.h#1 branch
.. //depot/projects/pci/sys/amd64/vmm/io/vatpit.c#1 branch
.. //depot/projects/pci/sys/amd64/vmm/io/vatpit.h#1 branch
.. //depot/projects/pci/sys/amd64/vmm/io/vhpet.c#4 integrate
.. //depot/projects/pci/sys/amd64/vmm/io/vlapic.c#9 integrate
.. //depot/projects/pci/sys/amd64/vmm/io/vlapic.h#6 integrate
.. //depot/projects/pci/sys/amd64/vmm/io/vlapic_priv.h#5 integrate
.. //depot/projects/pci/sys/amd64/vmm/vmm.c#12 integrate
.. //depot/projects/pci/sys/amd64/vmm/vmm_dev.c#8 integrate
.. //depot/projects/pci/sys/amd64/vmm/vmm_ioport.c#1 branch
.. //depot/projects/pci/sys/amd64/vmm/vmm_ioport.h#1 branch
.. //depot/projects/pci/sys/amd64/vmm/vmm_lapic.c#5 integrate
.. //depot/projects/pci/sys/amd64/vmm/x86.c#6 integrate
.. //depot/projects/pci/sys/arm/allwinner/a10_clk.c#4 integrate
.. //depot/projects/pci/sys/arm/allwinner/a10_clk.h#2 integrate
.. //depot/projects/pci/sys/arm/allwinner/a10_common.c#1 branch
.. //depot/projects/pci/sys/arm/allwinner/a10_ehci.c#3 integrate
.. //depot/projects/pci/sys/arm/allwinner/a10_gpio.c#4 integrate
.. //depot/projects/pci/sys/arm/allwinner/a10_gpio.h#1 branch
.. //depot/projects/pci/sys/arm/allwinner/a10_machdep.c#5 integrate
.. //depot/projects/pci/sys/arm/allwinner/a10_sramc.c#1 branch
.. //depot/projects/pci/sys/arm/allwinner/a10_sramc.h#1 branch
.. //depot/projects/pci/sys/arm/allwinner/a20/a20_cpu_cfg.c#4 integrate
.. //depot/projects/pci/sys/arm/allwinner/a20/a20_cpu_cfg.h#2 integrate
.. //depot/projects/pci/sys/arm/allwinner/a20/a20_mp.c#1 branch
.. //depot/projects/pci/sys/arm/allwinner/a20/files.a20#3 integrate
.. //depot/projects/pci/sys/arm/allwinner/aintc.c#4 integrate
.. //depot/projects/pci/sys/arm/allwinner/common.c#4 delete
.. //depot/projects/pci/sys/arm/allwinner/console.c#2 integrate
.. //depot/projects/pci/sys/arm/allwinner/files.a10#5 integrate
.. //depot/projects/pci/sys/arm/allwinner/if_emac.c#1 branch
.. //depot/projects/pci/sys/arm/allwinner/if_emacreg.h#1 branch
.. //depot/projects/pci/sys/arm/allwinner/timer.c#5 integrate
.. //depot/projects/pci/sys/arm/arm/copystr.S#5 integrate
.. //depot/projects/pci/sys/arm/arm/cpufunc.c#9 integrate
.. //depot/projects/pci/sys/arm/arm/cpufunc_asm_arm7tdmi.S#4 delete
.. //depot/projects/pci/sys/arm/arm/cpufunc_asm_arm8.S#5 delete
.. //depot/projects/pci/sys/arm/arm/cpufunc_asm_armv4.S#4 integrate
.. //depot/projects/pci/sys/arm/arm/cpufunc_asm_armv6.S#3 integrate
.. //depot/projects/pci/sys/arm/arm/cpufunc_asm_armv7.S#4 integrate
.. //depot/projects/pci/sys/arm/arm/cpufunc_asm_ixp12x0.S#4 delete
.. //depot/projects/pci/sys/arm/arm/cpufunc_asm_sa1.S#5 delete
.. //depot/projects/pci/sys/arm/arm/cpufunc_asm_sa11x0.S#5 delete
.. //depot/projects/pci/sys/arm/arm/elf_trampoline.c#8 integrate
.. //depot/projects/pci/sys/arm/arm/exception.S#6 integrate
.. //depot/projects/pci/sys/arm/arm/fiq.c#3 integrate
.. //depot/projects/pci/sys/arm/arm/fiq_subr.S#5 integrate
.. //depot/projects/pci/sys/arm/arm/fusu.S#6 integrate
.. //depot/projects/pci/sys/arm/arm/genassym.c#6 integrate
.. //depot/projects/pci/sys/arm/arm/generic_timer.c#4 integrate
.. //depot/projects/pci/sys/arm/arm/identcpu.c#9 integrate
.. //depot/projects/pci/sys/arm/arm/intr.c#5 integrate
.. //depot/projects/pci/sys/arm/arm/irq_dispatch.S#8 delete
.. //depot/projects/pci/sys/arm/arm/locore.S#10 integrate
.. //depot/projects/pci/sys/arm/arm/machdep.c#12 integrate
.. //depot/projects/pci/sys/arm/arm/mp_machdep.c#7 integrate
.. //depot/projects/pci/sys/arm/arm/mpcore_timer.c#6 integrate
.. //depot/projects/pci/sys/arm/arm/pmap-v6.c#11 integrate
.. //depot/projects/pci/sys/arm/arm/pmap.c#11 integrate
.. //depot/projects/pci/sys/arm/arm/support.S#5 integrate
.. //depot/projects/pci/sys/arm/arm/swtch.S#8 integrate
.. //depot/projects/pci/sys/arm/arm/sys_machdep.c#6 integrate
.. //depot/projects/pci/sys/arm/arm/trap.c#9 integrate
.. //depot/projects/pci/sys/arm/arm/uio_machdep.c#3 integrate
.. //depot/projects/pci/sys/arm/arm/undefined.c#5 integrate
.. //depot/projects/pci/sys/arm/arm/vectors.S#3 delete
.. //depot/projects/pci/sys/arm/arm/vfp.c#8 integrate
.. //depot/projects/pci/sys/arm/arm/vm_machdep.c#10 integrate
.. //depot/projects/pci/sys/arm/at91/at91.c#8 integrate
.. //depot/projects/pci/sys/arm/at91/at91_aic.c#1 branch
.. //depot/projects/pci/sys/arm/at91/at91_machdep.c#8 integrate
.. //depot/projects/pci/sys/arm/at91/at91_sdramc.c#1 branch
.. //depot/projects/pci/sys/arm/at91/at91_shdwc.c#1 branch
.. //depot/projects/pci/sys/arm/at91/at91_tcb.c#1 branch
.. //depot/projects/pci/sys/arm/at91/at91rm9200.c#5 integrate
.. //depot/projects/pci/sys/arm/at91/at91sam9g20.c#4 integrate
.. //depot/projects/pci/sys/arm/at91/at91sam9g20reg.h#4 integrate
.. //depot/projects/pci/sys/arm/at91/at91sam9x5.c#3 integrate
.. //depot/projects/pci/sys/arm/at91/at91sam9x5reg.h#2 integrate
.. //depot/projects/pci/sys/arm/at91/at91var.h#4 integrate
.. //depot/projects/pci/sys/arm/at91/files.at91#5 integrate
.. //depot/projects/pci/sys/arm/at91/uart_dev_at91usart.c#9 integrate
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_common.c#1 branch
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_systimer.c#6 integrate
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/common.c#2 delete
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/files.bcm2835#6 integrate
.. //depot/projects/pci/sys/arm/conf/AC100#6 integrate
.. //depot/projects/pci/sys/arm/conf/ARMADAXP#7 integrate
.. //depot/projects/pci/sys/arm/conf/ARNDALE#5 integrate
.. //depot/projects/pci/sys/arm/conf/ATMEL#8 integrate
.. //depot/projects/pci/sys/arm/conf/AVILA#10 integrate
.. //depot/projects/pci/sys/arm/conf/BEAGLEBONE#7 integrate
.. //depot/projects/pci/sys/arm/conf/BWCT#8 integrate
.. //depot/projects/pci/sys/arm/conf/CAMBRIA#11 integrate
.. //depot/projects/pci/sys/arm/conf/CHROMEBOOK#1 branch
.. //depot/projects/pci/sys/arm/conf/CNS11XXNAS#8 integrate
.. //depot/projects/pci/sys/arm/conf/COLIBRI-VF50#2 integrate
.. //depot/projects/pci/sys/arm/conf/COSMIC#4 integrate
.. //depot/projects/pci/sys/arm/conf/CRB#9 integrate
.. //depot/projects/pci/sys/arm/conf/CUBIEBOARD#6 integrate
.. //depot/projects/pci/sys/arm/conf/CUBIEBOARD2#4 integrate
.. //depot/projects/pci/sys/arm/conf/DB-78XXX#8 integrate
.. //depot/projects/pci/sys/arm/conf/DB-88F5XXX#8 integrate
.. //depot/projects/pci/sys/arm/conf/DB-88F6XXX#8 integrate
.. //depot/projects/pci/sys/arm/conf/DEFAULTS#5 integrate
.. //depot/projects/pci/sys/arm/conf/DIGI-CCWMX53#5 integrate
.. //depot/projects/pci/sys/arm/conf/DOCKSTAR#7 integrate
.. //depot/projects/pci/sys/arm/conf/DREAMPLUG-1001#3 integrate
.. //depot/projects/pci/sys/arm/conf/EA3250#5 integrate
.. //depot/projects/pci/sys/arm/conf/EB9200#5 integrate
.. //depot/projects/pci/sys/arm/conf/EFIKA_MX#5 integrate
.. //depot/projects/pci/sys/arm/conf/EP80219#9 integrate
.. //depot/projects/pci/sys/arm/conf/ETHERNUT5#5 integrate
.. //depot/projects/pci/sys/arm/conf/GUMSTIX#6 integrate
.. //depot/projects/pci/sys/arm/conf/HL200#8 integrate
.. //depot/projects/pci/sys/arm/conf/HL201#9 integrate
.. //depot/projects/pci/sys/arm/conf/IMX53-QSB#4 integrate
.. //depot/projects/pci/sys/arm/conf/IMX6#1 branch
.. //depot/projects/pci/sys/arm/conf/IQ31244#9 integrate
.. //depot/projects/pci/sys/arm/conf/KB920X#7 integrate
.. //depot/projects/pci/sys/arm/conf/LN2410SBC#7 integrate
.. //depot/projects/pci/sys/arm/conf/NOTES#4 integrate
.. //depot/projects/pci/sys/arm/conf/NSLU#8 integrate
.. //depot/projects/pci/sys/arm/conf/PANDABOARD#5 integrate
.. //depot/projects/pci/sys/arm/conf/QILA9G20#8 integrate
.. //depot/projects/pci/sys/arm/conf/QUARTZ#1 branch
.. //depot/projects/pci/sys/arm/conf/RADXA#3 integrate
.. //depot/projects/pci/sys/arm/conf/RPI-B#9 integrate
.. //depot/projects/pci/sys/arm/conf/SAM9260EK#6 integrate
.. //depot/projects/pci/sys/arm/conf/SAM9G20EK#8 integrate
.. //depot/projects/pci/sys/arm/conf/SAM9X25EK#6 integrate
.. //depot/projects/pci/sys/arm/conf/SHEEVAPLUG#8 integrate
.. //depot/projects/pci/sys/arm/conf/SIMICS#4 delete
.. //depot/projects/pci/sys/arm/conf/SN9G45#6 integrate
.. //depot/projects/pci/sys/arm/conf/TS7800#8 integrate
.. //depot/projects/pci/sys/arm/conf/VERSATILEPB#5 integrate
.. //depot/projects/pci/sys/arm/conf/VYBRID.common#3 integrate
.. //depot/projects/pci/sys/arm/conf/WANDBOARD.common#2 integrate
.. //depot/projects/pci/sys/arm/conf/ZEDBOARD#5 integrate
.. //depot/projects/pci/sys/arm/econa/econa_machdep.c#6 integrate
.. //depot/projects/pci/sys/arm/econa/files.econa#4 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/common.c#2 delete
.. //depot/projects/pci/sys/arm/freescale/imx/files.imx51#4 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/files.imx53#4 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/files.imx6#4 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/imx51_tzicreg.h#2 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/imx6_anatop.c#3 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/imx6_anatopreg.h#2 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/imx6_anatopvar.h#2 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/imx6_ccm.c#3 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/imx6_ccmreg.h#2 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/imx6_machdep.c#2 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/imx6_mp.c#1 branch
.. //depot/projects/pci/sys/arm/freescale/imx/imx_common.c#1 branch
.. //depot/projects/pci/sys/arm/freescale/imx/imx_gpt.c#6 integrate
.. //depot/projects/pci/sys/arm/freescale/imx/std.imx6#3 integrate
.. //depot/projects/pci/sys/arm/freescale/vybrid/files.vybrid#5 integrate
.. //depot/projects/pci/sys/arm/freescale/vybrid/vf_ccm.c#3 integrate
.. //depot/projects/pci/sys/arm/freescale/vybrid/vf_dcu4.c#2 integrate
.. //depot/projects/pci/sys/arm/freescale/vybrid/vf_gpio.c#3 integrate
.. //depot/projects/pci/sys/arm/freescale/vybrid/vf_i2c.c#1 branch
.. //depot/projects/pci/sys/arm/freescale/vybrid/vf_iomuxc.c#3 integrate
.. //depot/projects/pci/sys/arm/freescale/vybrid/vf_port.c#1 branch
.. //depot/projects/pci/sys/arm/freescale/vybrid/vf_port.h#1 branch
.. //depot/projects/pci/sys/arm/include/armreg.h#10 integrate
.. //depot/projects/pci/sys/arm/include/asmacros.h#7 integrate
.. //depot/projects/pci/sys/arm/include/cpuconf.h#4 integrate
.. //depot/projects/pci/sys/arm/include/cpufunc.h#5 integrate
.. //depot/projects/pci/sys/arm/include/machdep.h#6 integrate
.. //depot/projects/pci/sys/arm/include/md_var.h#4 integrate
.. //depot/projects/pci/sys/arm/include/param.h#6 integrate
.. //depot/projects/pci/sys/arm/include/pcb.h#5 integrate
.. //depot/projects/pci/sys/arm/include/pcpu.h#7 integrate
.. //depot/projects/pci/sys/arm/include/pmap.h#12 integrate
.. //depot/projects/pci/sys/arm/include/smp.h#4 integrate
.. //depot/projects/pci/sys/arm/include/sysarch.h#5 integrate
.. //depot/projects/pci/sys/arm/include/vfp.h#3 integrate
.. //depot/projects/pci/sys/arm/lpc/files.lpc#2 integrate
.. //depot/projects/pci/sys/arm/lpc/lpc_timer.c#5 integrate
.. //depot/projects/pci/sys/arm/mv/armadaxp/armadaxp_mp.c#4 integrate
.. //depot/projects/pci/sys/arm/mv/common.c#8 delete
.. //depot/projects/pci/sys/arm/mv/files.mv#4 integrate
.. //depot/projects/pci/sys/arm/mv/mv_common.c#1 branch
.. //depot/projects/pci/sys/arm/mv/timer.c#6 integrate
.. //depot/projects/pci/sys/arm/rockchip/common.c#2 delete
.. //depot/projects/pci/sys/arm/rockchip/files.rk30xx#2 integrate
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_common.c#1 branch
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_gpio.c#3 integrate
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_grf.c#3 integrate
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_grf.h#2 integrate
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_machdep.c#2 integrate
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_pmu.c#3 integrate
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_pmu.h#2 integrate
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_wdog.c#3 integrate
.. //depot/projects/pci/sys/arm/rockchip/rk30xx_wdog.h#2 integrate
.. //depot/projects/pci/sys/arm/s3c2xx0/files.s3c2xx0#4 integrate
.. //depot/projects/pci/sys/arm/s3c2xx0/s3c24x0_machdep.c#6 integrate
.. //depot/projects/pci/sys/arm/sa11x0/assabet_machdep.c#7 delete
.. //depot/projects/pci/sys/arm/sa11x0/files.sa11x0#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0.c#5 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_dmacreg.h#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_gpioreg.h#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_io.c#4 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_io_asm.S#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_irq.S#5 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_irqhandler.c#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_ost.c#4 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_ostreg.h#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_ppcreg.h#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_reg.h#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_var.h#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/std.sa11x0#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/uart_bus_sa1110.c#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/uart_cpu_sa1110.c#3 delete
.. //depot/projects/pci/sys/arm/sa11x0/uart_dev_sa1110.c#5 delete
.. //depot/projects/pci/sys/arm/sa11x0/uart_dev_sa1110.h#3 delete
.. //depot/projects/pci/sys/arm/samsung/exynos/arch_timer.c#4 delete
.. //depot/projects/pci/sys/arm/samsung/exynos/common.c#2 delete
.. //depot/projects/pci/sys/arm/samsung/exynos/ehci_exynos5.c#4 delete
.. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_common.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_common.h#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_ehci.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_fimd.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_mct.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_mp.c#2 integrate
.. //depot/projects/pci/sys/arm/samsung/exynos/files.exynos5#3 integrate
.. //depot/projects/pci/sys/arm/tegra/common.c#2 delete
.. //depot/projects/pci/sys/arm/tegra/files.tegra2#3 integrate
.. //depot/projects/pci/sys/arm/tegra/tegra2_common.c#1 branch
.. //depot/projects/pci/sys/arm/ti/am335x/am335x_dmtimer.c#7 integrate
.. //depot/projects/pci/sys/arm/ti/am335x/am335x_prcm.c#6 integrate
.. //depot/projects/pci/sys/arm/ti/common.c#2 delete
.. //depot/projects/pci/sys/arm/ti/files.ti#5 integrate
.. //depot/projects/pci/sys/arm/ti/omap4/omap4_mp.c#2 integrate
.. //depot/projects/pci/sys/arm/ti/omap4/omap4_prcm_clks.c#6 integrate
.. //depot/projects/pci/sys/arm/ti/ti_adc.c#1 branch
.. //depot/projects/pci/sys/arm/ti/ti_adcreg.h#1 branch
.. //depot/projects/pci/sys/arm/ti/ti_adcvar.h#1 branch
.. //depot/projects/pci/sys/arm/ti/ti_common.c#1 branch
.. //depot/projects/pci/sys/arm/ti/ti_prcm.h#4 integrate
.. //depot/projects/pci/sys/arm/ti/twl/twl_vreg.c#3 integrate
.. //depot/projects/pci/sys/arm/versatile/common.c#2 delete
.. //depot/projects/pci/sys/arm/versatile/files.versatile#2 integrate
.. //depot/projects/pci/sys/arm/versatile/versatile_common.c#1 branch
.. //depot/projects/pci/sys/arm/xilinx/files.zynq7#2 integrate
.. //depot/projects/pci/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate
.. //depot/projects/pci/sys/arm/xscale/i80321/files.i80219#3 integrate
.. //depot/projects/pci/sys/arm/xscale/i80321/files.i80321#3 integrate
.. //depot/projects/pci/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate
.. //depot/projects/pci/sys/arm/xscale/i8134x/crb_machdep.c#9 integrate
.. //depot/projects/pci/sys/arm/xscale/i8134x/files.i81342#3 integrate
.. //depot/projects/pci/sys/arm/xscale/ixp425/avila_machdep.c#8 integrate
.. //depot/projects/pci/sys/arm/xscale/ixp425/files.ixp425#3 integrate
.. //depot/projects/pci/sys/arm/xscale/pxa/files.pxa#3 integrate
.. //depot/projects/pci/sys/arm/xscale/pxa/pxa_machdep.c#7 integrate
.. //depot/projects/pci/sys/arm/xscale/pxa/pxareg.h#3 integrate
.. //depot/projects/pci/sys/boot/Makefile.amd64#5 integrate
.. //depot/projects/pci/sys/boot/Makefile.mips#1 branch
.. //depot/projects/pci/sys/boot/common/Makefile.inc#6 integrate
.. //depot/projects/pci/sys/boot/common/bootstrap.h#5 integrate
.. //depot/projects/pci/sys/boot/common/module.c#5 integrate
.. //depot/projects/pci/sys/boot/common/part.c#4 integrate
.. //depot/projects/pci/sys/boot/efi/include/amd64/efibind.h#1 branch
.. //depot/projects/pci/sys/boot/efi/include/amd64/pe.h#1 branch
.. //depot/projects/pci/sys/boot/efi/libefi/Makefile#3 integrate
.. //depot/projects/pci/sys/boot/fdt/Makefile#3 integrate
.. //depot/projects/pci/sys/boot/fdt/dts/am335x-evm.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/am335x.dtsi#5 delete
.. //depot/projects/pci/sys/boot/fdt/dts/arm/am335x-evm.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/am335x.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/bcm2835.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/beaglebone-black.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/beaglebone.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/cubieboard.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/cubieboard2.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/db78100.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/db78460.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/db88f5182.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/db88f5281.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/db88f6281.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/digi-ccwmx53.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/dockstar.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/dreamplug-1001.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/dreamplug-1001N.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/ea3250.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/efikamx.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/exynos5250-arndale.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/exynos5250.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/hl201.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/imx51x.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/imx53-qsb.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/imx53x.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/imx6.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/p1020rdb.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/p2020ds.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/p2041rdb.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/p2041si.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/p3041ds.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/p3041si.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/p5020ds.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/p5020si.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/pandaboard.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/rk3188-radxa.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/rk3188.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/rpi.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/sheevaplug.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/tegra20-paz00.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/tegra20.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/trimslice.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/ts7800.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/versatilepb.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/vybrid-cosmic.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/vybrid-quartz.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/vybrid.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/wandboard-dual.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/wandboard-quad.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/wandboard-solo.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/arm/zedboard.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/bcm2835.dtsi#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/beaglebone-black.dts#5 delete
.. //depot/projects/pci/sys/boot/fdt/dts/beaglebone.dts#4 delete
.. //depot/projects/pci/sys/boot/fdt/dts/beri-netfpga.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/beri-sim.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/beripad-de4.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/cubieboard.dts#4 delete
.. //depot/projects/pci/sys/boot/fdt/dts/cubieboard2.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/db78100.dts#4 delete
.. //depot/projects/pci/sys/boot/fdt/dts/db78460.dts#4 delete
.. //depot/projects/pci/sys/boot/fdt/dts/db88f5182.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/db88f5281.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/db88f6281.dts#4 delete
.. //depot/projects/pci/sys/boot/fdt/dts/digi-ccwmx53.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/dockstar.dts#4 delete
.. //depot/projects/pci/sys/boot/fdt/dts/dreamplug-1001.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/dreamplug-1001N.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/ea3250.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/efikamx.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/exynos5250-arndale.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/exynos5250.dtsi#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/imx51x.dtsi#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/imx53-qsb.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/imx53x.dtsi#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/imx6.dtsi#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/mips/beri-netfpga.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/mips/beri-sim.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/mips/beripad-de4.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/mips/xlp-basic.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/mpc8555cds.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/mpc8572ds.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/p1020rdb.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/p2020ds.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/p2041rdb.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/p2041si.dtsi#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/p3041ds.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/p3041si.dtsi#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/p5020ds.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/p5020si.dtsi#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/pandaboard.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/powerpc/mpc8555cds.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/powerpc/mpc8572ds.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/rk3188-radxa.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/rk3188.dtsi#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/rpi.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/sheevaplug.dts#4 delete
.. //depot/projects/pci/sys/boot/fdt/dts/tegra20-paz00.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/tegra20.dtsi#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/trimslice.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/ts7800.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/versatilepb.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/vybrid-colibri-vf50.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/dts/vybrid-cosmic.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/vybrid.dtsi#5 delete
.. //depot/projects/pci/sys/boot/fdt/dts/wandboard-dual.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/wandboard-quad.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/wandboard-solo.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/xlp-basic.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/zedboard.dts#2 delete
.. //depot/projects/pci/sys/boot/fdt/fdt_loader_cmd.c#5 integrate
.. //depot/projects/pci/sys/boot/ficl/Makefile#4 integrate
.. //depot/projects/pci/sys/boot/ficl/mips64/sysdep.c#1 branch
.. //depot/projects/pci/sys/boot/ficl/mips64/sysdep.h#1 branch
.. //depot/projects/pci/sys/boot/forth/loader.conf#12 integrate
.. //depot/projects/pci/sys/boot/i386/efi/bootinfo.c#3 integrate
.. //depot/projects/pci/sys/boot/i386/libi386/bootinfo.c#3 integrate
.. //depot/projects/pci/sys/boot/ia64/common/bootinfo.c#4 integrate
.. //depot/projects/pci/sys/boot/mips/Makefile#1 branch
.. //depot/projects/pci/sys/boot/mips/Makefile.inc#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/Makefile#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/Makefile.inc#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/boot2/Makefile#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/boot2/boot2.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/boot2/flashboot.ldscript#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/boot2/jtagboot.ldscript#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/boot2/relocate.S#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/boot2/start.S#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/altera_jtag_uart.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/beri.h#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/cfi.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/cfi.h#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/common.ldscript#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/cons.h#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/mips.h#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/sdcard.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/common/sdcard.h#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/Makefile#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/arch.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/beri_console.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/beri_disk_cfi.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/beri_disk_sdcard.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/devicename.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/exec.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/help.mips#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/loader.h#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/loader.ldscript#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/main.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/metadata.c#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/start.S#1 branch
.. //depot/projects/pci/sys/boot/mips/beri/loader/version#1 branch
.. //depot/projects/pci/sys/boot/powerpc/ofw/metadata.c#3 integrate
.. //depot/projects/pci/sys/boot/powerpc/ps3/metadata.c#3 integrate
.. //depot/projects/pci/sys/boot/sparc64/boot1/Makefile#3 integrate
.. //depot/projects/pci/sys/boot/sparc64/loader/metadata.c#3 integrate
.. //depot/projects/pci/sys/boot/uboot/common/main.c#3 integrate
.. //depot/projects/pci/sys/boot/uboot/common/metadata.c#4 integrate
.. //depot/projects/pci/sys/boot/uboot/lib/Makefile#3 integrate
.. //depot/projects/pci/sys/boot/uboot/lib/api_public.h#3 integrate
.. //depot/projects/pci/sys/boot/uboot/lib/disk.c#4 integrate
.. //depot/projects/pci/sys/boot/uboot/lib/glue.c#4 integrate
.. //depot/projects/pci/sys/boot/uboot/lib/libuboot.h#3 integrate
.. //depot/projects/pci/sys/boot/uboot/lib/module.c#3 integrate
.. //depot/projects/pci/sys/boot/userboot/Makefile#3 integrate
.. //depot/projects/pci/sys/boot/userboot/userboot/Makefile#5 integrate
.. //depot/projects/pci/sys/boot/userboot/userboot/bootinfo.c#3 integrate
.. //depot/projects/pci/sys/boot/userboot/userboot/conf.c#3 integrate
.. //depot/projects/pci/sys/boot/userboot/userboot/devicename.c#3 integrate
.. //depot/projects/pci/sys/boot/userboot/userboot/main.c#3 integrate
.. //depot/projects/pci/sys/boot/userboot/zfs/Makefile#1 branch
.. //depot/projects/pci/sys/cam/ata/ata_all.c#7 integrate
.. //depot/projects/pci/sys/cam/cam_periph.c#14 integrate
.. //depot/projects/pci/sys/cam/ctl/ctl.c#8 integrate
.. //depot/projects/pci/sys/cam/ctl/ctl_frontend_iscsi.c#2 integrate
.. //depot/projects/pci/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#4 integrate
.. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/file.h#6 integrate
.. //depot/projects/pci/sys/cddl/compat/opensolaris/sys/kmem.h#6 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#10 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#10 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#9 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#13 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#10 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#7 integrate
.. //depot/projects/pci/sys/cddl/dev/dtrace/amd64/dis_tables.c#4 delete
.. //depot/projects/pci/sys/cddl/dev/dtrace/amd64/dis_tables.h#4 delete
.. //depot/projects/pci/sys/cddl/dev/dtrace/amd64/regset.h#3 delete
.. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_ioctl.c#5 integrate
.. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_sysctl.c#4 integrate
.. //depot/projects/pci/sys/cddl/dev/dtrace/i386/dis_tables.c#4 delete
.. //depot/projects/pci/sys/cddl/dev/dtrace/i386/dis_tables.h#4 delete
.. //depot/projects/pci/sys/cddl/dev/dtrace/i386/regset.h#3 delete
.. //depot/projects/pci/sys/cddl/dev/dtrace/x86/dis_tables.c#1 branch
.. //depot/projects/pci/sys/cddl/dev/dtrace/x86/dis_tables.h#1 branch
.. //depot/projects/pci/sys/cddl/dev/dtrace/x86/regset.h#1 branch
.. //depot/projects/pci/sys/cddl/dev/systrace/systrace.c#6 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_capability.c#3 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_ioctl.c#6 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_misc.c#16 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_proto.h#12 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_systrace_args.c#10 integrate
.. //depot/projects/pci/sys/compat/freebsd32/syscalls.master#12 integrate
.. //depot/projects/pci/sys/compat/linprocfs/linprocfs.c#11 integrate
.. //depot/projects/pci/sys/compat/linux/linux_file.c#6 integrate
.. //depot/projects/pci/sys/compat/linux/linux_ioctl.c#8 integrate
.. //depot/projects/pci/sys/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/pci/sys/compat/linux/linux_socket.c#8 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_fcntl.c#6 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_filio.c#6 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_fuser.h#3 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_ioctl.c#5 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_ipc.c#4 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_misc.c#6 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_resource.c#3 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_resource.h#3 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_stream.c#6 integrate
.. //depot/projects/pci/sys/conf/Makefile.arm#10 integrate
.. //depot/projects/pci/sys/conf/NOTES#19 integrate
.. //depot/projects/pci/sys/conf/files#23 integrate
.. //depot/projects/pci/sys/conf/files.amd64#15 integrate
.. //depot/projects/pci/sys/conf/files.arm#12 integrate
.. //depot/projects/pci/sys/conf/files.i386#18 integrate
.. //depot/projects/pci/sys/conf/files.ia64#8 integrate
.. //depot/projects/pci/sys/conf/files.pc98#9 integrate
.. //depot/projects/pci/sys/conf/kern.mk#13 integrate
.. //depot/projects/pci/sys/conf/kmod.mk#11 integrate
.. //depot/projects/pci/sys/conf/options#21 integrate
.. //depot/projects/pci/sys/conf/options.arm#10 integrate
.. //depot/projects/pci/sys/conf/options.ia64#3 integrate
.. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c#2 integrate
.. //depot/projects/pci/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/README#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/linux/include/linux/xz.h#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/linux/lib/decompress_unxz.c#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/linux/lib/xz/Kconfig#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/linux/lib/xz/xz_crc64.c#1 branch
.. //depot/projects/pci/sys/contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/linux/scripts/xz_wrap.sh#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/userspace/Makefile#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/userspace/boottest.c#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/userspace/bytetest.c#1 branch
.. //depot/projects/pci/sys/contrib/xz-embedded/userspace/xz_config.h#2 integrate
.. //depot/projects/pci/sys/contrib/xz-embedded/userspace/xzminidec.c#2 integrate
.. //depot/projects/pci/sys/crypto/sha2/sha2.c#4 integrate
.. //depot/projects/pci/sys/crypto/sha2/sha2.h#4 integrate
.. //depot/projects/pci/sys/crypto/sha2/sha256.h#1 branch
.. //depot/projects/pci/sys/crypto/sha2/sha256c.c#1 branch
.. //depot/projects/pci/sys/dev/aac/aac_linux.c#5 integrate
.. //depot/projects/pci/sys/dev/aacraid/aacraid_linux.c#3 integrate
.. //depot/projects/pci/sys/dev/aic7xxx/aicasm/Makefile#5 integrate
.. //depot/projects/pci/sys/dev/amdtemp/amdtemp.c#6 integrate
.. //depot/projects/pci/sys/dev/amr/amr_linux.c#5 integrate
.. //depot/projects/pci/sys/dev/ath/ah_osdep.c#9 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#11 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain.c#7 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h#4 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210.h#5 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#7 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211.h#5 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212.h#8 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#5 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath.c#17 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath_tx.c#11 integrate
.. //depot/projects/pci/sys/dev/bvm/bvm_console.c#3 integrate
.. //depot/projects/pci/sys/dev/bxe/bxe.c#7 integrate
.. //depot/projects/pci/sys/dev/cpuctl/cpuctl.c#7 integrate
.. //depot/projects/pci/sys/dev/cxgbe/adapter.h#15 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/t4_hw.h#7 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_main.c#16 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_sge.c#16 integrate
.. //depot/projects/pci/sys/dev/esp/esp_sbus.c#4 integrate
.. //depot/projects/pci/sys/dev/esp/ncr53c9xvar.h#4 integrate
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitch.c#6 integrate
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitch_8327.c#1 branch
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitch_8327.h#1 branch
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitch_phy.c#4 integrate
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitch_reg.c#4 integrate
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitch_vlans.c#4 integrate
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitch_vlans.h#2 integrate
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitchreg.h#6 integrate
.. //depot/projects/pci/sys/dev/etherswitch/arswitch/arswitchvar.h#4 integrate
.. //depot/projects/pci/sys/dev/etherswitch/ip17x/ip17x.c#2 integrate
.. //depot/projects/pci/sys/dev/etherswitch/ip17x/ip17x_phy.c#2 integrate
.. //depot/projects/pci/sys/dev/etherswitch/ip17x/ip17x_vlans.c#3 integrate
.. //depot/projects/pci/sys/dev/fb/creator.c#3 integrate
.. //depot/projects/pci/sys/dev/fb/machfb.c#4 integrate
.. //depot/projects/pci/sys/dev/ffec/if_ffec.c#4 integrate
.. //depot/projects/pci/sys/dev/filemon/filemon.c#5 integrate
.. //depot/projects/pci/sys/dev/gpio/ofw_gpiobus.c#2 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_core.c#11 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_intel.c#6 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_logging.c#5 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_piv.c#4 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_powerpc.c#7 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_uncore.c#7 integrate
.. //depot/projects/pci/sys/dev/hwpmc/pmc_events.h#9 integrate
.. //depot/projects/pci/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#5 integrate
.. //depot/projects/pci/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c#2 integrate
.. //depot/projects/pci/sys/dev/ipmi/ipmi_linux.c#5 integrate
.. //depot/projects/pci/sys/dev/isci/scil/sati_passthrough.c#4 integrate
.. //depot/projects/pci/sys/dev/isci/scil/sati_util.h#3 integrate
.. //depot/projects/pci/sys/dev/isci/scil/sci_controller_constants.h#3 integrate
.. //depot/projects/pci/sys/dev/isci/scil/sci_util.h#3 integrate
.. //depot/projects/pci/sys/dev/isci/scil/scic_sds_request.h#3 integrate
.. //depot/projects/pci/sys/dev/iscsi/icl.c#4 integrate
.. //depot/projects/pci/sys/dev/iscsi/icl.h#2 integrate
.. //depot/projects/pci/sys/dev/iscsi/icl_proxy.c#2 integrate
.. //depot/projects/pci/sys/dev/iscsi/iscsi.c#4 integrate
.. //depot/projects/pci/sys/dev/iscsi_initiator/iscsi.c#3 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwn.c#12 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwn_debug.h#2 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwn_ioctl.h#1 branch
.. //depot/projects/pci/sys/dev/iwn/if_iwnreg.h#8 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwnvar.h#9 integrate
.. //depot/projects/pci/sys/dev/ixgbe/ixgbe.c#13 integrate
.. //depot/projects/pci/sys/dev/le/am7990.c#3 integrate
.. //depot/projects/pci/sys/dev/le/am79900.c#3 integrate
.. //depot/projects/pci/sys/dev/le/am79900reg.h#3 integrate
.. //depot/projects/pci/sys/dev/le/am7990reg.h#3 integrate
.. //depot/projects/pci/sys/dev/le/if_le_isa.c#3 integrate
.. //depot/projects/pci/sys/dev/le/if_le_pci.c#3 integrate
.. //depot/projects/pci/sys/dev/le/lance.c#4 integrate
.. //depot/projects/pci/sys/dev/le/lancereg.h#3 integrate
.. //depot/projects/pci/sys/dev/md/md.c#12 integrate
.. //depot/projects/pci/sys/dev/mfi/mfi_linux.c#5 integrate
.. //depot/projects/pci/sys/dev/mk48txx/mk48txx.c#4 integrate
.. //depot/projects/pci/sys/dev/mps/mps.c#6 integrate
.. //depot/projects/pci/sys/dev/mps/mps_sas.c#7 integrate
.. //depot/projects/pci/sys/dev/mxge/if_mxge.c#10 integrate
.. //depot/projects/pci/sys/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/pci/sys/dev/nand/nfc_at91.c#3 integrate
.. //depot/projects/pci/sys/dev/netmap/netmap_freebsd.c#4 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme.c#6 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_ctrlr.c#8 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_private.h#6 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_qpair.c#4 integrate
.. //depot/projects/pci/sys/dev/oce/oce_if.c#7 integrate
.. //depot/projects/pci/sys/dev/puc/puc.c#5 integrate
.. //depot/projects/pci/sys/dev/puc/puc_bfe.h#5 integrate
.. //depot/projects/pci/sys/dev/puc/puc_cfg.c#3 integrate
.. //depot/projects/pci/sys/dev/puc/puc_pccard.c#5 integrate
.. //depot/projects/pci/sys/dev/puc/puc_pci.c#5 integrate
.. //depot/projects/pci/sys/dev/puc/pucdata.c#7 integrate
.. //depot/projects/pci/sys/dev/qlxgb/qla_os.c#5 integrate
.. //depot/projects/pci/sys/dev/qlxgbe/ql_os.c#4 integrate
.. //depot/projects/pci/sys/dev/qlxge/qls_os.c#3 integrate
.. //depot/projects/pci/sys/dev/sbni/if_sbni.c#4 integrate
.. //depot/projects/pci/sys/dev/sfxge/sfxge_tx.c#3 integrate
.. //depot/projects/pci/sys/dev/sfxge/sfxge_tx.h#3 integrate
.. //depot/projects/pci/sys/dev/sound/usb/uaudio.c#9 integrate
.. //depot/projects/pci/sys/dev/syscons/syscons.h#6 integrate
.. //depot/projects/pci/sys/dev/tdfx/tdfx_linux.c#5 integrate
.. //depot/projects/pci/sys/dev/tws/tws.h#4 integrate
.. //depot/projects/pci/sys/dev/tws/tws_cam.c#5 integrate
.. //depot/projects/pci/sys/dev/tws/tws_user.c#4 integrate
.. //depot/projects/pci/sys/dev/uart/uart_bus_fdt.c#10 integrate
.. //depot/projects/pci/sys/dev/uart/uart_core.c#8 integrate
.. //depot/projects/pci/sys/dev/uart/uart_tty.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/controller/at91dci_fdt.c#1 branch
.. //depot/projects/pci/sys/dev/usb/controller/ohci_fdt.c#1 branch
.. //depot/projects/pci/sys/dev/usb/input/atp.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/input/ukbd.c#13 integrate
.. //depot/projects/pci/sys/dev/usb/input/wsp.c#3 integrate
.. //depot/projects/pci/sys/dev/usb/quirk/usb_quirk.c#10 integrate
.. //depot/projects/pci/sys/dev/usb/serial/ubsa.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/serial/ubser.c#4 integrate
.. //depot/projects/pci/sys/dev/usb/serial/uchcom.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/serial/ufoma.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/serial/umodem.c#6 integrate
.. //depot/projects/pci/sys/dev/usb/serial/uplcom.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/serial/usb_serial.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/serial/usb_serial.h#5 integrate
.. //depot/projects/pci/sys/dev/usb/usb_core.h#4 integrate
.. //depot/projects/pci/sys/dev/usb/usb_dev.c#8 integrate
.. //depot/projects/pci/sys/dev/usb/usb_device.c#9 integrate
.. //depot/projects/pci/sys/dev/usb/usb_process.c#6 integrate
.. //depot/projects/pci/sys/dev/usb/usb_process.h#4 integrate
.. //depot/projects/pci/sys/dev/usb/usb_transfer.c#10 integrate
.. //depot/projects/pci/sys/dev/usb/usbdevs#18 integrate
.. //depot/projects/pci/sys/dev/usb/usbdi.h#10 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_run.c#14 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_runvar.h#9 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_urtwn.c#7 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_urtwnreg.h#3 integrate
.. //depot/projects/pci/sys/dev/virtio/network/if_vtnet.c#8 integrate
.. //depot/projects/pci/sys/dev/vmware/vmxnet3/if_vmx.c#4 integrate
.. //depot/projects/pci/sys/dev/vmware/vmxnet3/if_vmxreg.h#2 integrate
.. //depot/projects/pci/sys/dev/vmware/vmxnet3/if_vmxvar.h#3 integrate
.. //depot/projects/pci/sys/dev/vt/hw/efifb/efifb.c#1 branch
.. //depot/projects/pci/sys/dev/vt/vt_core.c#4 integrate
.. //depot/projects/pci/sys/dev/vxge/vxge.c#6 integrate
.. //depot/projects/pci/sys/dev/xen/console/console.c#8 integrate
.. //depot/projects/pci/sys/dev/xen/console/xencons_ring.c#4 integrate
.. //depot/projects/pci/sys/dev/xen/timer/timer.c#3 integrate
.. //depot/projects/pci/sys/dev/xen/timer/timer.h#1 branch
.. //depot/projects/pci/sys/fs/ext2fs/ext2_alloc.c#9 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_balloc.c#7 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_bmap.c#7 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_dinode.h#10 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_dir.h#6 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_extents.h#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_extern.h#8 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_htree.c#4 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_inode.c#7 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_inode_cnv.c#9 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_lookup.c#11 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_mount.h#4 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_vfsops.c#11 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_vnops.c#11 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2fs.h#9 integrate
.. //depot/projects/pci/sys/fs/ext2fs/fs.h#5 integrate
.. //depot/projects/pci/sys/fs/ext2fs/htree.h#2 integrate
.. //depot/projects/pci/sys/fs/ext2fs/inode.h#9 integrate
.. //depot/projects/pci/sys/fs/fdescfs/fdesc_vnops.c#7 integrate
.. //depot/projects/pci/sys/fs/fuse/fuse_vfsops.c#3 integrate
.. //depot/projects/pci/sys/fs/msdosfs/msdosfs_fileno.c#3 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#14 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdport.c#13 integrate
.. //depot/projects/pci/sys/fs/tmpfs/tmpfs_subr.c#8 integrate
.. //depot/projects/pci/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate
.. //depot/projects/pci/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/pci/sys/gnu/dts/FreeBSD-list#1 branch
.. //depot/projects/pci/sys/gnu/dts/FreeBSD-upgrade#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/animeo_ip.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91-ariag25.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91-cosino.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91-cosino_mega2560.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91-foxg20.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91-qil_a9260.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91-sama5d3_xplained.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91rm9200.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91rm9200_pqfp.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91rm9200ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9260.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9263.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9263ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g15.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g15ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g20.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g20ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g20ek_2mmc.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g20ek_common.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g25.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g25ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g35.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g35ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9g45.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9m10g45ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9n12.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9n12ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x25.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x25ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x35.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x35ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x5.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x5_macb0.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x5_macb1.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x5_usart3.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x5cm.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/at91sam9x5ek.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/ethernut5.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/evk-pro3.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/ge863-pro3.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/kizbox.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/mpa1600.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/pm9g45.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d31.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d31ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d33.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d33ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d34.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d34ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d35.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d35ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d36.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d36ek.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3_can.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3_emac.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3_gmac.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3_lcd.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3_mci2.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3_tcb1.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3_uart.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3xcm.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3xdm.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/sama5d3xmb.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/skeleton.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/tny_a9260.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/tny_a9260_common.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/tny_a9263.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/tny_a9g20.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/usb_a9260.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/usb_a9260_common.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/usb_a9263.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/usb_a9g20.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/usb_a9g20_common.dtsi#1 branch
.. //depot/projects/pci/sys/gnu/dts/arm/usb_a9g20_lpw.dts#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clk/at91.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clk/exynos-audss-clk.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/efm32-cmu.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/exynos4.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/exynos5250.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/exynos5420.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/exynos5440.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/hi3620-clock.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/imx5-clock.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/mpc512x-clock.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8660.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/r8a7790-clock.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/r8a7791-clock.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/samsung,s3c64xx-clock.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/tegra114-car.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/tegra124-car.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/tegra20-car.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/tegra30-car.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/clock/vf610-clock.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/dma/at91.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/gpio/gpio.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/gpio/tegra-gpio.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/input/input.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/interrupt-controller/arm-gic.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/interrupt-controller/irq.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/mfd/as3722.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/mfd/dbx500-prcmu.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pinctrl/am33xx.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pinctrl/am43xx.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pinctrl/at91.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pinctrl/dra.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pinctrl/nomadik.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pinctrl/omap.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pinctrl/rockchip.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/pwm/pwm.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8660.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8960.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8974.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8960.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8974.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/sound/fsl-imx-audmux.h#1 branch
.. //depot/projects/pci/sys/gnu/dts/include/dt-bindings/thermal/thermal.h#1 branch
.. //depot/projects/pci/sys/i386/conf/GENERIC#16 integrate
.. //depot/projects/pci/sys/i386/conf/NOTES#13 integrate
.. //depot/projects/pci/sys/i386/conf/XEN#8 integrate
.. //depot/projects/pci/sys/i386/i386/apic_vector.s#4 integrate
.. //depot/projects/pci/sys/i386/i386/locore.s#4 integrate
.. //depot/projects/pci/sys/i386/i386/machdep.c#14 integrate
.. //depot/projects/pci/sys/i386/i386/mp_machdep.c#9 integrate
.. //depot/projects/pci/sys/i386/i386/pmap.c#13 integrate
.. //depot/projects/pci/sys/i386/i386/sys_machdep.c#7 integrate
.. //depot/projects/pci/sys/i386/i386/trap.c#7 integrate
.. //depot/projects/pci/sys/i386/i386/uio_machdep.c#4 integrate
.. //depot/projects/pci/sys/i386/i386/vm_machdep.c#9 integrate
.. //depot/projects/pci/sys/i386/ibcs2/ibcs2_fcntl.c#5 integrate
.. //depot/projects/pci/sys/i386/ibcs2/ibcs2_ioctl.c#6 integrate
.. //depot/projects/pci/sys/i386/ibcs2/ibcs2_misc.c#6 integrate
.. //depot/projects/pci/sys/i386/include/clock.h#6 integrate
.. //depot/projects/pci/sys/i386/include/smp.h#6 integrate
.. //depot/projects/pci/sys/i386/include/xen/hypercall.h#2 integrate
.. //depot/projects/pci/sys/i386/include/xen/xen-os.h#5 integrate
.. //depot/projects/pci/sys/i386/linux/linux_machdep.c#5 integrate
.. //depot/projects/pci/sys/i386/xen/clock.c#6 integrate
.. //depot/projects/pci/sys/i386/xen/mp_machdep.c#9 integrate
.. //depot/projects/pci/sys/i386/xen/pmap.c#10 integrate
.. //depot/projects/pci/sys/i386/xen/xen_machdep.c#5 integrate
.. //depot/projects/pci/sys/ia64/conf/GENERIC#11 integrate
.. //depot/projects/pci/sys/ia64/ia64/clock.c#7 integrate
.. //depot/projects/pci/sys/ia64/ia64/db_machdep.c#5 integrate
.. //depot/projects/pci/sys/ia64/ia64/exception.S#8 integrate
.. //depot/projects/pci/sys/ia64/ia64/interrupt.c#5 integrate
.. //depot/projects/pci/sys/ia64/ia64/machdep.c#10 integrate
.. //depot/projects/pci/sys/ia64/ia64/mem.c#4 integrate
.. //depot/projects/pci/sys/ia64/ia64/mp_machdep.c#9 integrate
.. //depot/projects/pci/sys/ia64/ia64/pmap.c#15 integrate
.. //depot/projects/pci/sys/ia64/ia64/trap.c#5 integrate
.. //depot/projects/pci/sys/ia64/ia64/uio_machdep.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/uma_machdep.c#4 integrate
.. //depot/projects/pci/sys/ia64/ia64/xtrace.c#1 branch
.. //depot/projects/pci/sys/ia64/include/kdb.h#3 integrate
.. //depot/projects/pci/sys/ia64/include/md_var.h#3 integrate
.. //depot/projects/pci/sys/ia64/include/pcpu.h#6 integrate
.. //depot/projects/pci/sys/ia64/include/pmap.h#7 integrate
.. //depot/projects/pci/sys/ia64/include/smp.h#6 integrate
.. //depot/projects/pci/sys/isa/isareg.h#3 integrate
.. //depot/projects/pci/sys/kern/Make.tags.inc#5 integrate
.. //depot/projects/pci/sys/kern/imgact_elf.c#9 integrate
.. //depot/projects/pci/sys/kern/init_main.c#8 integrate
.. //depot/projects/pci/sys/kern/init_sysent.c#11 integrate
.. //depot/projects/pci/sys/kern/kern_descrip.c#17 integrate
.. //depot/projects/pci/sys/kern/kern_event.c#12 integrate
.. //depot/projects/pci/sys/kern/kern_exec.c#12 integrate
.. //depot/projects/pci/sys/kern/kern_exit.c#12 integrate
.. //depot/projects/pci/sys/kern/kern_jail.c#15 integrate
.. //depot/projects/pci/sys/kern/kern_ktr.c#7 integrate
.. //depot/projects/pci/sys/kern/kern_ktrace.c#7 integrate
.. //depot/projects/pci/sys/kern/kern_linker.c#10 integrate
.. //depot/projects/pci/sys/kern/kern_malloc.c#10 integrate
.. //depot/projects/pci/sys/kern/kern_mib.c#6 integrate
.. //depot/projects/pci/sys/kern/kern_sdt.c#5 integrate
.. //depot/projects/pci/sys/kern/kern_sig.c#11 integrate
.. //depot/projects/pci/sys/kern/kern_sysctl.c#10 integrate
.. //depot/projects/pci/sys/kern/kern_umtx.c#6 integrate
.. //depot/projects/pci/sys/kern/sched_ule.c#14 integrate
.. //depot/projects/pci/sys/kern/subr_bus.c#14 integrate
.. //depot/projects/pci/sys/kern/subr_capability.c#3 integrate
.. //depot/projects/pci/sys/kern/subr_devstat.c#7 integrate
.. //depot/projects/pci/sys/kern/subr_prf.c#8 integrate
.. //depot/projects/pci/sys/kern/subr_syscall.c#4 integrate
.. //depot/projects/pci/sys/kern/subr_trap.c#8 integrate
.. //depot/projects/pci/sys/kern/subr_witness.c#10 integrate
.. //depot/projects/pci/sys/kern/sys_capability.c#10 integrate
.. //depot/projects/pci/sys/kern/sys_generic.c#10 integrate
.. //depot/projects/pci/sys/kern/sys_procdesc.c#6 integrate
.. //depot/projects/pci/sys/kern/syscalls.c#9 integrate
.. //depot/projects/pci/sys/kern/syscalls.master#9 integrate
.. //depot/projects/pci/sys/kern/systrace_args.c#9 integrate
.. //depot/projects/pci/sys/kern/tty.c#8 integrate
.. //depot/projects/pci/sys/kern/uipc_mqueue.c#9 integrate
.. //depot/projects/pci/sys/kern/uipc_sem.c#8 integrate
.. //depot/projects/pci/sys/kern/uipc_shm.c#10 integrate
.. //depot/projects/pci/sys/kern/uipc_sockbuf.c#8 integrate
.. //depot/projects/pci/sys/kern/uipc_syscalls.c#15 integrate
.. //depot/projects/pci/sys/kern/uipc_usrreq.c#8 integrate
.. //depot/projects/pci/sys/kern/vfs_acl.c#7 integrate
.. //depot/projects/pci/sys/kern/vfs_aio.c#7 integrate
.. //depot/projects/pci/sys/kern/vfs_bio.c#15 integrate
.. //depot/projects/pci/sys/kern/vfs_extattr.c#6 integrate
.. //depot/projects/pci/sys/kern/vfs_lookup.c#8 integrate
.. //depot/projects/pci/sys/kern/vfs_subr.c#15 integrate
.. //depot/projects/pci/sys/kern/vfs_syscalls.c#13 integrate
.. //depot/projects/pci/sys/kern/vfs_vnops.c#12 integrate
.. //depot/projects/pci/sys/mips/atheros/apb.c#8 integrate
.. //depot/projects/pci/sys/mips/atheros/apbvar.h#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_cpudef.h#8 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_ehci.c#8 integrate
.. //depot/projects/pci/sys/mips/atheros/ar934x_chip.c#3 integrate
.. //depot/projects/pci/sys/mips/atheros/ar934x_nfcreg.h#1 branch
.. //depot/projects/pci/sys/mips/atheros/if_arge.c#12 integrate
.. //depot/projects/pci/sys/mips/cavium/octopci_bus_space.c#4 integrate
.. //depot/projects/pci/sys/mips/conf/ALCHEMY#4 integrate
.. //depot/projects/pci/sys/mips/conf/ALFA_HORNET_UB#2 integrate
.. //depot/projects/pci/sys/mips/conf/AP121#2 integrate
.. //depot/projects/pci/sys/mips/conf/AP91#2 integrate
.. //depot/projects/pci/sys/mips/conf/AP93#2 integrate
.. //depot/projects/pci/sys/mips/conf/AP94#2 integrate
.. //depot/projects/pci/sys/mips/conf/AP96#2 integrate
.. //depot/projects/pci/sys/mips/conf/AR71XX_BASE#4 integrate
.. //depot/projects/pci/sys/mips/conf/AR724X_BASE#3 integrate
.. //depot/projects/pci/sys/mips/conf/AR91XX_BASE#7 integrate
.. //depot/projects/pci/sys/mips/conf/AR933X_BASE#3 integrate
.. //depot/projects/pci/sys/mips/conf/AR934X_BASE#4 integrate
.. //depot/projects/pci/sys/mips/conf/BERI_NETFPGA_MDROOT#2 integrate
.. //depot/projects/pci/sys/mips/conf/CARAMBOLA2#2 integrate
.. //depot/projects/pci/sys/mips/conf/DB120#4 integrate
.. //depot/projects/pci/sys/mips/conf/DB120.hints#4 integrate
.. //depot/projects/pci/sys/mips/conf/DIR-825#4 delete
.. //depot/projects/pci/sys/mips/conf/DIR-825.hints#4 delete
.. //depot/projects/pci/sys/mips/conf/DIR-825B1#1 branch
.. //depot/projects/pci/sys/mips/conf/DIR-825B1.hints#1 branch
.. //depot/projects/pci/sys/mips/conf/ENH200#2 integrate
.. //depot/projects/pci/sys/mips/conf/PB47#3 integrate
.. //depot/projects/pci/sys/mips/conf/PB92#6 integrate
.. //depot/projects/pci/sys/mips/conf/PICOSTATION_M2HP#2 integrate
.. //depot/projects/pci/sys/mips/conf/ROUTERSTATION#4 integrate
.. //depot/projects/pci/sys/mips/conf/ROUTERSTATION_MFS#3 integrate
.. //depot/projects/pci/sys/mips/conf/RSPRO#3 integrate
.. //depot/projects/pci/sys/mips/conf/RSPRO_MFS#3 integrate
.. //depot/projects/pci/sys/mips/conf/RSPRO_STANDALONE#3 integrate
.. //depot/projects/pci/sys/mips/conf/RT305X#6 integrate
.. //depot/projects/pci/sys/mips/conf/SENTRY5#5 integrate
.. //depot/projects/pci/sys/mips/conf/SWARM64_SMP#3 integrate
.. //depot/projects/pci/sys/mips/conf/SWARM_SMP#3 integrate
.. //depot/projects/pci/sys/mips/conf/TP-WN1043ND#5 integrate
.. //depot/projects/pci/sys/mips/conf/WZR-300HP#2 integrate
.. //depot/projects/pci/sys/mips/conf/XLRN32#6 integrate
.. //depot/projects/pci/sys/mips/conf/std.SWARM#7 integrate
.. //depot/projects/pci/sys/mips/conf/std.XLP#5 integrate
.. //depot/projects/pci/sys/mips/include/bootinfo.h#3 integrate
.. //depot/projects/pci/sys/mips/include/bus.h#5 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Thu Mar 27 20:14:13 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id AC2DA7ED; Thu, 27 Mar 2014 20:14:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 54EC47EB
for <perforce@freebsd.org>; Thu, 27 Mar 2014 20:14:13 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 3EC87F03
for <perforce@freebsd.org>; Thu, 27 Mar 2014 20:14:13 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RKEDX7092344
for <perforce@freebsd.org>; Thu, 27 Mar 2014 20:14:13 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s2RKED9l092341
for perforce@freebsd.org; Thu, 27 Mar 2014 20:14:13 GMT
(envelope-from jhb@freebsd.org)
Date: Thu, 27 Mar 2014 20:14:13 GMT
Message-Id: <201403272014.s2RKED9l092341@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1192318 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Mar 2014 20:14:13 -0000
http://p4web.freebsd.org/@@1192318?ac=10
Change 1192318 by jhb@jhb_jhbbsd on 2014/03/27 20:14:00
IFC @1192317
Affected files ...
.. //depot/projects/pci/sys/amd64/amd64/machdep.c#15 integrate
.. //depot/projects/pci/sys/amd64/include/metadata.h#4 integrate
.. //depot/projects/pci/sys/amd64/include/vmm.h#11 integrate
.. //depot/projects/pci/sys/amd64/include/vmm_dev.h#8 integrate
.. //depot/projects/pci/sys/amd64/vmm/amd/amdv.c#7 integrate
.. //depot/projects/pci/sys/amd64/vmm/intel/vmx.c#15 integrate
.. //depot/projects/pci/sys/amd64/vmm/vmm.c#13 integrate
.. //depot/projects/pci/sys/amd64/vmm/vmm_dev.c#9 integrate
.. //depot/projects/pci/sys/cam/ctl/README.ctl.txt#4 integrate
.. //depot/projects/pci/sys/cam/ctl/ctl_frontend_cam_sim.c#5 integrate
.. //depot/projects/pci/sys/cam/ctl/ctl_frontend_internal.c#5 integrate
.. //depot/projects/pci/sys/cam/ctl/ctl_frontend_iscsi.c#3 integrate
.. //depot/projects/pci/sys/cam/ctl/ctl_mem_pool.c#3 delete
.. //depot/projects/pci/sys/cam/ctl/ctl_mem_pool.h#3 delete
.. //depot/projects/pci/sys/conf/files#24 integrate
.. //depot/projects/pci/sys/dev/vt/hw/efifb/efifb.c#2 integrate
.. //depot/projects/pci/sys/dev/vt/vt_core.c#5 integrate
.. //depot/projects/pci/sys/ia64/acpica/OsdEnvironment.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/clock.c#8 integrate
.. //depot/projects/pci/sys/ia64/ia64/dump_machdep.c#8 integrate
.. //depot/projects/pci/sys/ia64/ia64/efi.c#6 integrate
.. //depot/projects/pci/sys/ia64/ia64/iodev_machdep.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/machdep.c#11 integrate
.. //depot/projects/pci/sys/ia64/ia64/nexus.c#7 integrate
.. //depot/projects/pci/sys/ia64/ia64/pmap.c#16 integrate
.. //depot/projects/pci/sys/ia64/ia64/sal.c#4 integrate
.. //depot/projects/pci/sys/ia64/ia64/trap.c#6 integrate
.. //depot/projects/pci/sys/ia64/include/efi.h#5 delete
.. //depot/projects/pci/sys/modules/ctl/Makefile#4 integrate
.. //depot/projects/pci/sys/netinet/if_ether.c#12 integrate
.. //depot/projects/pci/sys/netinet/in.c#13 integrate
.. //depot/projects/pci/sys/sys/efi.h#1 branch
.. //depot/projects/pci/sys/x86/acpica/madt.c#7 integrate
Differences ...
==== //depot/projects/pci/sys/amd64/amd64/machdep.c#15 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 263620 2014-03-22 10:26:09Z bdrewery $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 263822 2014-03-27 18:23:02Z emaste $");
#include "opt_atpic.h"
#include "opt_compat.h"
@@ -63,6 +63,7 @@
#include <sys/callout.h>
#include <sys/cons.h>
#include <sys/cpu.h>
+#include <sys/efi.h>
#include <sys/eventhandler.h>
#include <sys/exec.h>
#include <sys/imgact.h>
@@ -1431,10 +1432,105 @@
}
}
+#define efi_next_descriptor(ptr, size) \
+ ((struct efi_md *)(((uint8_t *) ptr) + size))
+
+static void
+add_efi_map_entries(struct efi_map_header *efihdr, vm_paddr_t *physmap,
+ int *physmap_idx)
+{
+ struct efi_md *map, *p;
+ const char *type;
+ size_t efisz;
+ int ndesc, i;
+
+ static const char *types[] = {
+ "Reserved",
+ "LoaderCode",
+ "LoaderData",
+ "BootServicesCode",
+ "BootServicesData",
+ "RuntimeServicesCode",
+ "RuntimeServicesData",
+ "ConventionalMemory",
+ "UnusableMemory",
+ "ACPIReclaimMemory",
+ "ACPIMemoryNVS",
+ "MemoryMappedIO",
+ "MemoryMappedIOPortSpace",
+ "PalCode"
+ };
+
+ /*
+ * Memory map data provided by UEFI via the GetMemoryMap
+ * Boot Services API.
+ */
+ efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf;
+ map = (struct efi_md *)((uint8_t *)efihdr + efisz);
+
+ if (efihdr->descriptor_size == 0)
+ return;
+ ndesc = efihdr->memory_size / efihdr->descriptor_size;
+
+ if (boothowto & RB_VERBOSE)
+ printf("%23s %12s %12s %8s %4s\n",
+ "Type", "Physical", "Virtual", "#Pages", "Attr");
+
+ for (i = 0, p = map; i < ndesc; i++,
+ p = efi_next_descriptor(p, efihdr->descriptor_size)) {
+ if (boothowto & RB_VERBOSE) {
+ if (p->md_type <= EFI_MD_TYPE_PALCODE)
+ type = types[p->md_type];
+ else
+ type = "<INVALID>";
+ printf("%23s %012lx %12p %08lx ", type, p->md_phys,
+ p->md_virt, p->md_pages);
+ if (p->md_attr & EFI_MD_ATTR_UC)
+ printf("UC ");
+ if (p->md_attr & EFI_MD_ATTR_WC)
+ printf("WC ");
+ if (p->md_attr & EFI_MD_ATTR_WT)
+ printf("WT ");
+ if (p->md_attr & EFI_MD_ATTR_WB)
+ printf("WB ");
+ if (p->md_attr & EFI_MD_ATTR_UCE)
+ printf("UCE ");
+ if (p->md_attr & EFI_MD_ATTR_WP)
+ printf("WP ");
+ if (p->md_attr & EFI_MD_ATTR_RP)
+ printf("RP ");
+ if (p->md_attr & EFI_MD_ATTR_XP)
+ printf("XP ");
+ if (p->md_attr & EFI_MD_ATTR_RT)
+ printf("RUNTIME");
+ printf("\n");
+ }
+
+ switch (p->md_type) {
+ case EFI_MD_TYPE_CODE:
+ case EFI_MD_TYPE_DATA:
+ case EFI_MD_TYPE_BS_CODE:
+ case EFI_MD_TYPE_BS_DATA:
+ case EFI_MD_TYPE_FREE:
+ /*
+ * We're allowed to use any entry with these types.
+ */
+ break;
+ default:
+ continue;
+ }
+
+ if (!add_physmap_entry(p->md_phys, (p->md_pages * PAGE_SIZE),
+ physmap, physmap_idx))
+ break;
+ }
+}
+
static void
native_parse_memmap(caddr_t kmdp, vm_paddr_t *physmap, int *physmap_idx)
{
struct bios_smap *smap;
+ struct efi_map_header *efihdr;
u_int32_t size;
/*
@@ -1445,13 +1541,19 @@
* ie: an int32_t immediately precedes smap.
*/
+ efihdr = (struct efi_map_header *)preload_search_info(kmdp,
+ MODINFO_METADATA | MODINFOMD_EFI_MAP);
smap = (struct bios_smap *)preload_search_info(kmdp,
MODINFO_METADATA | MODINFOMD_SMAP);
- if (smap == NULL)
- panic("No BIOS smap info from loader!");
- size = *((u_int32_t *)smap - 1);
+ if (efihdr == NULL && smap == NULL)
+ panic("No BIOS smap or EFI map info from loader!");
- bios_add_smap_entries(smap, size, physmap, physmap_idx);
+ if (efihdr != NULL) {
+ add_efi_map_entries(efihdr, physmap, physmap_idx);
+ } else {
+ size = *((u_int32_t *)smap - 1);
+ bios_add_smap_entries(smap, size, physmap, physmap_idx);
+ }
}
/*
==== //depot/projects/pci/sys/amd64/include/metadata.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/include/metadata.h 250840 2013-05-21 03:05:49Z marcel $
+ * $FreeBSD: head/sys/amd64/include/metadata.h 263826 2014-03-27 19:43:38Z emaste $
*/
#ifndef _MACHINE_METADATA_H_
@@ -32,5 +32,25 @@
#define MODINFOMD_SMAP 0x1001
#define MODINFOMD_SMAP_XATTR 0x1002
#define MODINFOMD_DTBP 0x1003
+#define MODINFOMD_EFI_MAP 0x1004
+#define MODINFOMD_EFI_FB 0x1005
+
+struct efi_map_header {
+ size_t memory_size;
+ size_t descriptor_size;
+ uint32_t descriptor_version;
+};
+
+struct efi_fb {
+ uint64_t fb_addr;
+ uint64_t fb_size;
+ int fb_height;
+ int fb_width;
+ int fb_stride;
+ uint32_t fb_mask_red;
+ uint32_t fb_mask_green;
+ uint32_t fb_mask_blue;
+ uint32_t fb_mask_reserved;
+};
#endif /* !_MACHINE_METADATA_H_ */
==== //depot/projects/pci/sys/amd64/include/vmm.h#11 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/include/vmm.h 263744 2014-03-25 19:20:34Z tychon $
+ * $FreeBSD: head/sys/amd64/include/vmm.h 263780 2014-03-26 23:34:27Z neel $
*/
#ifndef _VMM_H_
@@ -53,7 +53,8 @@
typedef void (*vmm_resume_func_t)(void);
typedef void * (*vmi_init_func_t)(struct vm *vm, struct pmap *pmap);
typedef int (*vmi_run_func_t)(void *vmi, int vcpu, register_t rip,
- struct pmap *pmap, void *rendezvous_cookie);
+ struct pmap *pmap, void *rendezvous_cookie,
+ void *suspend_cookie);
typedef void (*vmi_cleanup_func_t)(void *vmi);
typedef int (*vmi_get_register_t)(void *vmi, int vcpu, int num,
uint64_t *retval);
@@ -114,6 +115,7 @@
int vm_set_seg_desc(struct vm *vm, int vcpu, int reg,
struct seg_desc *desc);
int vm_run(struct vm *vm, struct vm_run *vmrun);
+int vm_suspend(struct vm *vm);
int vm_inject_nmi(struct vm *vm, int vcpu);
int vm_nmi_pending(struct vm *vm, int vcpuid);
void vm_nmi_clear(struct vm *vm, int vcpuid);
@@ -158,6 +160,13 @@
return (*(uintptr_t *)rendezvous_cookie != 0);
}
+static __inline int
+vcpu_suspended(void *suspend_cookie)
+{
+
+ return (*(int *)suspend_cookie);
+}
+
/*
* Return 1 if device indicated by bus/slot/func is supposed to be a
* pci passthrough device.
@@ -311,6 +320,7 @@
VM_EXITCODE_SPINDOWN_CPU,
VM_EXITCODE_RENDEZVOUS,
VM_EXITCODE_IOAPIC_EOI,
+ VM_EXITCODE_SUSPENDED,
VM_EXITCODE_MAX
};
==== //depot/projects/pci/sys/amd64/include/vmm_dev.h#8 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/include/vmm_dev.h 263035 2014-03-11 16:56:00Z tychon $
+ * $FreeBSD: head/sys/amd64/include/vmm_dev.h 263780 2014-03-26 23:34:27Z neel $
*/
#ifndef _VMM_DEV_H_
@@ -165,6 +165,7 @@
IOCNUM_RUN = 1,
IOCNUM_SET_CAPABILITY = 2,
IOCNUM_GET_CAPABILITY = 3,
+ IOCNUM_SUSPEND = 4,
/* memory apis */
IOCNUM_MAP_MEMORY = 10,
@@ -212,6 +213,8 @@
#define VM_RUN \
_IOWR('v', IOCNUM_RUN, struct vm_run)
+#define VM_SUSPEND \
+ _IO('v', IOCNUM_SUSPEND)
#define VM_MAP_MEMORY \
_IOWR('v', IOCNUM_MAP_MEMORY, struct vm_memory_segment)
#define VM_GET_MEMORY_SEG \
==== //depot/projects/pci/sys/amd64/vmm/amd/amdv.c#7 (text+ko) ====
@@ -23,11 +23,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/amd/amdv.c 262506 2014-02-26 00:52:05Z neel $
+ * $FreeBSD: head/sys/amd64/vmm/amd/amdv.c 263780 2014-03-26 23:34:27Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/amd/amdv.c 262506 2014-02-26 00:52:05Z neel $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/amd/amdv.c 263780 2014-03-26 23:34:27Z neel $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,8 @@
}
static int
-amdv_vmrun(void *arg, int vcpu, register_t rip, struct pmap *pmap, void *cookie)
+amdv_vmrun(void *arg, int vcpu, register_t rip, struct pmap *pmap,
+ void *rptr, void *sptr)
{
printf("amdv_vmrun: not implemented\n");
==== //depot/projects/pci/sys/amd64/vmm/intel/vmx.c#15 (text+ko) ====
@@ -23,11 +23,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 263211 2014-03-15 23:09:34Z tychon $
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 263780 2014-03-26 23:34:27Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 263211 2014-03-15 23:09:34Z tychon $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 263780 2014-03-26 23:34:27Z neel $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2038,6 +2038,16 @@
}
static __inline int
+vmx_exit_suspended(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
+{
+
+ vmexit->rip = vmcs_guest_rip();
+ vmexit->inst_length = 0;
+ vmexit->exitcode = VM_EXITCODE_SUSPENDED;
+ return (UNHANDLED);
+}
+
+static __inline int
vmx_exit_inst_error(struct vmxctx *vmxctx, int rc, struct vm_exit *vmexit)
{
@@ -2097,7 +2107,7 @@
static int
vmx_run(void *arg, int vcpu, register_t startrip, pmap_t pmap,
- void *rendezvous_cookie)
+ void *rendezvous_cookie, void *suspend_cookie)
{
int rc, handled, launched;
struct vmx *vmx;
@@ -2154,9 +2164,9 @@
* pmap_invalidate_ept().
*/
disable_intr();
- if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) {
+ if (vcpu_suspended(suspend_cookie)) {
enable_intr();
- handled = vmx_exit_astpending(vmx, vcpu, vmexit);
+ handled = vmx_exit_suspended(vmx, vcpu, vmexit);
break;
}
@@ -2166,6 +2176,12 @@
break;
}
+ if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) {
+ enable_intr();
+ handled = vmx_exit_astpending(vmx, vcpu, vmexit);
+ break;
+ }
+
vmx_inject_interrupts(vmx, vcpu, vlapic);
vmx_run_trace(vmx, vcpu);
rc = vmx_enter_guest(vmxctx, vmx, launched);
==== //depot/projects/pci/sys/amd64/vmm/vmm.c#13 (text+ko) ====
@@ -23,11 +23,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/vmm.c 263744 2014-03-25 19:20:34Z tychon $
+ * $FreeBSD: head/sys/amd64/vmm/vmm.c 263780 2014-03-26 23:34:27Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 263744 2014-03-25 19:20:34Z tychon $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 263780 2014-03-26 23:34:27Z neel $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,6 +139,9 @@
cpuset_t rendezvous_done_cpus;
void *rendezvous_arg;
vm_rendezvous_func_t rendezvous_func;
+
+ int suspend;
+ volatile cpuset_t suspended_cpus;
};
static int vmm_initialized;
@@ -149,8 +152,8 @@
#define VMM_RESUME() (ops != NULL ? (*ops->resume)() : 0)
#define VMINIT(vm, pmap) (ops != NULL ? (*ops->vminit)(vm, pmap): NULL)
-#define VMRUN(vmi, vcpu, rip, pmap, rptr) \
- (ops != NULL ? (*ops->vmrun)(vmi, vcpu, rip, pmap, rptr) : ENXIO)
+#define VMRUN(vmi, vcpu, rip, pmap, rptr, sptr) \
+ (ops != NULL ? (*ops->vmrun)(vmi, vcpu, rip, pmap, rptr, sptr) : ENXIO)
#define VMCLEANUP(vmi) (ops != NULL ? (*ops->vmcleanup)(vmi) : NULL)
#define VMSPACE_ALLOC(min, max) \
(ops != NULL ? (*ops->vmspace_alloc)(min, max) : NULL)
@@ -1019,7 +1022,8 @@
* These interrupts could have happened any time after we
* returned from VMRUN() and before we grabbed the vcpu lock.
*/
- if (!vm_nmi_pending(vm, vcpuid) &&
+ if (vm->rendezvous_func == NULL &&
+ !vm_nmi_pending(vm, vcpuid) &&
(intr_disabled || !vlapic_pending_intr(vcpu->vlapic, NULL))) {
t = ticks;
vcpu_require_state_locked(vcpu, VCPU_SLEEPING);
@@ -1152,7 +1156,72 @@
return (error);
}
+static int
+vm_handle_suspend(struct vm *vm, int vcpuid, bool *retu)
+{
+ int i, done;
+ struct vcpu *vcpu;
+
+ done = 0;
+ vcpu = &vm->vcpu[vcpuid];
+
+ CPU_SET_ATOMIC(vcpuid, &vm->suspended_cpus);
+
+ /*
+ * Wait until all 'active_cpus' have suspended themselves.
+ *
+ * Since a VM may be suspended at any time including when one or
+ * more vcpus are doing a rendezvous we need to call the rendezvous
+ * handler while we are waiting to prevent a deadlock.
+ */
+ vcpu_lock(vcpu);
+ while (1) {
+ if (CPU_CMP(&vm->suspended_cpus, &vm->active_cpus) == 0) {
+ VCPU_CTR0(vm, vcpuid, "All vcpus suspended");
+ break;
+ }
+
+ if (vm->rendezvous_func == NULL) {
+ VCPU_CTR0(vm, vcpuid, "Sleeping during suspend");
+ vcpu_require_state_locked(vcpu, VCPU_SLEEPING);
+ msleep_spin(vcpu, &vcpu->mtx, "vmsusp", hz);
+ vcpu_require_state_locked(vcpu, VCPU_FROZEN);
+ } else {
+ VCPU_CTR0(vm, vcpuid, "Rendezvous during suspend");
+ vcpu_unlock(vcpu);
+ vm_handle_rendezvous(vm, vcpuid);
+ vcpu_lock(vcpu);
+ }
+ }
+ vcpu_unlock(vcpu);
+
+ /*
+ * Wakeup the other sleeping vcpus and return to userspace.
+ */
+ for (i = 0; i < VM_MAXCPU; i++) {
+ if (CPU_ISSET(i, &vm->suspended_cpus)) {
+ vcpu_notify_event(vm, i, false);
+ }
+ }
+
+ *retu = true;
+ return (0);
+}
+
int
+vm_suspend(struct vm *vm)
+{
+
+ if (atomic_cmpset_int(&vm->suspend, 0, 1)) {
+ VM_CTR0(vm, "virtual machine suspended");
+ return (0);
+ } else {
+ VM_CTR0(vm, "virtual machine already suspended");
+ return (EALREADY);
+ }
+}
+
+int
vm_run(struct vm *vm, struct vm_run *vmrun)
{
int error, vcpuid;
@@ -1162,12 +1231,15 @@
struct vm_exit *vme;
bool retu, intr_disabled;
pmap_t pmap;
+ void *rptr, *sptr;
vcpuid = vmrun->cpuid;
if (vcpuid < 0 || vcpuid >= VM_MAXCPU)
return (EINVAL);
+ rptr = &vm->rendezvous_func;
+ sptr = &vm->suspend;
pmap = vmspace_pmap(vm->vmspace);
vcpu = &vm->vcpu[vcpuid];
vme = &vcpu->exitinfo;
@@ -1187,7 +1259,7 @@
restore_guest_fpustate(vcpu);
vcpu_require_state(vm, vcpuid, VCPU_RUNNING);
- error = VMRUN(vm->cookie, vcpuid, rip, pmap, &vm->rendezvous_func);
+ error = VMRUN(vm->cookie, vcpuid, rip, pmap, rptr, sptr);
vcpu_require_state(vm, vcpuid, VCPU_FROZEN);
save_guest_fpustate(vcpu);
@@ -1200,6 +1272,9 @@
if (error == 0) {
retu = false;
switch (vme->exitcode) {
+ case VM_EXITCODE_SUSPENDED:
+ error = vm_handle_suspend(vm, vcpuid, &retu);
+ break;
case VM_EXITCODE_IOAPIC_EOI:
vioapic_process_eoi(vm, vcpuid,
vme->u.ioapic_eoi.vector);
==== //depot/projects/pci/sys/amd64/vmm/vmm_dev.c#9 (text+ko) ====
@@ -23,11 +23,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/vmm_dev.c 263035 2014-03-11 16:56:00Z tychon $
+ * $FreeBSD: head/sys/amd64/vmm/vmm_dev.c 263780 2014-03-26 23:34:27Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_dev.c 263035 2014-03-11 16:56:00Z tychon $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_dev.c 263780 2014-03-26 23:34:27Z neel $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -239,6 +239,9 @@
vmrun = (struct vm_run *)data;
error = vm_run(sc->vm, vmrun);
break;
+ case VM_SUSPEND:
+ error = vm_suspend(sc->vm);
+ break;
case VM_STAT_DESC: {
statdesc = (struct vm_stat_desc *)data;
error = vmm_stat_desc_copy(statdesc->index,
==== //depot/projects/pci/sys/cam/ctl/README.ctl.txt#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/cam/ctl/README.ctl.txt 249009 2013-04-02 09:42:42Z trasz $ */
+/* $FreeBSD: head/sys/cam/ctl/README.ctl.txt 263811 2014-03-27 11:10:13Z trasz $ */
CTL - CAM Target Layer Description
@@ -394,14 +394,6 @@
This defines all ioctls available through the CTL character device, and
the data structures needed for those ioctls.
-ctl_mem_pool.c
-ctl_mem_pool.h:
---------------
-
-Generic memory pool implementation. This is currently only used by the
-internal frontend. The internal frontend can probably be rewritten to use
-UMA zones and this can be removed.
-
ctl_private.h:
-------------
==== //depot/projects/pci/sys/cam/ctl/ctl_frontend_cam_sim.c#5 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_frontend_cam_sim.c 256843 2013-10-21 12:00:26Z mav $");
+__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_frontend_cam_sim.c 263811 2014-03-27 11:10:13Z trasz $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,6 @@
#include <cam/ctl/ctl.h>
#include <cam/ctl/ctl_frontend.h>
#include <cam/ctl/ctl_frontend_internal.h>
-#include <cam/ctl/ctl_mem_pool.h>
#include <cam/ctl/ctl_debug.h>
#define io_ptr spriv_ptr1
==== //depot/projects/pci/sys/cam/ctl/ctl_frontend_internal.c#5 (text+ko) ====
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_frontend_internal.c 253987 2013-08-06 10:42:18Z trasz $");
+__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_frontend_internal.c 263811 2014-03-27 11:10:13Z trasz $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,6 +62,7 @@
#include <sys/queue.h>
#include <sys/sbuf.h>
#include <sys/sysctl.h>
+#include <vm/uma.h>
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_da.h>
#include <cam/ctl/ctl_io.h>
@@ -73,7 +74,6 @@
#include <cam/ctl/ctl_util.h>
#include <cam/ctl/ctl_ha.h>
#include <cam/ctl/ctl_private.h>
-#include <cam/ctl/ctl_mem_pool.h>
#include <cam/ctl/ctl_debug.h>
#include <cam/ctl/ctl_scsi_all.h>
#include <cam/ctl/ctl_error.h>
@@ -118,7 +118,6 @@
cfi_tasktype tasktype;
cfi_mt_status status;
union cfi_taskinfo taskinfo;
- struct ctl_mem_element *element;
void *cfi_context;
STAILQ_ENTRY(cfi_metatask) links;
};
@@ -153,7 +152,6 @@
int blocksize_powerof2;
uint32_t cur_tag_num;
cfi_lun_state state;
- struct ctl_mem_element *element;
struct cfi_softc *softc;
STAILQ_HEAD(, cfi_lun_io) io_list;
STAILQ_ENTRY(cfi_lun) links;
@@ -181,12 +179,13 @@
cfi_flags flags;
STAILQ_HEAD(, cfi_lun) lun_list;
STAILQ_HEAD(, cfi_metatask) metatask_list;
- struct ctl_mem_pool lun_pool;
- struct ctl_mem_pool metatask_pool;
};
MALLOC_DEFINE(M_CTL_CFI, "ctlcfi", "CTL CFI");
+static uma_zone_t cfi_lun_zone;
+static uma_zone_t cfi_metatask_zone;
+
static struct cfi_softc fetd_internal_softc;
int cfi_init(void);
@@ -275,48 +274,15 @@
if (ctl_frontend_register(fe, (softc->flags & CTL_FLAG_MASTER_SHELF)) != 0)
{
printf("%s: internal frontend registration failed\n", __func__);
- retval = 1;
- goto bailout;
+ return (0);
}
- if (ctl_init_mem_pool(&softc->lun_pool,
- sizeof(struct cfi_lun),
- CTL_MEM_POOL_PERM_GROW, /*grow_inc*/ 3,
- /* initial_pool_size */ CTL_MAX_LUNS) != 0) {
- printf("%s: can't initialize LUN memory pool\n", __func__);
- retval = 1;
- goto bailout_error;
- }
+ cfi_lun_zone = uma_zcreate("cfi_lun", sizeof(struct cfi_lun),
+ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
+ cfi_metatask_zone = uma_zcreate("cfi_metatask", sizeof(struct cfi_metatask),
+ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
- if (ctl_init_mem_pool(&softc->metatask_pool,
- sizeof(struct cfi_metatask),
- CTL_MEM_POOL_PERM_GROW, /*grow_inc*/ 3,
- /*initial_pool_size*/ 10) != 0) {
- printf("%s: can't initialize metatask memory pool\n", __func__);
- retval = 2;
- goto bailout_error;
- }
-bailout:
-
return (0);
-
-bailout_error:
-
- switch (retval) {
- case 3:
- ctl_shrink_mem_pool(&softc->metatask_pool);
- /* FALLTHROUGH */
- case 2:
- ctl_shrink_mem_pool(&softc->lun_pool);
- /* FALLTHROUGH */
- case 1:
- ctl_frontend_deregister(fe);
- break;
- default:
- break;
- }
-
- return (ENOMEM);
}
void
@@ -332,11 +298,8 @@
if (ctl_frontend_deregister(&softc->fe) != 0)
printf("%s: ctl_frontend_deregister() failed\n", __func__);
- if (ctl_shrink_mem_pool(&softc->lun_pool) != 0)
- printf("%s: error shrinking LUN pool\n", __func__);
-
- if (ctl_shrink_mem_pool(&softc->metatask_pool) != 0)
- printf("%s: error shrinking LUN pool\n", __func__);
+ uma_zdestroy(cfi_lun_zone);
+ uma_zdestroy(cfi_metatask_zone);
}
static int
@@ -398,7 +361,6 @@
static int
cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
{
- struct ctl_mem_element *element;
struct cfi_softc *softc;
struct cfi_lun *lun;
int found;
@@ -423,16 +385,12 @@
if (found != 0)
return (0);
- element = ctl_alloc_mem_element(&softc->lun_pool, /*can_wait*/ 0);
-
- if (element == NULL) {
+ lun = uma_zalloc(cfi_lun_zone, M_NOWAIT | M_ZERO);
+ if (lun == NULL) {
printf("%s: unable to allocate LUN structure\n", __func__);
return (1);
}
- lun = (struct cfi_lun *)element->bytes;
-
- lun->element = element;
lun->target_id = target_id;
lun->lun_id = lun_id;
lun->cur_tag_num = 0;
@@ -485,7 +443,7 @@
return (1);
}
- ctl_free_mem_element(lun->element);
+ uma_zfree(cfi_lun_zone, lun);
return (0);
}
@@ -1682,106 +1640,20 @@
}
}
-#ifdef oldapi
-void
-cfi_shutdown_shelf(cfi_cb_t callback, void *callback_arg)
-{
- struct ctl_mem_element *element;
- struct cfi_softc *softc;
- struct cfi_metatask *metatask;
-
- softc = &fetd_internal_softc;
-
- element = ctl_alloc_mem_element(&softc->metatask_pool, /*can_wait*/ 0);
- if (element == NULL) {
- callback(callback_arg,
- /*status*/ CFI_MT_ERROR,
- /*sluns_found*/ 0,
- /*sluns_complete*/ 0,
- /*sluns_failed*/ 0);
- return;
- }
-
- metatask = (struct cfi_metatask *)element->bytes;
-
- memset(metatask, 0, sizeof(*metatask));
- metatask->tasktype = CFI_TASK_SHUTDOWN;
- metatask->status = CFI_MT_NONE;
- metatask->taskinfo.startstop.callback = callback;
- metatask->taskinfo.startstop.callback_arg = callback_arg;
- metatask->element = element;
-
- cfi_action(softc, metatask);
-
- /*
- * - send a report luns to lun 0, get LUN list.
- * - send an inquiry to each lun
- * - send a stop/offline to each direct access LUN
- * - if we get a reservation conflict, reset the LUN and then
- * retry sending the stop/offline
- * - return status back to the caller
- */
-}
-
-void
-cfi_start_shelf(cfi_cb_t callback, void *callback_arg)
-{
- struct ctl_mem_element *element;
- struct cfi_softc *softc;
- struct cfi_metatask *metatask;
-
- softc = &fetd_internal_softc;
-
- element = ctl_alloc_mem_element(&softc->metatask_pool, /*can_wait*/ 0);
- if (element == NULL) {
- callback(callback_arg,
- /*status*/ CFI_MT_ERROR,
- /*sluns_found*/ 0,
- /*sluns_complete*/ 0,
- /*sluns_failed*/ 0);
- return;
- }
-
- metatask = (struct cfi_metatask *)element->bytes;
-
- memset(metatask, 0, sizeof(*metatask));
- metatask->tasktype = CFI_TASK_STARTUP;
- metatask->status = CFI_MT_NONE;
- metatask->taskinfo.startstop.callback = callback;
- metatask->taskinfo.startstop.callback_arg = callback_arg;
- metatask->element = element;
-
- cfi_action(softc, metatask);
-
- /*
- * - send a report luns to lun 0, get LUN list.
- * - send an inquiry to each lun
- * - send a stop/offline to each direct access LUN
- * - if we get a reservation conflict, reset the LUN and then
- * retry sending the stop/offline
- * - return status back to the caller
- */
-}
-
-#endif
-
struct cfi_metatask *
cfi_alloc_metatask(int can_wait)
{
- struct ctl_mem_element *element;
struct cfi_metatask *metatask;
struct cfi_softc *softc;
softc = &fetd_internal_softc;
- element = ctl_alloc_mem_element(&softc->metatask_pool, can_wait);
- if (element == NULL)
+ metatask = uma_zalloc(cfi_metatask_zone,
+ (can_wait ? M_WAITOK : M_NOWAIT) | M_ZERO);
+ if (metatask == NULL)
return (NULL);
- metatask = (struct cfi_metatask *)element->bytes;
- memset(metatask, 0, sizeof(*metatask));
metatask->status = CFI_MT_NONE;
- metatask->element = element;
return (metatask);
}
@@ -1789,7 +1661,8 @@
void
cfi_free_metatask(struct cfi_metatask *metatask)
{
- ctl_free_mem_element(metatask->element);
+
+ uma_zfree(cfi_metatask_zone, metatask);
}
/*
==== //depot/projects/pci/sys/cam/ctl/ctl_frontend_iscsi.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/cam/ctl/ctl_frontend_iscsi.c 263745 2014-03-25 19:28:40Z trasz $
+ * $FreeBSD: head/sys/cam/ctl/ctl_frontend_iscsi.c 263810 2014-03-27 10:15:35Z trasz $
*/
/*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_frontend_iscsi.c 263745 2014-03-25 19:28:40Z trasz $");
+__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_frontend_iscsi.c 263810 2014-03-27 10:15:35Z trasz $");
#include <sys/param.h>
#include <sys/capsicum.h>
@@ -2315,8 +2315,8 @@
const struct iscsi_bhs_scsi_command *bhssc;
struct iscsi_bhs_data_in *bhsdi;
struct ctl_sg_entry ctl_sg_entry, *ctl_sglist;
- size_t copy_len, len, off;
- const char *addr;
+ size_t len, expected_len, sg_len, buffer_offset;
+ const char *sg_addr;
int ctl_sg_count, error, i;
request = io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
@@ -2338,26 +2338,49 @@
}
/*
- * We need to record it so that we can properly report
+ * This is the total amount of data to be transferred within the current
+ * SCSI command. We need to record it so that we can properly report
* underflow/underflow.
*/
PDU_TOTAL_TRANSFER_LEN(request) = io->scsiio.kern_total_len;
/*
- * This is the offset within the current SCSI command;
- * i.e. for the first call of datamove(), it will be 0,
- * and for subsequent ones it will be the sum of lengths
- * of previous ones.
+ * This is the offset within the current SCSI command; for the first
+ * call to cfiscsi_datamove() it will be 0, and for subsequent ones
+ * it will be the sum of lengths of previous ones. It's being
+ * incremented as we append data to the data segment.
+ */
+ buffer_offset = io->scsiio.kern_rel_offset;
+
+ /*
+ * This is the transfer length expected by the initiator. In theory,
+ * it could be different from the correct amount of data from the SCSI
+ * point of view, even if that doesn't make any sense.
*/
- off = htonl(io->scsiio.kern_rel_offset);
+ expected_len = ntohl(bhssc->bhssc_expected_data_transfer_length);
+#if 0
+ if (expected_len != io->scsiio.kern_total_len)
+ CFISCSI_SESSION_DEBUG(cs, "expected transfer length = %zd, "
+ "actual length = %zd", expected_len,
+ io->scsiio.kern_total_len);
+#endif
+
+ if (buffer_offset >= expected_len) {
+#if 0
+ CFISCSI_SESSION_DEBUG(cs, "buffer_offset = %zd, "
+ "already sent the expected len", buffer_offset);
+#endif
+ io->scsiio.ext_data_filled = io->scsiio.kern_total_len;
+ io->scsiio.be_move_done(io);
+ return;
+ }
i = 0;
- addr = NULL;
- len = 0;
+ sg_addr = NULL;
+ sg_len = 0;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Apr 14 22:33:00 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 934A232F; Mon, 14 Apr 2014 22:33:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 3D04432D
for <perforce@freebsd.org>; Mon, 14 Apr 2014 22:33:00 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 2869915D9
for <perforce@freebsd.org>; Mon, 14 Apr 2014 22:33:00 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s3EMWx08084361
for <perforce@freebsd.org>; Mon, 14 Apr 2014 22:33:00 GMT
(envelope-from brueffer@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s3EMWxPb084358
for perforce@freebsd.org; Mon, 14 Apr 2014 22:32:59 GMT
(envelope-from brueffer@freebsd.org)
Date: Mon, 14 Apr 2014 22:32:59 GMT
Message-Id: <201404142232.s3EMWxPb084358@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brueffer@freebsd.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Subject: PERFORCE change 1192820 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Apr 2014 22:33:00 -0000
http://p4web.freebsd.org/@@1192820?ac=10
Change 1192820 by brueffer@brueffer_freefall on 2014/04/14 22:32:54
Check readlink() return value; auditd_expire_trails() may return ADE_READLINK
now.
While here, fix a comment typo.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#19 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#19 (text+ko) ====
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#18 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#19 $
*/
#include <sys/param.h>
@@ -402,12 +402,13 @@
* ADE_NOERR on success or there is nothing to do.
* ADE_PARSE if error parsing audit_control(5).
* ADE_NOMEM if could not allocate memory.
- * ADE_EXPIRE if there was an unespected error.
+ * ADE_READLINK if could not read link file.
+ * ADE_EXPIRE if there was an unexpected error.
*/
int
auditd_expire_trails(int (*warn_expired)(char *))
{
- int andflg, ret = ADE_NOERR;
+ int andflg, len, ret = ADE_NOERR;
size_t expire_size, total_size = 0L;
time_t expire_age, oldest_time, current_time = time(NULL);
struct dir_ent *traildir;
@@ -431,7 +432,9 @@
* Read the 'current' trail file name. Trim off directory path.
*/
activefn[0] = '\0';
- readlink(AUDIT_CURRENT_LINK, activefn, MAXPATHLEN - 1);
+ len = readlink(AUDIT_CURRENT_LINK, activefn, MAXPATHLEN - 1);
+ if (len < 0)
+ return (ADE_READLINK);
if ((afnp = strrchr(activefn, '/')) != NULL)
afnp++;
From owner-p4-projects@FreeBSD.ORG Tue Apr 15 07:19:33 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 2EBF1E63; Tue, 15 Apr 2014 07:19:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id E4BF3E61
for <perforce@freebsd.org>; Tue, 15 Apr 2014 07:19:32 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 CFF33156C
for <perforce@freebsd.org>; Tue, 15 Apr 2014 07:19:32 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s3F7JWGf000931
for <perforce@freebsd.org>; Tue, 15 Apr 2014 07:19:32 GMT
(envelope-from brueffer@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s3F7JWLG000928
for perforce@freebsd.org; Tue, 15 Apr 2014 07:19:32 GMT
(envelope-from brueffer@freebsd.org)
Date: Tue, 15 Apr 2014 07:19:32 GMT
Message-Id: <201404150719.s3F7JWLG000928@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brueffer@freebsd.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Subject: PERFORCE change 1192827 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Apr 2014 07:19:33 -0000
http://p4web.freebsd.org/@@1192827?ac=10
Change 1192827 by brueffer@brueffer_freefall on 2014/04/15 07:19:31
Add missing break statement.
CID: 1017877
Found with: Coverity Prevent(tm)
Affected files ...
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#78 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#78 (text+ko) ====
@@ -32,7 +32,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#77 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#78 $
*/
#include <sys/types.h>
@@ -596,6 +596,7 @@
case AUT_SOCKINET128:
fprintf(fp, "<socket-inet6 ");
+ break;
case AUT_SUBJECT32:
fprintf(fp, "<subject ");
From owner-p4-projects@FreeBSD.ORG Tue May 6 19:57:35 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id AEBA5B5B; Tue, 6 May 2014 19:57:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 51113A82
for <perforce@freebsd.org>; Tue, 6 May 2014 19:57:35 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 3C271C8A
for <perforce@freebsd.org>; Tue, 6 May 2014 19:57:35 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s46JvZdA099591
for <perforce@freebsd.org>; Tue, 6 May 2014 19:57:35 GMT
(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s46JvZi0099588
for perforce@freebsd.org; Tue, 6 May 2014 19:57:35 GMT
(envelope-from brooks@freebsd.org)
Date: Tue, 6 May 2014 19:57:35 GMT
Message-Id: <201405061957.s46JvZi0099588@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 1193465 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 May 2014 19:57:35 -0000
http://p4web.freebsd.org/@@1193465?ac=10
Change 1193465 by brooks@brooks_zenith on 2014/05/06 19:57:19
Use the soaap script rather than opt.
Compile with O1 when using SOAAP.
Affected files ...
.. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#19 edit
Differences ...
==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#19 (text+ko) ====
@@ -250,7 +250,7 @@
${CTFCONVERT_CMD}
.c.obc:
- ${CC} ${CFLAGS:N-O*} -emit-llvm -c ${.IMPSRC} -o ${.TARGET}
+ ${CC} ${CFLAGS:N-O*} -O1 -emit-llvm -c ${.IMPSRC} -o ${.TARGET}
.c.oll:
${CC} ${CFLAGS:N-O*} -emit-llvm -S ${.IMPSRC} -o ${.TARGET}
@@ -298,8 +298,7 @@
.endif
.${LLVM_IR_TYPE}-a.soaap:
- ${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap ${SOAAP_FLAGS} \
- -o /dev/null ${.IMPSRC}
+ ${SOAAP} ${SOAAP_FLAGS} -o /dev/null ${.IMPSRC}
.${LLVM_IR_TYPE}-a.bc_cep:
${OPT} -load ${SOAAP_LIB_DIR}/libcep.so -insert-call-edge-profiling \
From owner-p4-projects@FreeBSD.ORG Tue May 6 19:57:35 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 70689A84; Tue, 6 May 2014 19:57:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 320C5A81
for <perforce@freebsd.org>; Tue, 6 May 2014 19:57:35 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 1D0A1C89
for <perforce@freebsd.org>; Tue, 6 May 2014 19:57:35 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s46JvY3w099585
for <perforce@freebsd.org>; Tue, 6 May 2014 19:57:34 GMT
(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s46JvYGh099582
for perforce@freebsd.org; Tue, 6 May 2014 19:57:34 GMT
(envelope-from brooks@freebsd.org)
Date: Tue, 6 May 2014 19:57:34 GMT
Message-Id: <201405061957.s46JvYGh099582@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 1193464 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 May 2014 19:57:35 -0000
http://p4web.freebsd.org/@@1193464?ac=10
Change 1193464 by brooks@brooks_zenith on 2014/05/06 19:56:41
Force -g when building with SOAAP
Affected files ...
.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#16 edit
Differences ...
==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#16 (text+ko) ====
@@ -663,7 +663,7 @@
SOAAP_LIB_DIR=${SOAAP_BUILD_DIR}
.endif
.endif
-CFLAGS+= -DSOAAP -I${SOAAP_INCLUDE_DIR}
+CFLAGS+= -g -DSOAAP -I${SOAAP_INCLUDE_DIR}
.if defined(WITHOUT_LLVM_INSTRUMENTED)
.error WITHOUT_LLVM_INSTRUMENTED and WITH_SOAAP can't both be set.
.else
From owner-p4-projects@FreeBSD.ORG Sat May 17 11:48:26 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5593E2EE; Sat, 17 May 2014 11:48:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 144EA2EC
for <perforce@freebsd.org>; Sat, 17 May 2014 11:48:26 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 F21012943
for <perforce@freebsd.org>; Sat, 17 May 2014 11:48:25 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HBmP95097705
for <perforce@freebsd.org>; Sat, 17 May 2014 11:48:25 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s4HBmN36097699
for perforce@freebsd.org; Sat, 17 May 2014 11:48:23 GMT
(envelope-from jhb@freebsd.org)
Date: Sat, 17 May 2014 11:48:23 GMT
Message-Id: <201405171148.s4HBmN36097699@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1193907 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 May 2014 11:48:26 -0000
http://p4web.freebsd.org/@@1193907?ac=10
Change 1193907 by jhb@jhb_pippin on 2014/05/17 11:48:10
IFC @1193892
Affected files ...
.. //depot/projects/smpng/share/man/man9/EVENTHANDLER.9#8 integrate
.. //depot/projects/smpng/share/man/man9/Makefile#44 integrate
.. //depot/projects/smpng/share/man/man9/SDT.9#3 integrate
.. //depot/projects/smpng/share/man/man9/buf.9#3 integrate
.. //depot/projects/smpng/share/man/man9/bus_dma.9#6 integrate
.. //depot/projects/smpng/share/man/man9/bus_space.9#6 integrate
.. //depot/projects/smpng/share/man/man9/cd.9#4 integrate
.. //depot/projects/smpng/share/man/man9/counter.9#3 integrate
.. //depot/projects/smpng/share/man/man9/crypto.9#6 integrate
.. //depot/projects/smpng/share/man/man9/eventtimers.9#5 integrate
.. //depot/projects/smpng/share/man/man9/intro.9#3 integrate
.. //depot/projects/smpng/share/man/man9/mbuf.9#9 integrate
.. //depot/projects/smpng/share/man/man9/memguard.9#5 integrate
.. //depot/projects/smpng/share/man/man9/netisr.9#11 integrate
.. //depot/projects/smpng/share/man/man9/pget.9#1 branch
.. //depot/projects/smpng/share/man/man9/rtentry.9#5 integrate
.. //depot/projects/smpng/share/man/man9/vm_set_page_size.9#3 integrate
.. //depot/projects/smpng/sys/Makefile#31 integrate
.. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#26 integrate
.. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#37 integrate
.. //depot/projects/smpng/sys/amd64/amd64/fpu.c#31 integrate
.. //depot/projects/smpng/sys/amd64/amd64/genassym.c#41 integrate
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#52 integrate
.. //depot/projects/smpng/sys/amd64/amd64/locore.S#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#124 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mem.c#18 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#95 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mpboot.S#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#137 integrate
.. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#22 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#94 integrate
.. //depot/projects/smpng/sys/amd64/amd64/uio_machdep.c#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/uma_machdep.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#63 integrate
.. //depot/projects/smpng/sys/amd64/amd64/xen-locore.S#1 branch
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#112 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#12 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#77 integrate
.. //depot/projects/smpng/sys/amd64/conf/VT#2 integrate
.. //depot/projects/smpng/sys/amd64/include/asmacros.h#12 integrate
.. //depot/projects/smpng/sys/amd64/include/clock.h#19 integrate
.. //depot/projects/smpng/sys/amd64/include/fpu.h#11 integrate
.. //depot/projects/smpng/sys/amd64/include/md_var.h#30 integrate
.. //depot/projects/smpng/sys/amd64/include/metadata.h#6 integrate
.. //depot/projects/smpng/sys/amd64/include/param.h#34 integrate
.. //depot/projects/smpng/sys/amd64/include/pc/bios.h#7 integrate
.. //depot/projects/smpng/sys/amd64/include/pmap.h#50 integrate
.. //depot/projects/smpng/sys/amd64/include/smp.h#32 integrate
.. //depot/projects/smpng/sys/amd64/include/vmm.h#10 integrate
.. //depot/projects/smpng/sys/amd64/include/vmm_dev.h#8 integrate
.. //depot/projects/smpng/sys/amd64/include/xen/hypercall.h#3 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#43 integrate
.. //depot/projects/smpng/sys/amd64/vmm/amd/amdv.c#6 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#12 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.h#8 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_genassym.c#8 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_support.S#6 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vtd.c#5 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/iommu.c#4 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/iommu.h#3 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/ppt.c#9 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/vatpic.c#1 branch
.. //depot/projects/smpng/sys/amd64/vmm/io/vatpic.h#1 branch
.. //depot/projects/smpng/sys/amd64/vmm/io/vatpit.c#1 branch
.. //depot/projects/smpng/sys/amd64/vmm/io/vatpit.h#1 branch
.. //depot/projects/smpng/sys/amd64/vmm/io/vhpet.c#4 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/vlapic.c#9 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/vlapic.h#6 integrate
.. //depot/projects/smpng/sys/amd64/vmm/io/vlapic_priv.h#4 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm.c#10 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_dev.c#10 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#8 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_ioport.c#1 branch
.. //depot/projects/smpng/sys/amd64/vmm/vmm_ioport.h#1 branch
.. //depot/projects/smpng/sys/amd64/vmm/vmm_lapic.c#6 integrate
.. //depot/projects/smpng/sys/amd64/vmm/x86.c#9 integrate
.. //depot/projects/smpng/sys/arm/allwinner/a10_clk.c#4 integrate
.. //depot/projects/smpng/sys/arm/allwinner/a10_clk.h#2 integrate
.. //depot/projects/smpng/sys/arm/allwinner/a10_common.c#1 branch
.. //depot/projects/smpng/sys/arm/allwinner/a10_ehci.c#3 integrate
.. //depot/projects/smpng/sys/arm/allwinner/a10_gpio.c#4 integrate
.. //depot/projects/smpng/sys/arm/allwinner/a10_gpio.h#1 branch
.. //depot/projects/smpng/sys/arm/allwinner/a10_machdep.c#5 integrate
.. //depot/projects/smpng/sys/arm/allwinner/a10_sramc.c#1 branch
.. //depot/projects/smpng/sys/arm/allwinner/a10_sramc.h#1 branch
.. //depot/projects/smpng/sys/arm/allwinner/a20/a20_cpu_cfg.c#4 integrate
.. //depot/projects/smpng/sys/arm/allwinner/a20/a20_cpu_cfg.h#2 integrate
.. //depot/projects/smpng/sys/arm/allwinner/a20/a20_mp.c#1 branch
.. //depot/projects/smpng/sys/arm/allwinner/a20/files.a20#3 integrate
.. //depot/projects/smpng/sys/arm/allwinner/aintc.c#4 integrate
.. //depot/projects/smpng/sys/arm/allwinner/common.c#4 delete
.. //depot/projects/smpng/sys/arm/allwinner/console.c#2 integrate
.. //depot/projects/smpng/sys/arm/allwinner/files.a10#5 integrate
.. //depot/projects/smpng/sys/arm/allwinner/if_emac.c#1 branch
.. //depot/projects/smpng/sys/arm/allwinner/if_emacreg.h#1 branch
.. //depot/projects/smpng/sys/arm/allwinner/timer.c#5 integrate
.. //depot/projects/smpng/sys/arm/arm/bus_space_generic.c#6 integrate
.. //depot/projects/smpng/sys/arm/arm/copystr.S#8 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc.c#33 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm11.S#7 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm11x6.S#3 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm7tdmi.S#7 delete
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm8.S#8 delete
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv4.S#7 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv6.S#4 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv7.S#5 integrate
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_ixp12x0.S#6 delete
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sa1.S#8 delete
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sa11x0.S#7 delete
.. //depot/projects/smpng/sys/arm/arm/dump_machdep.c#12 integrate
.. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#20 integrate
.. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#35 integrate
.. //depot/projects/smpng/sys/arm/arm/exception.S#15 integrate
.. //depot/projects/smpng/sys/arm/arm/fiq.c#5 integrate
.. //depot/projects/smpng/sys/arm/arm/fiq_subr.S#7 integrate
.. //depot/projects/smpng/sys/arm/arm/fusu.S#15 integrate
.. //depot/projects/smpng/sys/arm/arm/genassym.c#18 integrate
.. //depot/projects/smpng/sys/arm/arm/generic_timer.c#4 integrate
.. //depot/projects/smpng/sys/arm/arm/identcpu.c#28 integrate
.. //depot/projects/smpng/sys/arm/arm/intr.c#27 integrate
.. //depot/projects/smpng/sys/arm/arm/irq_dispatch.S#12 delete
.. //depot/projects/smpng/sys/arm/arm/locore.S#32 integrate
.. //depot/projects/smpng/sys/arm/arm/machdep.c#50 integrate
.. //depot/projects/smpng/sys/arm/arm/minidump_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/arm/mp_machdep.c#8 integrate
.. //depot/projects/smpng/sys/arm/arm/mpcore_timer.c#7 integrate
.. //depot/projects/smpng/sys/arm/arm/mpcore_timervar.h#1 branch
.. //depot/projects/smpng/sys/arm/arm/pl310.c#6 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap-v6.c#13 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap.c#79 integrate
.. //depot/projects/smpng/sys/arm/arm/support.S#19 integrate
.. //depot/projects/smpng/sys/arm/arm/swtch.S#29 integrate
.. //depot/projects/smpng/sys/arm/arm/sys_machdep.c#13 integrate
.. //depot/projects/smpng/sys/arm/arm/trap.c#42 integrate
.. //depot/projects/smpng/sys/arm/arm/uio_machdep.c#8 integrate
.. //depot/projects/smpng/sys/arm/arm/undefined.c#23 integrate
.. //depot/projects/smpng/sys/arm/arm/vectors.S#5 delete
.. //depot/projects/smpng/sys/arm/arm/vfp.c#8 integrate
.. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#47 integrate
.. //depot/projects/smpng/sys/arm/at91/at91.c#31 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_aic.c#1 branch
.. //depot/projects/smpng/sys/arm/at91/at91_machdep.c#18 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_sdramc.c#1 branch
.. //depot/projects/smpng/sys/arm/at91/at91_shdwc.c#1 branch
.. //depot/projects/smpng/sys/arm/at91/at91_tcb.c#1 branch
.. //depot/projects/smpng/sys/arm/at91/at91rm9200.c#8 integrate
.. //depot/projects/smpng/sys/arm/at91/at91sam9g20.c#6 integrate
.. //depot/projects/smpng/sys/arm/at91/at91sam9g20reg.h#8 integrate
.. //depot/projects/smpng/sys/arm/at91/at91sam9x5.c#4 integrate
.. //depot/projects/smpng/sys/arm/at91/at91sam9x5reg.h#3 integrate
.. //depot/projects/smpng/sys/arm/at91/at91var.h#10 integrate
.. //depot/projects/smpng/sys/arm/at91/files.at91#16 integrate
.. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#29 integrate
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_common.c#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_fbd.c#4 integrate
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_systimer.c#7 integrate
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/common.c#3 delete
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/files.bcm2835#8 integrate
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/cfi_bus_econa.c#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/econa.c#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/econa_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/econa_reg.h#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/econa_var.h#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/ehci_ebus.c#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/files.econa#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/if_ece.c#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/if_ecereg.h#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/if_ecevar.h#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/ohci_ec.c#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/std.econa#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/timer.c#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/uart_bus_ec.c#1 branch
.. //depot/projects/smpng/sys/arm/cavium/cns11xx/uart_cpu_ec.c#1 branch
.. //depot/projects/smpng/sys/arm/conf/AC100#7 integrate
.. //depot/projects/smpng/sys/arm/conf/ARMADAXP#9 integrate
.. //depot/projects/smpng/sys/arm/conf/ARNDALE#4 integrate
.. //depot/projects/smpng/sys/arm/conf/ATMEL#8 integrate
.. //depot/projects/smpng/sys/arm/conf/AVILA#33 integrate
.. //depot/projects/smpng/sys/arm/conf/BEAGLEBONE#9 integrate
.. //depot/projects/smpng/sys/arm/conf/BWCT#18 integrate
.. //depot/projects/smpng/sys/arm/conf/CAMBRIA#25 integrate
.. //depot/projects/smpng/sys/arm/conf/CHROMEBOOK#1 branch
.. //depot/projects/smpng/sys/arm/conf/CHROMEBOOK.hints#1 branch
.. //depot/projects/smpng/sys/arm/conf/CNS11XXNAS#10 integrate
.. //depot/projects/smpng/sys/arm/conf/COLIBRI-VF50#2 integrate
.. //depot/projects/smpng/sys/arm/conf/COSMIC#4 integrate
.. //depot/projects/smpng/sys/arm/conf/CRB#17 integrate
.. //depot/projects/smpng/sys/arm/conf/CUBIEBOARD#6 integrate
.. //depot/projects/smpng/sys/arm/conf/CUBIEBOARD2#4 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-78XXX#17 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#16 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#18 integrate
.. //depot/projects/smpng/sys/arm/conf/DEFAULTS#9 integrate
.. //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#5 integrate
.. //depot/projects/smpng/sys/arm/conf/DOCKSTAR#9 integrate
.. //depot/projects/smpng/sys/arm/conf/DREAMPLUG-1001#3 integrate
.. //depot/projects/smpng/sys/arm/conf/EA3250#7 integrate
.. //depot/projects/smpng/sys/arm/conf/EB9200#6 integrate
.. //depot/projects/smpng/sys/arm/conf/EFIKA_MX#5 integrate
.. //depot/projects/smpng/sys/arm/conf/EP80219#21 integrate
.. //depot/projects/smpng/sys/arm/conf/ETHERNUT5#7 integrate
.. //depot/projects/smpng/sys/arm/conf/EXYNOS5250.common#1 branch
.. //depot/projects/smpng/sys/arm/conf/GUMSTIX#13 integrate
.. //depot/projects/smpng/sys/arm/conf/HL200#20 integrate
.. //depot/projects/smpng/sys/arm/conf/HL201#11 integrate
.. //depot/projects/smpng/sys/arm/conf/IMX53-QSB#4 integrate
.. //depot/projects/smpng/sys/arm/conf/IMX6#1 branch
.. //depot/projects/smpng/sys/arm/conf/IQ31244#30 integrate
.. //depot/projects/smpng/sys/arm/conf/KB920X#30 integrate
.. //depot/projects/smpng/sys/arm/conf/LN2410SBC#11 integrate
.. //depot/projects/smpng/sys/arm/conf/NOTES#4 integrate
.. //depot/projects/smpng/sys/arm/conf/NSLU#16 integrate
.. //depot/projects/smpng/sys/arm/conf/PANDABOARD#7 integrate
.. //depot/projects/smpng/sys/arm/conf/QILA9G20#11 integrate
.. //depot/projects/smpng/sys/arm/conf/QUARTZ#1 branch
.. //depot/projects/smpng/sys/arm/conf/RADXA#3 integrate
.. //depot/projects/smpng/sys/arm/conf/RPI-B#9 integrate
.. //depot/projects/smpng/sys/arm/conf/SAM9260EK#6 integrate
.. //depot/projects/smpng/sys/arm/conf/SAM9G20EK#11 integrate
.. //depot/projects/smpng/sys/arm/conf/SAM9X25EK#8 integrate
.. //depot/projects/smpng/sys/arm/conf/SHEEVAPLUG#14 integrate
.. //depot/projects/smpng/sys/arm/conf/SIMICS#22 delete
.. //depot/projects/smpng/sys/arm/conf/SN9G45#7 integrate
.. //depot/projects/smpng/sys/arm/conf/TS7800#10 integrate
.. //depot/projects/smpng/sys/arm/conf/VERSATILEPB#5 integrate
.. //depot/projects/smpng/sys/arm/conf/VYBRID#1 branch
.. //depot/projects/smpng/sys/arm/conf/VYBRID.common#2 delete
.. //depot/projects/smpng/sys/arm/conf/WANDBOARD-DUAL#2 integrate
.. //depot/projects/smpng/sys/arm/conf/WANDBOARD-QUAD#2 integrate
.. //depot/projects/smpng/sys/arm/conf/WANDBOARD-SOLO#2 integrate
.. //depot/projects/smpng/sys/arm/conf/WANDBOARD.common#2 delete
.. //depot/projects/smpng/sys/arm/conf/ZEDBOARD#5 integrate
.. //depot/projects/smpng/sys/arm/econa/cfi_bus_econa.c#3 delete
.. //depot/projects/smpng/sys/arm/econa/econa.c#6 delete
.. //depot/projects/smpng/sys/arm/econa/econa_machdep.c#11 delete
.. //depot/projects/smpng/sys/arm/econa/econa_reg.h#3 delete
.. //depot/projects/smpng/sys/arm/econa/econa_var.h#3 delete
.. //depot/projects/smpng/sys/arm/econa/ehci_ebus.c#7 delete
.. //depot/projects/smpng/sys/arm/econa/files.econa#4 delete
.. //depot/projects/smpng/sys/arm/econa/if_ece.c#6 delete
.. //depot/projects/smpng/sys/arm/econa/if_ecereg.h#3 delete
.. //depot/projects/smpng/sys/arm/econa/if_ecevar.h#3 delete
.. //depot/projects/smpng/sys/arm/econa/ohci_ec.c#6 delete
.. //depot/projects/smpng/sys/arm/econa/std.econa#6 delete
.. //depot/projects/smpng/sys/arm/econa/timer.c#4 delete
.. //depot/projects/smpng/sys/arm/econa/uart_bus_ec.c#4 delete
.. //depot/projects/smpng/sys/arm/econa/uart_cpu_ec.c#4 delete
.. //depot/projects/smpng/sys/arm/freescale/imx/common.c#3 delete
.. //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#4 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#5 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#4 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ccm.c#7 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ipuv3.c#6 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ipuv3_fbd.c#4 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ipuv3reg.h#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_tzicreg.h#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatop.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatopreg.h#2 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatopvar.h#2 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_ccm.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_ccmreg.h#2 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_machdep.c#2 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_mp.c#1 branch
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_pl310.c#2 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_usbphy.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_ccmvar.h#1 branch
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_common.c#1 branch
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_gpt.c#7 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_machdep.h#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_nop_usbphy.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_sdhci.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/std.imx6#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/files.vybrid#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_ccm.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_dcu4.c#2 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_gpio.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_i2c.c#1 branch
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_iomuxc.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_port.c#1 branch
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_port.h#1 branch
.. //depot/projects/smpng/sys/arm/include/_types.h#14 integrate
.. //depot/projects/smpng/sys/arm/include/armreg.h#22 integrate
.. //depot/projects/smpng/sys/arm/include/asmacros.h#16 integrate
.. //depot/projects/smpng/sys/arm/include/atomic.h#40 integrate
.. //depot/projects/smpng/sys/arm/include/cpu.h#13 integrate
.. //depot/projects/smpng/sys/arm/include/cpuconf.h#17 integrate
.. //depot/projects/smpng/sys/arm/include/cpufunc.h#24 integrate
.. //depot/projects/smpng/sys/arm/include/fp.h#7 integrate
.. //depot/projects/smpng/sys/arm/include/kdb.h#8 integrate
.. //depot/projects/smpng/sys/arm/include/machdep.h#10 integrate
.. //depot/projects/smpng/sys/arm/include/md_var.h#12 integrate
.. //depot/projects/smpng/sys/arm/include/param.h#23 integrate
.. //depot/projects/smpng/sys/arm/include/pcb.h#11 integrate
.. //depot/projects/smpng/sys/arm/include/pcpu.h#14 integrate
.. //depot/projects/smpng/sys/arm/include/pl310.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/pmap.h#47 integrate
.. //depot/projects/smpng/sys/arm/include/smp.h#5 integrate
.. //depot/projects/smpng/sys/arm/include/sysarch.h#11 integrate
.. //depot/projects/smpng/sys/arm/include/vfp.h#5 integrate
.. //depot/projects/smpng/sys/arm/include/vmparam.h#26 integrate
.. //depot/projects/smpng/sys/arm/lpc/files.lpc#3 integrate
.. //depot/projects/smpng/sys/arm/lpc/lpc_gpio.c#6 integrate
.. //depot/projects/smpng/sys/arm/lpc/lpc_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/lpc/lpc_timer.c#6 integrate
.. //depot/projects/smpng/sys/arm/lpc/lpcvar.h#3 integrate
.. //depot/projects/smpng/sys/arm/mv/armadaxp/armadaxp_mp.c#5 integrate
.. //depot/projects/smpng/sys/arm/mv/armadaxp/files.armadaxp#3 integrate
.. //depot/projects/smpng/sys/arm/mv/armadaxp/mptramp.S#1 branch
.. //depot/projects/smpng/sys/arm/mv/common.c#19 delete
.. //depot/projects/smpng/sys/arm/mv/files.mv#15 integrate
.. //depot/projects/smpng/sys/arm/mv/gpio.c#14 integrate
.. //depot/projects/smpng/sys/arm/mv/mv_common.c#1 branch
.. //depot/projects/smpng/sys/arm/mv/mv_localbus.c#6 integrate
.. //depot/projects/smpng/sys/arm/mv/mv_machdep.c#26 integrate
.. //depot/projects/smpng/sys/arm/mv/mv_pci.c#15 integrate
.. //depot/projects/smpng/sys/arm/mv/mvvar.h#12 integrate
.. //depot/projects/smpng/sys/arm/mv/orion/db88f5xxx.c#9 integrate
.. //depot/projects/smpng/sys/arm/mv/timer.c#13 integrate
.. //depot/projects/smpng/sys/arm/rockchip/common.c#2 delete
.. //depot/projects/smpng/sys/arm/rockchip/files.rk30xx#3 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_common.c#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_gpio.c#4 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_grf.c#4 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_grf.h#2 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_mp.c#1 branch
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_pmu.c#4 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_pmu.h#2 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_wdog.c#3 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_wdog.h#2 integrate
.. //depot/projects/smpng/sys/arm/s3c2xx0/files.s3c2xx0#5 integrate
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c24x0_machdep.c#12 integrate
.. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#33 delete
.. //depot/projects/smpng/sys/arm/sa11x0/files.sa11x0#5 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#15 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_dmacreg.h#4 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_gpioreg.h#5 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#12 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io_asm.S#5 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irq.S#9 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#10 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#12 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ostreg.h#5 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ppcreg.h#4 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_reg.h#5 delete
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_var.h#7 delete
.. //depot/projects/smpng/sys/arm/sa11x0/std.sa11x0#6 delete
.. //depot/projects/smpng/sys/arm/sa11x0/uart_bus_sa1110.c#4 delete
.. //depot/projects/smpng/sys/arm/sa11x0/uart_cpu_sa1110.c#7 delete
.. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#12 delete
.. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.h#4 delete
.. //depot/projects/smpng/sys/arm/samsung/exynos/arch_timer.c#4 delete
.. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_ec.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_ec.h#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_kb.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_kb.h#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/common.c#2 delete
.. //depot/projects/smpng/sys/arm/samsung/exynos/ehci_exynos5.c#4 delete
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_combiner.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_combiner.h#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_common.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_common.h#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_ehci.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_fimd.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_i2c.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_mct.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_mp.c#2 integrate
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_pad.c#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_pad.h#1 branch
.. //depot/projects/smpng/sys/arm/samsung/exynos/files.exynos5#3 integrate
.. //depot/projects/smpng/sys/arm/tegra/common.c#4 delete
.. //depot/projects/smpng/sys/arm/tegra/files.tegra2#4 integrate
.. //depot/projects/smpng/sys/arm/tegra/tegra2_common.c#1 branch
.. //depot/projects/smpng/sys/arm/ti/am335x/am335x_dmtimer.c#8 integrate
.. //depot/projects/smpng/sys/arm/ti/am335x/am335x_prcm.c#7 integrate
.. //depot/projects/smpng/sys/arm/ti/common.c#3 delete
.. //depot/projects/smpng/sys/arm/ti/files.ti#6 integrate
.. //depot/projects/smpng/sys/arm/ti/omap4/files.omap4#3 integrate
.. //depot/projects/smpng/sys/arm/ti/omap4/omap4_l2cache.c#3 integrate
.. //depot/projects/smpng/sys/arm/ti/omap4/omap4_mp.c#3 integrate
.. //depot/projects/smpng/sys/arm/ti/omap4/omap4_prcm_clks.c#7 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_adc.c#1 branch
.. //depot/projects/smpng/sys/arm/ti/ti_adcreg.h#1 branch
.. //depot/projects/smpng/sys/arm/ti/ti_adcvar.h#1 branch
.. //depot/projects/smpng/sys/arm/ti/ti_common.c#1 branch
.. //depot/projects/smpng/sys/arm/ti/ti_gpio.c#6 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_prcm.h#5 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_sdhci.c#4 integrate
.. //depot/projects/smpng/sys/arm/ti/twl/twl_vreg.c#4 integrate
.. //depot/projects/smpng/sys/arm/versatile/common.c#2 delete
.. //depot/projects/smpng/sys/arm/versatile/files.versatile#2 integrate
.. //depot/projects/smpng/sys/arm/versatile/versatile_common.c#1 branch
.. //depot/projects/smpng/sys/arm/xilinx/files.zynq7#2 integrate
.. //depot/projects/smpng/sys/arm/xilinx/std.zynq7#3 integrate
.. //depot/projects/smpng/sys/arm/xilinx/zy7_devcfg.c#3 integrate
.. //depot/projects/smpng/sys/arm/xilinx/zy7_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/xilinx/zy7_mp.c#1 branch
.. //depot/projects/smpng/sys/arm/xilinx/zy7_reg.h#2 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/ep80219_machdep.c#21 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/files.i80219#4 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/files.i80321#6 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#40 integrate
.. //depot/projects/smpng/sys/arm/xscale/i8134x/crb_machdep.c#19 integrate
.. //depot/projects/smpng/sys/arm/xscale/i8134x/files.i81342#4 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#25 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#12 integrate
.. //depot/projects/smpng/sys/arm/xscale/pxa/files.pxa#3 integrate
.. //depot/projects/smpng/sys/arm/xscale/pxa/pxa_machdep.c#14 integrate
.. //depot/projects/smpng/sys/arm/xscale/pxa/pxareg.h#4 integrate
.. //depot/projects/smpng/sys/boot/Makefile#39 integrate
.. //depot/projects/smpng/sys/boot/Makefile.amd64#5 integrate
.. //depot/projects/smpng/sys/boot/Makefile.mips#1 branch
.. //depot/projects/smpng/sys/boot/amd64/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/amd64/Makefile.inc#1 branch
.. //depot/projects/smpng/sys/boot/amd64/boot1.efi/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/amd64/boot1.efi/Makefile.fat#1 branch
.. //depot/projects/smpng/sys/boot/amd64/boot1.efi/boot1.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu#1 branch
.. //depot/projects/smpng/sys/boot/amd64/boot1.efi/generate-fat.sh#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/amd64_tramp.S#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/autoload.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/bootinfo.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/conf.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/copy.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/devicename.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/elf64_freebsd.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/framebuffer.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/framebuffer.h#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/ldscript.amd64#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/main.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/reloc.c#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/start.S#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/version#1 branch
.. //depot/projects/smpng/sys/boot/amd64/efi/x86_efi.h#1 branch
.. //depot/projects/smpng/sys/boot/arm/at91/boot0/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/arm/at91/boot0iic/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/arm/at91/boot0spi/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/arm/at91/boot2/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/arm/at91/bootiic/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/arm/at91/bootspi/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/arm/at91/libat91/Makefile#10 integrate
.. //depot/projects/smpng/sys/boot/arm/ixp425/boot2/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/arm/uboot/Makefile#13 integrate
.. //depot/projects/smpng/sys/boot/common/Makefile.inc#20 integrate
.. //depot/projects/smpng/sys/boot/common/bootstrap.h#20 integrate
.. //depot/projects/smpng/sys/boot/common/module.c#16 integrate
.. //depot/projects/smpng/sys/boot/common/part.c#6 integrate
.. //depot/projects/smpng/sys/boot/common/ufsread.c#20 integrate
.. //depot/projects/smpng/sys/boot/efi/include/amd64/efibind.h#1 branch
.. //depot/projects/smpng/sys/boot/efi/include/amd64/pe.h#1 branch
.. //depot/projects/smpng/sys/boot/efi/include/efi.h#6 integrate
.. //depot/projects/smpng/sys/boot/efi/include/efigop.h#1 branch
.. //depot/projects/smpng/sys/boot/efi/include/efilib.h#7 integrate
.. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#16 integrate
.. //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#8 integrate
.. //depot/projects/smpng/sys/boot/efi/libefi/efipart.c#6 integrate
.. //depot/projects/smpng/sys/boot/efi/libefi/handles.c#3 integrate
.. //depot/projects/smpng/sys/boot/fdt/Makefile#4 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/am335x-evm.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/am335x.dtsi#5 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/am335x-evm.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/am335x.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/bcm2835.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/beaglebone-black.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/beaglebone.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/cubieboard.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/cubieboard2.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/db78100.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/db78460.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/db88f5182.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/db88f5281.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/db88f6281.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/digi-ccwmx53.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/dockstar.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/dreamplug-1001.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/dreamplug-1001N.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/ea3250.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/efikamx.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5250-arndale.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5250.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/hl201.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/imx51x.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/imx53-qsb.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/imx53x.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/imx6.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/p2041rdb.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/p3041ds.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/p5020ds.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/pandaboard.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/rk3188-radxa.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/rk3188.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/rpi.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/sheevaplug.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/sun4i-a10.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/sun7i-a20.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/tegra20-paz00.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/tegra20.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/trimslice.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/ts7800.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/versatilepb.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/vybrid-cosmic.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/vybrid-quartz.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/vybrid.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-dual.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-quad.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-solo.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/zedboard.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/bcm2835.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/beaglebone-black.dts#5 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/beaglebone.dts#7 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/beri-netfpga.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/beri-sim.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/beripad-de4.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/cubieboard.dts#4 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/cubieboard2.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/db78100.dts#6 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/db78460.dts#5 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/db88f5182.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/db88f5281.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/db88f6281.dts#5 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/digi-ccwmx53.dts#4 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/dockstar.dts#4 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/dreamplug-1001.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/dreamplug-1001N.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/ea3250.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/efikamx.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/exynos5250-arndale.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/exynos5250.dtsi#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/imx51x.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/imx53-qsb.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/imx53x.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/imx6.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/mips/beri-netfpga.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/mips/beri-sim.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/mips/beripad-de4.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/mips/xlp-basic.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/mpc8555cds.dts#5 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/mpc8572ds.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/p1020rdb.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/p2020ds.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/p2041rdb.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/p2041si.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/p3041ds.dts#4 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/p3041si.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/p5020ds.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/p5020si.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/pandaboard.dts#4 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/mpc8555cds.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/mpc8572ds.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/p1020rdb.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/p2020ds.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/p2041si.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/p3041si.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/p5020si.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/rk3188-radxa.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/rk3188.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/rpi.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/sheevaplug.dts#5 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/tegra20-paz00.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/tegra20.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/trimslice.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/ts7800.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/versatilepb.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/vybrid-colibri-vf50.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/vybrid-cosmic.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/vybrid.dtsi#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/wandboard-dual.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/wandboard-quad.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/wandboard-solo.dts#3 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/xlp-basic.dts#4 delete
.. //depot/projects/smpng/sys/boot/fdt/dts/zedboard.dts#2 delete
.. //depot/projects/smpng/sys/boot/fdt/fdt_loader_cmd.c#7 integrate
.. //depot/projects/smpng/sys/boot/ficl/Makefile#23 integrate
.. //depot/projects/smpng/sys/boot/ficl/mips64/sysdep.c#1 branch
.. //depot/projects/smpng/sys/boot/ficl/mips64/sysdep.h#1 branch
.. //depot/projects/smpng/sys/boot/ficl/tools.c#6 integrate
.. //depot/projects/smpng/sys/boot/ficl/words.c#9 integrate
.. //depot/projects/smpng/sys/boot/ficl32/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/ficl64/Makefile#2 delete
.. //depot/projects/smpng/sys/boot/forth/beastie.4th#23 integrate
.. //depot/projects/smpng/sys/boot/forth/beastie.4th.8#5 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#83 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf.5#21 integrate
.. //depot/projects/smpng/sys/boot/i386/Makefile#13 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#19 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#30 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#14 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#13 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#10 integrate
.. //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#10 integrate
.. //depot/projects/smpng/sys/boot/i386/efi/Makefile#8 delete
.. //depot/projects/smpng/sys/boot/i386/efi/autoload.c#3 delete
.. //depot/projects/smpng/sys/boot/i386/efi/bootinfo.c#3 integrate
.. //depot/projects/smpng/sys/boot/i386/efi/conf.c#3 delete
.. //depot/projects/smpng/sys/boot/i386/efi/devicename.c#3 delete
.. //depot/projects/smpng/sys/boot/i386/efi/ldscript.amd64#4 delete
.. //depot/projects/smpng/sys/boot/i386/efi/main.c#3 delete
.. //depot/projects/smpng/sys/boot/i386/efi/reloc.c#5 delete
.. //depot/projects/smpng/sys/boot/i386/efi/version#3 delete
.. //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#14 integrate
.. //depot/projects/smpng/sys/boot/i386/libfirewire/firewire.c#3 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo.c#13 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/Makefile#38 integrate
.. //depot/projects/smpng/sys/boot/i386/mbr/Makefile#11 integrate
.. //depot/projects/smpng/sys/boot/i386/pmbr/Makefile#4 integrate
.. //depot/projects/smpng/sys/boot/i386/zfsloader/Makefile#4 integrate
.. //depot/projects/smpng/sys/boot/ia64/common/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/ia64/common/bootinfo.c#4 integrate
.. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#10 integrate
.. //depot/projects/smpng/sys/boot/ia64/ski/Makefile#9 integrate
.. //depot/projects/smpng/sys/boot/libstand32/Makefile#2 integrate
.. //depot/projects/smpng/sys/boot/mips/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/mips/Makefile.inc#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/Makefile.inc#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/boot2/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/boot2/boot2.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/boot2/flashboot.ldscript#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/boot2/jtagboot.ldscript#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/boot2/relocate.S#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/boot2/start.S#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/altera_jtag_uart.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/beri.h#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/cfi.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/cfi.h#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/common.ldscript#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/cons.h#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/mips.h#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/sdcard.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/common/sdcard.h#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/Makefile#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/arch.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/beri_console.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/beri_disk_cfi.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/beri_disk_sdcard.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/devicename.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/exec.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/help.mips#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/loader.h#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/loader.ldscript#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/main.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/metadata.c#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/start.S#1 branch
.. //depot/projects/smpng/sys/boot/mips/beri/loader/version#1 branch
.. //depot/projects/smpng/sys/boot/pc98/boot0.5/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot0/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#15 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#13 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#9 integrate
.. //depot/projects/smpng/sys/boot/pc98/cdboot/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#13 integrate
.. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#26 integrate
.. //depot/projects/smpng/sys/boot/powerpc/boot1.chrp/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#11 integrate
.. //depot/projects/smpng/sys/boot/powerpc/ofw/metadata.c#4 integrate
.. //depot/projects/smpng/sys/boot/powerpc/ps3/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/powerpc/ps3/metadata.c#3 integrate
.. //depot/projects/smpng/sys/boot/powerpc/uboot/Makefile#11 integrate
.. //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#12 integrate
.. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#24 integrate
.. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#17 integrate
.. //depot/projects/smpng/sys/boot/uboot/common/main.c#9 integrate
.. //depot/projects/smpng/sys/boot/uboot/common/metadata.c#10 integrate
.. //depot/projects/smpng/sys/boot/uboot/lib/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/uboot/lib/api_public.h#5 integrate
.. //depot/projects/smpng/sys/boot/uboot/lib/disk.c#11 integrate
.. //depot/projects/smpng/sys/boot/uboot/lib/glue.c#12 integrate
.. //depot/projects/smpng/sys/boot/uboot/lib/libuboot.h#7 integrate
.. //depot/projects/smpng/sys/boot/uboot/lib/module.c#3 integrate
.. //depot/projects/smpng/sys/boot/userboot/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/userboot/libstand/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/userboot/test/Makefile#4 integrate
.. //depot/projects/smpng/sys/boot/userboot/userboot/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/userboot/userboot/bootinfo.c#3 integrate
.. //depot/projects/smpng/sys/boot/userboot/userboot/conf.c#3 integrate
.. //depot/projects/smpng/sys/boot/userboot/userboot/devicename.c#4 integrate
.. //depot/projects/smpng/sys/boot/userboot/userboot/main.c#5 integrate
.. //depot/projects/smpng/sys/boot/userboot/userboot/userboot_cons.c#3 integrate
.. //depot/projects/smpng/sys/boot/userboot/zfs/Makefile#1 branch
.. //depot/projects/smpng/sys/bsm/audit_record.h#17 integrate
.. //depot/projects/smpng/sys/cam/ata/ata_all.c#13 integrate
.. //depot/projects/smpng/sys/cam/cam_periph.c#59 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#94 integrate
.. //depot/projects/smpng/sys/cam/ctl/README.ctl.txt#4 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl.c#11 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_backend.h#4 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_backend_block.c#9 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_backend_ramdisk.c#6 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_cmd_table.c#4 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_cam_sim.c#7 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_internal.c#7 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_iscsi.c#2 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_iscsi.h#2 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_io.h#4 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_ioctl.h#4 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_mem_pool.c#3 delete
.. //depot/projects/smpng/sys/cam/ctl/ctl_mem_pool.h#3 delete
.. //depot/projects/smpng/sys/cam/ctl/ctl_private.h#5 integrate
.. //depot/projects/smpng/sys/cam/ctl/ctl_ser_table.c#3 integrate
.. //depot/projects/smpng/sys/cam/ctl/scsi_ctl.c#11 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#33 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#61 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#117 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_enc_ses.c#9 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#38 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#8 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/dkio.h#5 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/file.h#7 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kmem.h#9 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/avl/avl.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#14 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#22 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#9 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#31 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#21 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c#6 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#11 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#19 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#18 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#12 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#20 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#14 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#15 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#21 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#14 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#10 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#15 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#10 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#15 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#17 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#18 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#11 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#23 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#10 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#9 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#11 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#31 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#28 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#43 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#24 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#19 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#14 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#9 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dis_tables.c#5 delete
.. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dis_tables.h#4 delete
.. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/regset.h#3 delete
.. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_cddl.h#4 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_ioctl.c#9 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_sysctl.c#4 integrate
.. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dis_tables.c#5 delete
.. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dis_tables.h#4 delete
.. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/regset.h#3 delete
.. //depot/projects/smpng/sys/cddl/dev/dtrace/x86/dis_tables.c#1 branch
.. //depot/projects/smpng/sys/cddl/dev/dtrace/x86/dis_tables.h#1 branch
.. //depot/projects/smpng/sys/cddl/dev/dtrace/x86/regset.h#1 branch
.. //depot/projects/smpng/sys/cddl/dev/systrace/systrace.c#8 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_capability.c#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.c#7 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#88 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#80 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#79 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#79 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#80 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_systrace_args.c#13 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#83 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#99 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_file.c#57 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#80 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#115 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_socket.c#60 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#36 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#23 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_fuser.h#4 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#20 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#23 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#72 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#14 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_resource.h#4 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#50 integrate
.. //depot/projects/smpng/sys/conf/Makefile.arm#48 integrate
.. //depot/projects/smpng/sys/conf/NOTES#211 integrate
.. //depot/projects/smpng/sys/conf/files#297 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#103 integrate
.. //depot/projects/smpng/sys/conf/files.arm#33 integrate
.. //depot/projects/smpng/sys/conf/files.i386#161 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#78 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#119 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#86 integrate
.. //depot/projects/smpng/sys/conf/kern.mk#42 integrate
.. //depot/projects/smpng/sys/conf/kern.opts.mk#1 branch
.. //depot/projects/smpng/sys/conf/kern.pre.mk#85 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#93 integrate
.. //depot/projects/smpng/sys/conf/options#208 integrate
.. //depot/projects/smpng/sys/conf/options.amd64#37 integrate
.. //depot/projects/smpng/sys/conf/options.arm#38 integrate
.. //depot/projects/smpng/sys/conf/options.i386#71 integrate
.. //depot/projects/smpng/sys/conf/options.ia64#26 integrate
.. //depot/projects/smpng/sys/conf/options.mips#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/urtwn/urtwn-rtl8188eufw.fw.uu#1 branch
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#24 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.h#10 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#20 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#17 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.h#11 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#18 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/README#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/linux/include/linux/xz.h#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/linux/lib/decompress_unxz.c#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/linux/lib/xz/Kconfig#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/linux/lib/xz/xz_crc64.c#1 branch
.. //depot/projects/smpng/sys/contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/linux/scripts/xz_wrap.sh#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/userspace/Makefile#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/userspace/boottest.c#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/userspace/bytetest.c#1 branch
.. //depot/projects/smpng/sys/contrib/xz-embedded/userspace/xz_config.h#2 integrate
.. //depot/projects/smpng/sys/contrib/xz-embedded/userspace/xzminidec.c#2 integrate
.. //depot/projects/smpng/sys/crypto/rijndael/Makefile#5 integrate
.. //depot/projects/smpng/sys/crypto/sha2/sha2.c#12 integrate
.. //depot/projects/smpng/sys/crypto/sha2/sha2.h#5 integrate
.. //depot/projects/smpng/sys/crypto/sha2/sha256.h#1 branch
.. //depot/projects/smpng/sys/crypto/sha2/sha256c.c#1 branch
.. //depot/projects/smpng/sys/ddb/db_break.h#7 integrate
.. //depot/projects/smpng/sys/ddb/db_sym.h#7 integrate
.. //depot/projects/smpng/sys/ddb/db_variables.h#7 integrate
.. //depot/projects/smpng/sys/ddb/ddb.h#31 integrate
.. //depot/projects/smpng/sys/dev/aac/aac.c#83 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_linux.c#8 integrate
.. //depot/projects/smpng/sys/dev/aacraid/aacraid_cam.c#3 integrate
.. //depot/projects/smpng/sys/dev/aacraid/aacraid_linux.c#3 integrate
.. //depot/projects/smpng/sys/dev/aacraid/aacraid_pci.c#3 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#43 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#143 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#65 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#38 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_smbat.c#13 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#88 integrate
.. //depot/projects/smpng/sys/dev/advansys/advansys.c#21 integrate
.. //depot/projects/smpng/sys/dev/advansys/advlib.c#11 integrate
.. //depot/projects/smpng/sys/dev/advansys/adwcam.c#24 integrate
.. //depot/projects/smpng/sys/dev/age/if_agevar.h#6 integrate
.. //depot/projects/smpng/sys/dev/ahci/ahci.c#35 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#34 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#22 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alcvar.h#6 integrate
.. //depot/projects/smpng/sys/dev/ale/if_alevar.h#6 integrate
.. //depot/projects/smpng/sys/dev/altera/atse/if_atse.c#3 integrate
.. //depot/projects/smpng/sys/dev/amdtemp/amdtemp.c#9 integrate
.. //depot/projects/smpng/sys/dev/amr/amr_linux.c#9 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#121 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-fsl.c#3 integrate
.. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#19 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#24 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.h#24 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_devid.h#10 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#27 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain.c#12 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h#4 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210.h#10 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#16 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#8 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#4 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#8 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211.h#10 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#4 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212.h#20 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#4 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#4 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#20 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#6 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#13 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#6 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#16 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#111 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_beacon.c#7 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_beacon.h#5 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_debug.h#8 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_keycache.c#5 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_led.c#4 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_misc.h#10 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_rx.c#10 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_rx_edma.c#9 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_sysctl.c#15 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_tdma.c#6 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_tx.c#17 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_tx_edma.c#7 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athvar.h#66 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bce.c#54 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#13 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#34 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#77 integrate
.. //depot/projects/smpng/sys/dev/bvm/bvm_console.c#4 integrate
.. //depot/projects/smpng/sys/dev/bxe/57710_init_values.c#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/57710_int_offsets.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/57711_init_values.c#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/57711_int_offsets.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/57712_init_values.c#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/57712_int_offsets.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe.c#6 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe.h#3 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe_dcb.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe_debug.c#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe_elink.c#3 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe_elink.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe_stats.c#3 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe_stats.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/ecore_fw_defs.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/ecore_hsi.h#4 integrate
.. //depot/projects/smpng/sys/dev/bxe/ecore_init.h#3 integrate
.. //depot/projects/smpng/sys/dev/bxe/ecore_init_ops.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/ecore_mfw_req.h#2 integrate
.. //depot/projects/smpng/sys/dev/bxe/ecore_reg.h#3 integrate
.. //depot/projects/smpng/sys/dev/bxe/ecore_sp.c#4 integrate
.. //depot/projects/smpng/sys/dev/bxe/ecore_sp.h#4 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#75 integrate
.. //depot/projects/smpng/sys/dev/cpuctl/cpuctl.c#9 integrate
.. //depot/projects/smpng/sys/dev/cxgbe/adapter.h#17 integrate
.. //depot/projects/smpng/sys/dev/cxgbe/common/t4_hw.h#7 integrate
.. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#23 integrate
.. //depot/projects/smpng/sys/dev/cxgbe/t4_sge.c#20 integrate
.. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem.c#9 integrate
.. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_drv.c#4 integrate
.. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_ioc32.c#2 integrate
.. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#17 integrate
.. //depot/projects/smpng/sys/dev/esp/ncr53c9xvar.h#10 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch.c#9 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_8327.c#1 branch
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_8327.h#1 branch
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_phy.c#6 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_reg.c#6 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_vlans.c#4 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_vlans.h#2 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitchreg.h#7 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitchvar.h#6 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/ip17x/ip175c.c#3 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/ip17x/ip175d.c#3 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/ip17x/ip17x.c#2 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/ip17x/ip17x_phy.c#2 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/ip17x/ip17x_var.h#2 integrate
.. //depot/projects/smpng/sys/dev/etherswitch/ip17x/ip17x_vlans.c#3 integrate
.. //depot/projects/smpng/sys/dev/fb/creator.c#18 integrate
.. //depot/projects/smpng/sys/dev/fb/machfb.c#11 integrate
.. //depot/projects/smpng/sys/dev/ffec/if_ffec.c#5 integrate
.. //depot/projects/smpng/sys/dev/filemon/filemon.c#6 integrate
.. //depot/projects/smpng/sys/dev/firewire/sbp.c#57 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxpreg.h#17 integrate
.. //depot/projects/smpng/sys/dev/gpio/gpio_if.m#3 integrate
.. //depot/projects/smpng/sys/dev/gpio/gpiobus.c#8 integrate
.. //depot/projects/smpng/sys/dev/gpio/gpiobusvar.h#4 integrate
.. //depot/projects/smpng/sys/dev/gpio/ofw_gpiobus.c#2 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#22 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.h#8 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_intel.c#15 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#22 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mpc7xxx.c#3 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#18 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_powerpc.c#11 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppc970.c#2 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_uncore.c#6 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_uncore.h#4 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#20 integrate
.. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_net_vsc.c#3 integrate
.. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#5 integrate
.. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_rndis_filter.c#2 integrate
.. //depot/projects/smpng/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c#3 integrate
.. //depot/projects/smpng/sys/dev/iicbus/lm75.c#1 branch
.. //depot/projects/smpng/sys/dev/ipmi/ipmi_linux.c#5 integrate
.. //depot/projects/smpng/sys/dev/isci/scil/sati_passthrough.c#4 integrate
.. //depot/projects/smpng/sys/dev/isci/scil/sati_util.h#3 integrate
.. //depot/projects/smpng/sys/dev/isci/scil/sci_controller_constants.h#3 integrate
.. //depot/projects/smpng/sys/dev/isci/scil/sci_util.h#3 integrate
.. //depot/projects/smpng/sys/dev/isci/scil/scic_sds_request.h#3 integrate
.. //depot/projects/smpng/sys/dev/iscsi/icl.c#4 integrate
.. //depot/projects/smpng/sys/dev/iscsi/icl.h#2 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat May 17 14:00:50 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id D1FD8FD9; Sat, 17 May 2014 14:00:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 92583FD7
for <perforce@freebsd.org>; Sat, 17 May 2014 14:00:49 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 7D3562420
for <perforce@freebsd.org>; Sat, 17 May 2014 14:00:49 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HE0n81046133
for <perforce@freebsd.org>; Sat, 17 May 2014 14:00:49 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s4HE0n7d046130
for perforce@freebsd.org; Sat, 17 May 2014 14:00:49 GMT
(envelope-from jhb@freebsd.org)
Date: Sat, 17 May 2014 14:00:49 GMT
Message-Id: <201405171400.s4HE0n7d046130@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1193912 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 May 2014 14:00:50 -0000
http://p4web.freebsd.org/@@1193912?ac=10
Change 1193912 by jhb@jhb_pippin on 2014/05/17 14:00:41
IFC @1193911
Affected files ...
.. //depot/projects/smpng/sys/arm/allwinner/a10_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/arm/machdep.c#51 integrate
.. //depot/projects/smpng/sys/arm/arm/platform.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/platform_if.m#1 branch
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_machdep.c#5 integrate
.. //depot/projects/smpng/sys/arm/conf/RPI-B#10 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_machdep.c#4 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx53_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_machdep.c#2 integrate
.. //depot/projects/smpng/sys/arm/include/devmap.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/machdep.h#11 integrate
.. //depot/projects/smpng/sys/arm/include/platform.h#1 branch
.. //depot/projects/smpng/sys/arm/include/platformvar.h#1 branch
.. //depot/projects/smpng/sys/arm/lpc/lpc_machdep.c#7 integrate
.. //depot/projects/smpng/sys/arm/mv/mv_machdep.c#27 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_machdep.c#4 integrate
.. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_machdep.c#4 integrate
.. //depot/projects/smpng/sys/arm/tegra/tegra2_machdep.c#6 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_machdep.c#7 integrate
.. //depot/projects/smpng/sys/arm/versatile/versatile_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/xilinx/zy7_machdep.c#4 integrate
.. //depot/projects/smpng/sys/conf/files.arm#34 integrate
.. //depot/projects/smpng/sys/conf/options.arm#39 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_arm_platform.c#1 branch
.. //depot/projects/smpng/sys/netinet/ip_fw.h#65 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#95 integrate
.. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw_table.c#5 integrate
.. //depot/projects/smpng/sys/netpfil/pf/pf_norm.c#4 integrate
Differences ...
==== //depot/projects/smpng/sys/arm/allwinner/a10_machdep.c#6 (text+ko) ====
@@ -32,7 +32,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/allwinner/a10_machdep.c 263711 2014-03-25 08:31:47Z ganbold $");
+__FBSDID("$FreeBSD: head/sys/arm/allwinner/a10_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -45,30 +45,31 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
#include <arm/allwinner/a10_wdog.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -83,7 +84,7 @@
* perhaps a 1MB block would be more appropriate.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x01C00000, 0x00400000); /* 4MB */
==== //depot/projects/smpng/sys/arm/arm/machdep.c#51 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_timer.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/machdep.c 265914 2014-05-12 13:08:37Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -98,6 +98,7 @@
#include <machine/metadata.h>
#include <machine/pcb.h>
#include <machine/physmem.h>
+#include <machine/platform.h>
#include <machine/reg.h>
#include <machine/trap.h>
#include <machine/undefined.h>
@@ -1091,7 +1092,7 @@
EXFLAG_NODUMP | EXFLAG_NOALLOC);
/* Platform-specific initialisation */
- initarm_early_init();
+ platform_probe_and_attach();
pcpu0_init();
@@ -1207,9 +1208,9 @@
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE, PTE_CACHE);
/* Establish static device mappings. */
- err_devmap = initarm_devmap_init();
+ err_devmap = platform_devmap_init();
arm_devmap_bootstrap(l1pagetable, NULL);
- vm_max_kernel_address = initarm_lastaddr();
+ vm_max_kernel_address = platform_lastaddr();
cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT);
pmap_pa = kernel_l1pt.pv_pa;
@@ -1229,7 +1230,7 @@
*/
OF_interpret("perform-fixup", 0);
- initarm_gpio_init();
+ platform_gpio_init();
cninit();
@@ -1247,7 +1248,7 @@
printf("WARNING: could not fully configure devmap, error=%d\n",
err_devmap);
- initarm_late_init();
+ platform_late_init();
/*
* Pages were allocated during the secondary bootstrap for the
==== //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_machdep.c#5 (text+ko) ====
@@ -41,7 +41,7 @@
#include "opt_global.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c 260371 2014-01-06 15:48:16Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -54,31 +54,24 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
+#include <machine/platformvar.h>
#include <dev/fdt/fdt_common.h>
#include <arm/broadcom/bcm2835/bcm2835_wdog.h>
-vm_offset_t
-initarm_lastaddr(void)
+#include "platform_if.h"
+
+static vm_offset_t
+bcm2835_lastaddr(platform_t plat)
{
return (arm_devmap_lastaddr());
}
-void
-initarm_early_init(void)
-{
-
-}
-
-void
-initarm_gpio_init(void)
-{
-}
-
-void
-initarm_late_init(void)
+static void
+bcm2835_late_init(platform_t plat)
{
phandle_t system;
pcell_t cells[2];
@@ -101,8 +94,8 @@
* All on-chip peripherals exist in a 16MB range starting at 0x20000000.
* Map the entire range using 1MB section mappings.
*/
-int
-initarm_devmap_init(void)
+static int
+bcm2835_devmap_init(platform_t plat)
{
arm_devmap_add_entry(0x20000000, 0x01000000);
@@ -129,4 +122,13 @@
bcmwd_watchdog_reset();
while (1);
}
+static platform_method_t bcm2835_methods[] = {
+ PLATFORMMETHOD(platform_devmap_init, bcm2835_devmap_init),
+ PLATFORMMETHOD(platform_lastaddr, bcm2835_lastaddr),
+ PLATFORMMETHOD(platform_late_init, bcm2835_late_init),
+
+ PLATFORMMETHOD_END,
+};
+
+FDT_PLATFORM_DEF(bcm2835, "bcm2835", 0, "raspberrypi,model-b");
==== //depot/projects/smpng/sys/arm/conf/RPI-B#10 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/RPI-B 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/RPI-B 266301 2014-05-17 11:27:36Z andrew $
ident RPI-B
@@ -59,6 +59,7 @@
#options ROOTDEVNAME=\"ufs:mmcsd0s2\"
options PREEMPTION
+options PLATFORM
device bpf
device loop
==== //depot/projects/smpng/sys/arm/freescale/imx/imx51_machdep.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_machdep.c 257678 2013-11-05 05:18:18Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,18 +39,19 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/freescale/imx/imx_machdep.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
/* XXX - Get rid of this stuff soon. */
@@ -59,13 +60,13 @@
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -78,7 +79,7 @@
* Notably missing are entries for GPU, IPU, in general anything video related.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x70000000, 0x00100000);
==== //depot/projects/smpng/sys/arm/freescale/imx/imx53_machdep.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx53_machdep.c 257678 2013-11-05 05:18:18Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx53_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,17 +39,19 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
+
#include <arm/freescale/imx/imx_machdep.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
/* XXX - Get rid of this stuff soon. */
@@ -58,13 +60,13 @@
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -77,7 +79,7 @@
* Notably missing are entries for GPU, IPU, in general anything video related.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x50000000, 0x00100000);
==== //depot/projects/smpng/sys/arm/freescale/imx/imx6_machdep.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_machdep.c 264056 2014-04-02 21:06:43Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,6 +39,7 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/arm/mpcore_timervar.h>
#include <arm/freescale/imx/imx6_anatopreg.h>
@@ -46,14 +47,14 @@
#include <arm/freescale/imx/imx_machdep.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
/* Inform the MPCore timer driver that its clock is variable. */
@@ -61,13 +62,13 @@
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -89,7 +90,7 @@
* as OCRAM that probably shouldn't be mapped as PTE_DEVICE memory.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
const uint32_t IMX6_ARMMP_PHYS = 0x00a00000;
const uint32_t IMX6_ARMMP_SIZE = 0x00100000;
==== //depot/projects/smpng/sys/arm/freescale/vybrid/vf_machdep.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/vybrid/vf_machdep.c 258057 2013-11-12 18:02:56Z br $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/vybrid/vf_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -41,36 +41,37 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x40000000, 0x100000);
==== //depot/projects/smpng/sys/arm/include/devmap.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/arm/include/devmap.h 260493 2014-01-09 20:57:19Z ian $
+ * $FreeBSD: head/sys/arm/include/devmap.h 266303 2014-05-17 11:29:44Z andrew $
*/
#ifndef _MACHINE_DEVMAP_H_
@@ -45,7 +45,7 @@
* Return the lowest KVA address used in any entry in the registered devmap
* table. This works with whatever table is registered, including the internal
* table used by arm_devmap_add_entry() if that routine was used. Platforms can
- * implement initarm_lastaddr() by calling this if static device mappings are
+ * implement platform_lastaddr() by calling this if static device mappings are
* their only use of high KVA space.
*/
vm_offset_t arm_devmap_lastaddr(void);
==== //depot/projects/smpng/sys/arm/include/machdep.h#11 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */
-/* $FreeBSD: head/sys/arm/include/machdep.h 262534 2014-02-26 22:06:10Z ian $ */
+/* $FreeBSD: head/sys/arm/include/machdep.h 266301 2014-05-17 11:27:36Z andrew $ */
#ifndef _MACHDEP_BOOT_MACHDEP_H_
#define _MACHDEP_BOOT_MACHDEP_H_
@@ -34,40 +34,6 @@
vm_offset_t parse_boot_param(struct arm_boot_params *abp);
void arm_generic_initclocks(void);
-/*
- * Initialization functions called by the common initarm() function in
- * arm/machdep.c (but not necessarily from the custom initarm() functions of
- * older code).
- *
- * - initarm_early_init() is called very early, after parsing the boot params
- * and after physical memory has been located and sized.
- *
- * - initarm_devmap_init() is called as one of the last steps of early virtual
- * memory initialization, shortly before the new page tables are installed.
- *
- * - initarm_lastaddr() is called after initarm_devmap_init(), and must return
- * the address of the first byte of unusable KVA space. This allows a
- * platform to carve out of the top of the KVA space whatever reserves it
- * needs for things like static device mapping, and this is called to get the
- * value before calling pmap_bootstrap() which uses the value to size the
- * available KVA.
- *
- * - initarm_gpio_init() is called after the static device mappings are
- * established and just before cninit(). The intention is that the routine
- * can do any hardware setup (such as gpio or pinmux) necessary to make the
- * console functional.
- *
- * - initarm_late_init() is called just after cninit(). This is the first of
- * the init routines that can use printf() and expect the output to appear on
- * a standard console.
- *
- */
-void initarm_early_init(void);
-int initarm_devmap_init(void);
-vm_offset_t initarm_lastaddr(void);
-void initarm_gpio_init(void);
-void initarm_late_init(void);
-
/* Board-specific attributes */
void board_set_serial(uint64_t);
void board_set_revision(uint32_t);
==== //depot/projects/smpng/sys/arm/lpc/lpc_machdep.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/lpc/lpc_machdep.c 265858 2014-05-10 21:30:19Z andrew $");
+__FBSDID("$FreeBSD: head/sys/arm/lpc/lpc_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -53,6 +53,7 @@
#include <machine/fdt.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/lpc/lpcreg.h>
#include <arm/lpc/lpcvar.h>
@@ -60,19 +61,19 @@
#include <dev/fdt/fdt_common.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
/*
@@ -82,7 +83,7 @@
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -92,7 +93,7 @@
* dts file when this code was converted to arm_devmap_add_entry().
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(LPC_DEV_PHYS_BASE, LPC_DEV_SIZE);
==== //depot/projects/smpng/sys/arm/mv/mv_machdep.c#27 (text+ko) ====
@@ -39,7 +39,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/mv/mv_machdep.c 265852 2014-05-10 20:03:03Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/mv/mv_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -53,6 +53,7 @@
#include <machine/devmap.h>
#include <machine/fdt.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/mv/mvreg.h> /* XXX */
#include <arm/mv/mvvar.h> /* XXX eventually this should be eliminated */
@@ -201,14 +202,14 @@
}
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (fdt_immr_va);
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
if (fdt_immr_addr(MV_BASE) != 0)
@@ -216,7 +217,7 @@
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
/*
@@ -228,7 +229,7 @@
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
/*
* Re-initialise decode windows
@@ -297,7 +298,7 @@
* Supply a default do-nothing implementation of mv_pci_devmap() via a weak
* alias. Many Marvell platforms don't support a PCI interface, but to support
* those that do, we end up with a reference to this function below, in
- * initarm_devmap_init(). If "device pci" appears in the kernel config, the
+ * platform_devmap_init(). If "device pci" appears in the kernel config, the
* real implementation of this function in arm/mv/mv_pci.c overrides the weak
* alias defined here.
*/
@@ -321,7 +322,7 @@
* Construct pmap_devmap[] with DT-derived config data.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
phandle_t root, child;
pcell_t bank_count;
==== //depot/projects/smpng/sys/arm/rockchip/rk30xx_machdep.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/rockchip/rk30xx_machdep.c 265739 2014-05-09 05:39:57Z ganbold $");
+__FBSDID("$FreeBSD: head/sys/arm/rockchip/rk30xx_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -46,31 +46,32 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
#include <arm/rockchip/rk30xx_wdog.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
/* Enable cache */
@@ -82,7 +83,7 @@
* Set up static device mappings.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x10000000, 0x00200000);
==== //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_machdep.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/samsung/exynos/exynos5_machdep.c 258096 2013-11-13 16:17:05Z br $");
+__FBSDID("$FreeBSD: head/sys/arm/samsung/exynos/exynos5_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -41,36 +41,37 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
/* UART */
==== //depot/projects/smpng/sys/arm/tegra/tegra2_machdep.c#6 (text+ko) ====
@@ -34,7 +34,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/tegra/tegra2_machdep.c 260323 2014-01-05 16:45:34Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/tegra/tegra2_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -47,6 +47,7 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
@@ -99,24 +100,24 @@
#endif
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -126,7 +127,7 @@
* before conversion to the newer arm_devmap_add_entry() routine.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
arm_devmap_add_entry(0x70000000, 0x00100000);
==== //depot/projects/smpng/sys/arm/ti/ti_machdep.c#7 (text+ko) ====
@@ -38,7 +38,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/ti/ti_machdep.c 260294 2014-01-04 22:14:59Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/ti/ti_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -51,30 +51,31 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <arm/ti/omap4/omap4_reg.h>
void (*ti_cpu_reset)(void) = NULL;
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (arm_devmap_lastaddr());
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -83,7 +84,7 @@
* peripherals using 1mb section mappings.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
#if defined(SOC_OMAP4)
arm_devmap_add_entry(0x48000000, 0x01000000); /*16mb L4_PER devices */
==== //depot/projects/smpng/sys/arm/versatile/versatile_machdep.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
#include "opt_global.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/versatile/versatile_machdep.c 257669 2013-11-05 02:57:34Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/versatile/versatile_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -51,6 +51,7 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
+#include <machine/platform.h>
#include <dev/fdt/fdt_common.h>
@@ -58,25 +59,25 @@
#define DEVMAP_BOOTSTRAP_MAP_START 0xE0000000
vm_offset_t
-initarm_lastaddr(void)
+platform_lastaddr(void)
{
return (DEVMAP_BOOTSTRAP_MAP_START);
}
void
-initarm_early_init(void)
+platform_probe_and_attach(void)
{
}
void
-initarm_gpio_init(void)
+platform_gpio_init(void)
{
}
void
-initarm_late_init(void)
+platform_late_init(void)
{
}
@@ -91,7 +92,7 @@
* Construct pmap_devmap[] with DT-derived config data.
*/
int
-initarm_devmap_init(void)
+platform_devmap_init(void)
{
int i = 0;
fdt_devmap[i].pd_va = 0xf0100000;
==== //depot/projects/smpng/sys/arm/xilinx/zy7_machdep.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 265148 2014-04-30 14:38:13Z ian $
+ * $FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 266301 2014-05-17 11:27:36Z andrew $
*/
/*
@@ -36,7 +36,7 @@
#include "opt_global.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 265148 2014-04-30 14:38:13Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/xilinx/zy7_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -51,31 +51,32 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat May 17 21:06:49 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id DCA9ED00; Sat, 17 May 2014 21:06:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 9E585CFE
for <perforce@freebsd.org>; Sat, 17 May 2014 21:06:48 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 8A9DE2715
for <perforce@freebsd.org>; Sat, 17 May 2014 21:06:48 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HL6mol000989
for <perforce@freebsd.org>; Sat, 17 May 2014 21:06:48 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s4HL6mMw000986
for perforce@freebsd.org; Sat, 17 May 2014 21:06:48 GMT
(envelope-from jhb@freebsd.org)
Date: Sat, 17 May 2014 21:06:48 GMT
Message-Id: <201405172106.s4HL6mMw000986@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1193935 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 May 2014 21:06:49 -0000
http://p4web.freebsd.org/@@1193935?ac=10
Change 1193935 by jhb@jhb_pippin on 2014/05/17 21:06:27
Finish rdseed/rdrand.
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#15 edit
.. //depot/projects/smpng/sys/modules/x86dis/x86dis.c#10 edit
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#15 (text+ko) ====
@@ -71,6 +71,7 @@
#define R 5 /* register, in 'reg' field */
#define Rw 6 /* word register, in 'reg' field */
#define Rq 39 /* quad register, in 'reg' field */
+#define Rv 40 /* register in 'r/m' field */
#define Ri 7 /* register in instruction */
#define S 8 /* segment reg, in 'reg' field */
#define Si 9 /* segment reg, in instruction */
@@ -635,8 +636,8 @@
{ "", TRUE, NONE, 0, 0 },
{ "", TRUE, NONE, 0, 0 },
{ "", TRUE, NONE, 0, 0 },
- { "rdrand",TRUE, LONG, op1(Ril), 0 },
- { "", TRUE, NONE, 0, 0 }
+ { "rdrand",TRUE, LONG, op1(Rv), 0 },
+ { "rdseed",TRUE, LONG, op1(Rv), 0 }
};
static const struct inst db_inst_table[256] = {
@@ -1528,6 +1529,10 @@
db_printf("%s", db_reg[rex != 0 ? 1 : 0][(rex & REX_R) ? QUAD : LONG][f_rm(rex, inst)]);
break;
+ case Rv:
+ db_printf("%s", db_reg[rex != 0 ? 1 : 0][(size == LONG && (rex & REX_W)) ? QUAD : size][f_rm(rex, regmodrm)]);
+ break;
+
case S:
db_printf("%s", db_seg_reg[f_reg(rex, regmodrm)]);
break;
==== //depot/projects/smpng/sys/modules/x86dis/x86dis.c#10 (text+ko) ====
@@ -120,4 +120,8 @@
__asm __volatile("vmwrite %0,%1" :: "m" (*addr), "r" ((uint64_t)reg));
__asm __volatile("vmxoff");
__asm __volatile("vmxon %0" :: "m" (*addr));
+ (void)rdrand();
+ (void)rdrand64();
+ __asm __volatile("rdseed %0" : "=r" (val));
+ __asm __volatile("rdseed %edi");
}
From owner-p4-projects@FreeBSD.ORG Sat May 17 21:07:50 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 2528DE06; Sat, 17 May 2014 21:07:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id DAAB3E04
for <perforce@freebsd.org>; Sat, 17 May 2014 21:07:49 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 C6F54272D
for <perforce@freebsd.org>; Sat, 17 May 2014 21:07:49 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HL7ni2001089
for <perforce@freebsd.org>; Sat, 17 May 2014 21:07:49 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s4HL7ntM001086
for perforce@freebsd.org; Sat, 17 May 2014 21:07:49 GMT
(envelope-from jhb@freebsd.org)
Date: Sat, 17 May 2014 21:07:49 GMT
Message-Id: <201405172107.s4HL7ntM001086@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1193936 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 May 2014 21:07:50 -0000
http://p4web.freebsd.org/@@1193936?ac=10
Change 1193936 by jhb@jhb_pippin on 2014/05/17 21:07:28
RDRAND/RDSEED VMX exit constants.
Affected files ...
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.h#9 edit
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#13 edit
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_controls.h#6 edit
Differences ...
==== //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.h#9 (text+ko) ====
@@ -331,6 +331,9 @@
#define EXIT_REASON_WBINVD 54
#define EXIT_REASON_XSETBV 55
#define EXIT_REASON_APIC_WRITE 56
+#define EXIT_REASON_RDRAND 57
+#define EXIT_REASON_INVPCID 58
+#define EXIT_REASON_RDSEED 61
/*
* NMI unblocking due to IRET.
==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#13 (text+ko) ====
@@ -300,6 +300,12 @@
return "xsetbv";
case EXIT_REASON_APIC_WRITE:
return "apic-write";
+ case EXIT_REASON_RDRAND:
+ return "rdrand";
+ case EXIT_REASON_INVPCID:
+ return "invpcid";
+ case EXIT_REASON_RDSEED:
+ return "rdseed";
default:
snprintf(reasonbuf, sizeof(reasonbuf), "%d", reason);
return (reasonbuf);
==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_controls.h#6 (text+ko) ====
@@ -71,7 +71,9 @@
#define PROCBASED2_APIC_REGISTER_VIRTUALIZATION (1 << 8)
#define PROCBASED2_VIRTUAL_INTERRUPT_DELIVERY (1 << 9)
#define PROCBASED2_PAUSE_LOOP_EXITING (1 << 10)
+#define PROCBASED2_RDRAND_EXITING (1 << 11)
#define PROCBASED2_ENABLE_INVPCID (1 << 12)
+#define PROCBASED2_RDSEED_EXITING (1 << 16)
/* VM Exit Controls */
#define VM_EXIT_SAVE_DEBUG_CONTROLS (1 << 2)
From owner-p4-projects@FreeBSD.ORG Sat May 17 22:45:36 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4DA26A10; Sat, 17 May 2014 22:45:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 0EF10A0E
for <perforce@freebsd.org>; Sat, 17 May 2014 22:45:36 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 D43842ECA
for <perforce@freebsd.org>; Sat, 17 May 2014 22:45:35 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HMjZjj037397
for <perforce@freebsd.org>; Sat, 17 May 2014 22:45:35 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s4HMjZ2v037394
for perforce@freebsd.org; Sat, 17 May 2014 22:45:35 GMT
(envelope-from jhb@freebsd.org)
Date: Sat, 17 May 2014 22:45:35 GMT
Message-Id: <201405172245.s4HMjZ2v037394@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1193938 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 May 2014 22:45:36 -0000
http://p4web.freebsd.org/@@1193938?ac=10
Change 1193938 by jhb@jhb_pippin on 2014/05/17 22:44:58
IFC @1193937
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#16 integrate
.. //depot/projects/smpng/sys/arm/conf/BEAGLEBONE#10 integrate
.. //depot/projects/smpng/sys/arm/conf/PANDABOARD#8 integrate
.. //depot/projects/smpng/sys/arm/include/platformvar.h#2 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_i2c.c#5 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_machdep.c#8 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/digi-ccwmx53.dts#2 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/efikamx.dts#2 integrate
.. //depot/projects/smpng/sys/conf/NOTES#212 integrate
.. //depot/projects/smpng/sys/conf/kern.opts.mk#2 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#86 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#94 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#77 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#16 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/db_disasm.c 261213 2014-01-27 18:53:18Z jhb $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/db_disasm.c 266354 2014-05-17 21:10:03Z jhb $");
/*
* Instruction disassembler.
==== //depot/projects/smpng/sys/arm/conf/BEAGLEBONE#10 (text+ko) ====
@@ -18,7 +18,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/BEAGLEBONE 263693 2014-03-24 20:06:27Z loos $
+# $FreeBSD: head/sys/arm/conf/BEAGLEBONE 266334 2014-05-17 18:35:22Z andrew $
ident BEAGLEBONE
@@ -50,6 +50,7 @@
options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options PREEMPTION
+options PLATFORM
options FREEBSD_BOOT_LOADER
options VFP # vfp/neon
==== //depot/projects/smpng/sys/arm/conf/PANDABOARD#8 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/PANDABOARD 264138 2014-04-04 20:58:45Z ian $
+# $FreeBSD: head/sys/arm/conf/PANDABOARD 266334 2014-05-17 18:35:22Z andrew $
ident PANDABOARD
@@ -72,6 +72,7 @@
options FREEBSD_BOOT_LOADER
options PREEMPTION
+options PLATFORM
# MMC/SD/SDIO Card slot support
device mmc # mmc/sd bus
==== //depot/projects/smpng/sys/arm/include/platformvar.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/arm/include/platformvar.h 266301 2014-05-17 11:27:36Z andrew $
+ * $FreeBSD: head/sys/arm/include/platformvar.h 266333 2014-05-17 18:02:46Z andrew $
*/
#ifndef _MACHINE_PLATFORMVAR_H_
@@ -83,21 +83,24 @@
extern platform_method_t fdt_platform_methods[];
-#define FDT_PLATFORM_DEF(NAME, NAME_STR, size, compatible) \
-static fdt_platform_def_t NAME ## _fdt_platform = { \
- .name = NAME_STR, \
- .methods = fdt_platform_methods, \
- .fdt_compatible = compatible, \
-}; \
-static kobj_class_t NAME ## _baseclasses[] = \
- { (kobj_class_t)&NAME ## _fdt_platform, NULL }; \
-static platform_def_t NAME ## _platform = { \
- NAME_STR, \
- NAME ## _methods, \
- size, \
- NAME ## _baseclasses, \
-}; \
-DATA_SET(platform_set, NAME ## _platform)
+#define FDT_PLATFORM_DEF2(NAME, VAR_NAME, NAME_STR, size, compatible) \
+static fdt_platform_def_t VAR_NAME ## _fdt_platform = { \
+ .name = NAME_STR, \
+ .methods = fdt_platform_methods, \
+ .fdt_compatible = compatible, \
+}; \
+static kobj_class_t VAR_NAME ## _baseclasses[] = \
+ { (kobj_class_t)&VAR_NAME ## _fdt_platform, NULL }; \
+static platform_def_t VAR_NAME ## _platform = { \
+ NAME_STR, \
+ NAME ## _methods, \
+ size, \
+ VAR_NAME ## _baseclasses, \
+}; \
+DATA_SET(platform_set, VAR_NAME ## _platform)
+
+#define FDT_PLATFORM_DEF(NAME, NAME_STR, size, compatible) \
+ FDT_PLATFORM_DEF2(NAME, NAME, NAME_STR, size, compatible)
#endif
==== //depot/projects/smpng/sys/arm/ti/ti_i2c.c#5 (text+ko) ====
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/ti/ti_i2c.c 261410 2014-02-02 19:17:28Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/ti/ti_i2c.c 266336 2014-05-17 18:52:20Z andrew $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,6 +65,7 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
+#include <arm/ti/ti_cpuid.h>
#include <arm/ti/ti_prcm.h>
#include <arm/ti/ti_i2c.h>
@@ -106,21 +107,23 @@
uint8_t hssclh; /* High Speed mode SCL high time */
};
-static struct ti_i2c_clock_config ti_i2c_clock_configs[] = {
-
#if defined(SOC_OMAP4)
+static struct ti_i2c_clock_config ti_omap4_i2c_clock_configs[] = {
{ IIC_SLOW, 100000, 23, 13, 15, 0, 0},
{ IIC_FAST, 400000, 9, 5, 7, 0, 0},
{ IIC_FASTEST, 3310000, 1, 113, 115, 7, 10},
-#elif defined(SOC_TI_AM335X)
+ { -1, 0 }
+};
+#endif
+
+#if defined(SOC_TI_AM335X)
+static struct ti_i2c_clock_config ti_am335x_i2c_clock_configs[] = {
{ IIC_SLOW, 100000, 3, 53, 55, 0, 0},
{ IIC_FAST, 400000, 3, 8, 10, 0, 0},
{ IIC_FASTEST, 400000, 3, 8, 10, 0, 0}, /* This might be higher */
-#else
-#error "TI I2C driver is not supported on this SoC"
-#endif
{ -1, 0 }
};
+#endif
#define TI_I2C_REV1 0x003C /* OMAP3 */
@@ -280,7 +283,20 @@
struct ti_i2c_clock_config *clkcfg;
uint16_t con_reg;
- clkcfg = ti_i2c_clock_configs;
+ switch (ti_chip()) {
+#ifdef SOC_OMAP4
+ case CHIP_OMAP_4:
+ clkcfg = ti_omap4_i2c_clock_configs;
+ break;
+#endif
+#ifdef SOC_TI_AM335X
+ case CHIP_AM335X:
+ clkcfg = ti_am335x_i2c_clock_configs;
+ break;
+#endif
+ default:
+ panic("Unknown Ti SoC, unable to reset the i2c");
+ }
while (clkcfg->speed != -1) {
if (clkcfg->speed == speed)
break;
==== //depot/projects/smpng/sys/arm/ti/ti_machdep.c#8 (text+ko) ====
@@ -38,7 +38,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/ti/ti_machdep.c 266301 2014-05-17 11:27:36Z andrew $");
+__FBSDID("$FreeBSD: head/sys/arm/ti/ti_machdep.c 266334 2014-05-17 18:35:22Z andrew $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -51,45 +51,40 @@
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
-#include <machine/platform.h>
+#include <machine/platformvar.h>
#include <arm/ti/omap4/omap4_reg.h>
+#include "platform_if.h"
+
void (*ti_cpu_reset)(void) = NULL;
-vm_offset_t
-platform_lastaddr(void)
+static vm_offset_t
+ti_lastaddr(platform_t plat)
{
return (arm_devmap_lastaddr());
}
-void
-platform_probe_and_attach(void)
-{
-}
-
-void
-platform_gpio_init(void)
-{
-}
-
-void
-platform_late_init(void)
-{
-}
-
/*
* Construct static devmap entries to map out the most frequently used
* peripherals using 1mb section mappings.
*/
-int
-platform_devmap_init(void)
+#if defined(SOC_OMAP4)
+static int
+ti_omap4_devmap_init(platform_t plat)
{
-#if defined(SOC_OMAP4)
arm_devmap_add_entry(0x48000000, 0x01000000); /*16mb L4_PER devices */
arm_devmap_add_entry(0x4A000000, 0x01000000); /*16mb L4_CFG devices */
-#elif defined(SOC_TI_AM335X)
+ return (0);
+}
+#endif
+
+#if defined(SOC_TI_AM335X)
+static int
+ti_am335x_devmap_init(platform_t plat)
+{
+
arm_devmap_add_entry(0x44C00000, 0x00400000); /* 4mb L4_WKUP devices*/
arm_devmap_add_entry(0x47400000, 0x00100000); /* 1mb USB */
arm_devmap_add_entry(0x47800000, 0x00100000); /* 1mb mmchs2 */
@@ -97,11 +92,9 @@
arm_devmap_add_entry(0x49000000, 0x00100000); /* 1mb edma3 */
arm_devmap_add_entry(0x49800000, 0x00300000); /* 3mb edma3 */
arm_devmap_add_entry(0x4A000000, 0x01000000); /*16mb L4_FAST devices*/
-#else
-#error "Unknown SoC"
-#endif
return (0);
}
+#endif
struct arm32_dma_range *
bus_dma_get_range(void)
@@ -127,3 +120,24 @@
printf("Reset failed!\n");
while (1);
}
+
+#if defined(SOC_OMAP4)
+static platform_method_t omap4_methods[] = {
+ PLATFORMMETHOD(platform_devmap_init, ti_omap4_devmap_init),
+ PLATFORMMETHOD(platform_lastaddr, ti_lastaddr),
+
+ PLATFORMMETHOD_END,
+};
+FDT_PLATFORM_DEF(omap4, "omap4", 0, "ti,omap4430");
+#endif
+
+#if defined(SOC_TI_AM335X)
+static platform_method_t am335x_methods[] = {
+ PLATFORMMETHOD(platform_devmap_init, ti_am335x_devmap_init),
+ PLATFORMMETHOD(platform_lastaddr, ti_lastaddr),
+
+ PLATFORMMETHOD_END,
+};
+
+FDT_PLATFORM_DEF(am335x, "am335x", 0, "ti,am335x");
+#endif
==== //depot/projects/smpng/sys/boot/fdt/dts/arm/digi-ccwmx53.dts#2 (text+ko) ====
@@ -29,7 +29,7 @@
*
* Digi ConnectCore Wi-i.MX53
*
- * $FreeBSD: head/sys/boot/fdt/dts/arm/digi-ccwmx53.dts 264428 2014-04-13 22:35:39Z rpaulo $
+ * $FreeBSD: head/sys/boot/fdt/dts/arm/digi-ccwmx53.dts 266318 2014-05-17 14:57:34Z andrew $
*/
/dts-v1/;
@@ -37,7 +37,7 @@
/ {
model = "Digi ConnectCore Wi-i.MX53";
- compatible = "digi,imx53-ccwm53";
+ compatible = "digi,imx53-ccwm53", "fsl,imx53";
memory {
/* RAM 512M */
==== //depot/projects/smpng/sys/boot/fdt/dts/arm/efikamx.dts#2 (text+ko) ====
@@ -28,7 +28,7 @@
*
* Freescale i.MX515 Device Tree Source.
*
- * $FreeBSD: head/sys/boot/fdt/dts/arm/efikamx.dts 262614 2014-02-28 18:29:09Z imp $
+ * $FreeBSD: head/sys/boot/fdt/dts/arm/efikamx.dts 266318 2014-05-17 14:57:34Z andrew $
*/
/dts-v1/;
@@ -36,7 +36,7 @@
/ {
model = "Genesi Efika MX";
- compatible = "genesi,imx51-efikamx";
+ compatible = "genesi,imx51-efikamx", "fsl,imx51";
memory {
/* RAM 512M */
==== //depot/projects/smpng/sys/conf/NOTES#212 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/NOTES 265248 2014-05-02 23:23:18Z marius $
+# $FreeBSD: head/sys/conf/NOTES 266335 2014-05-17 18:40:43Z lwhsu $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -2686,6 +2686,8 @@
# ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
# LinkSys USB200M and various other adapters.
device axe
+# ASIX Electronics AX88178A/AX88179 USB 2.0/3.0 gigabit ethernet driver.
+device axge
#
# Devices which communicate using Ethernet over USB, particularly
==== //depot/projects/smpng/sys/conf/kern.opts.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/kern.opts.mk 265899 2014-05-12 01:47:45Z imp $
+# $FreeBSD: head/sys/conf/kern.opts.mk 266349 2014-05-17 20:31:34Z imp $
# Options set in the build system that affect the kernel somehow.
@@ -19,17 +19,15 @@
FORMAT_EXTENSIONS \
KERNEL_SYMBOLS
-__DEFAULT_NO_OPTIONS = \
+# expanded inline from bsd.mkopt.mk:
-# Kludge to allow a less painful transition. If MAKESYSPATH isn't defined,
-# assume we have a standard FreeBSD src tree layout and reach over and grab
-# bsd.mkopt.mk from there. If it is defined, trust it to point someplace sane
-# and include bsd.mkopt.mk from there. We need the !defined case to keep ports
-# kernel modules working (though arguably they should define MAKESYSPATH). We
-# need the latter case to keep the Jenkins testing harness working where they
-# specifically use a non-standard layout, but do define MAKESYSPATH correctly.
-.if !defined(MAKESYSPATH)
-.include "../../share/mk/bsd.mkopt.mk"
+.for var in ${__DEFAULT_YES_OPTIONS}
+.if !defined(MK_${var})
+.if defined(WITHOUT_${var}) # WITHOUT always wins
+MK_${var}:= no
.else
-.include <bsd.mkopt.mk>
+MK_${var}:= yes
+.endif
.endif
+.endfor
+.undef __DEFAULT_YES_OPTIONS
==== //depot/projects/smpng/sys/conf/kern.pre.mk#86 (text+ko) ====
@@ -1,9 +1,21 @@
-# $FreeBSD: head/sys/conf/kern.pre.mk 265833 2014-05-10 16:38:18Z imp $
+# $FreeBSD: head/sys/conf/kern.pre.mk 266349 2014-05-17 20:31:34Z imp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
-.include <src.opts.mk>
+# Allow user to configure things that only effect src tree builds.
+# Note: This is duplicated from src.sys.mk to ensure that we include
+# /etc/src.conf when building the kernel. Kernels can be built without
+# the rest of /usr/src, but they still always process SRCCONF even though
+# the normal mechanisms to prevent that (compiling out of tree) won't
+# work. To ensure they do work, we have to duplicate thee few lines here.
+SRCCONF?= /etc/src.conf
+.if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_)
+.include "${SRCCONF}"
+_srcconf_included_:
+.endif
+
+.include <bsd.own.mk>
.include <bsd.compiler.mk>
.include "kern.opts.mk"
==== //depot/projects/smpng/sys/conf/kmod.mk#94 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: head/sys/conf/kmod.mk 265841 2014-05-10 16:39:15Z imp $
+# $FreeBSD: head/sys/conf/kmod.mk 266349 2014-05-17 20:31:34Z imp $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -65,15 +65,10 @@
KMODUNLOAD?= /sbin/kldunload
OBJCOPY?= objcopy
-# Note: we're really bsd.kmod.mk, so we have to allow src.opts.mk to be
-# optional. Include it if we can so we can get /etc/src.conf changes,
-# if we're in the tree. If we can't include it that's OK. kern.opts.mk
-# has all the kernel options in it, and should be included after src.opts.mk
-# so it picks everything up.
-.sinclude <src.opts.mk>
+# Grab all the options for a kernel build.
+.include "kern.opts.mk"
.include <bsd.init.mk>
.include <bsd.compiler.mk>
-.include "kern.opts.mk"
.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
==== //depot/projects/smpng/sys/geom/geom_disk.c#77 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 265072 2014-04-29 01:17:43Z bdrewery $");
+__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 266319 2014-05-17 15:07:00Z mav $");
#include "opt_geom.h"
@@ -223,7 +223,7 @@
if (bp2->bio_error == 0)
bp2->bio_error = bp->bio_error;
bp2->bio_completed += bp->bio_completed;
- if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) != 0)
+ if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE|BIO_FLUSH)) != 0)
devstat_end_transaction_bio_bt(sc->dp->d_devstat, bp, &now);
bp2->bio_inbed++;
if (bp2->bio_children == bp2->bio_inbed) {
@@ -244,7 +244,7 @@
bp->bio_completed = bp->bio_length - bp->bio_resid;
bp->bio_done = (void *)bp->bio_to;
bp->bio_to = LIST_FIRST(&bp->bio_disk->d_geom->provider);
- if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) != 0) {
+ if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE|BIO_FLUSH)) != 0) {
binuptime(&now);
sc = bp->bio_to->private;
mtx_lock(&sc->done_mtx);
@@ -418,6 +418,9 @@
bp->bio_disk = dp;
bp->bio_to = (void *)bp->bio_done;
bp->bio_done = g_disk_done_single;
+ mtx_lock(&sc->start_mtx);
+ devstat_start_transaction_bio(dp->d_devstat, bp);
+ mtx_unlock(&sc->start_mtx);
dp->d_strategy(bp);
break;
default:
From owner-p4-projects@FreeBSD.ORG Mon May 19 18:09:09 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id AEBDAB5A; Mon, 19 May 2014 18:09:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 4EDFEB53
for <perforce@freebsd.org>; Mon, 19 May 2014 18:09:09 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 3B62425C1
for <perforce@freebsd.org>; Mon, 19 May 2014 18:09:09 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JI99vb000184
for <perforce@freebsd.org>; Mon, 19 May 2014 18:09:09 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s4JI99wN000181
for perforce@freebsd.org; Mon, 19 May 2014 18:09:09 GMT
(envelope-from jhb@freebsd.org)
Date: Mon, 19 May 2014 18:09:09 GMT
Message-Id: <201405191809.s4JI99wN000181@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1193977 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 May 2014 18:09:10 -0000
http://p4web.freebsd.org/@@1193977?ac=10
Change 1193977 by jhb@jhb_jhbbsd on 2014/05/19 18:08:52
Pull-up latest test instruction list.
Affected files ...
.. //depot/projects/smpng/sys/modules/x86dis/x86dis.c#11 integrate
Differences ...
==== //depot/projects/smpng/sys/modules/x86dis/x86dis.c#11 (text+ko) ====
@@ -124,4 +124,15 @@
(void)rdrand64();
__asm __volatile("rdseed %0" : "=r" (val));
__asm __volatile("rdseed %edi");
+ invpcid((struct invpcid_descr *)addr, val);
+ __asm __volatile("clac");
+ __asm __volatile("stac");
+ __asm __volatile("vmrun %0" :: "a" (addr));
+ __asm __volatile("vmsave %0" :: "a" (addr));
+ __asm __volatile("vmload %0" :: "a" (addr));
+ __asm __volatile("stgi");
+ __asm __volatile("clgi");
+ __asm __volatile("vmmcall");
+ __asm __volatile("invlpga %1,%0" :: "a" (addr), "c" (aux));
+ __asm __volatile("skinit %0" :: "a" (aux));
}
From owner-p4-projects@FreeBSD.ORG Mon May 19 21:06:21 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id ABF84F2B; Mon, 19 May 2014 21:06:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 6E82FF29
for <perforce@freebsd.org>; Mon, 19 May 2014 21:06:21 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 5933327EF
for <perforce@freebsd.org>; Mon, 19 May 2014 21:06:21 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JL6LDY065014
for <perforce@freebsd.org>; Mon, 19 May 2014 21:06:21 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s4JL6LGb065011
for perforce@freebsd.org; Mon, 19 May 2014 21:06:21 GMT
(envelope-from jhb@freebsd.org)
Date: Mon, 19 May 2014 21:06:21 GMT
Message-Id: <201405192106.s4JL6LGb065011@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1193982 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 May 2014 21:06:21 -0000
http://p4web.freebsd.org/@@1193982?ac=10
Change 1193982 by jhb@jhb_jhbbsd on 2014/05/19 21:05:43
IFC @1193981
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#17 integrate
.. //depot/projects/smpng/sys/amd64/include/vmm.h#11 integrate
.. //depot/projects/smpng/sys/amd64/include/vmm_instruction_emul.h#5 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#14 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.h#9 integrate
.. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_support.S#7 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm.c#11 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#9 integrate
.. //depot/projects/smpng/sys/boot/usb/bsd_kernel.c#2 integrate
.. //depot/projects/smpng/sys/boot/usb/bsd_kernel.h#2 integrate
.. //depot/projects/smpng/sys/conf/files#298 integrate
.. //depot/projects/smpng/sys/conf/kern.opts.mk#3 integrate
.. //depot/projects/smpng/sys/dev/i40e/i40e.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_adminq.c#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_adminq.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_adminq_cmd.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_alloc.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_common.c#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_hmc.c#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_hmc.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_lan_hmc.c#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_lan_hmc.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_nvm.c#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_osdep.c#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_osdep.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_pf.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_prototype.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_register.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_register_x710_int.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_status.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_txrx.c#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_type.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/i40e_virtchnl.h#1 branch
.. //depot/projects/smpng/sys/dev/i40e/if_i40e.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/dwc_otg.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/dwc_otg.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/dwc_otg_atmelarm.c#3 delete
.. //depot/projects/smpng/sys/dev/usb/controller/dwc_otg_fdt.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#29 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_bus.h#16 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_core.h#19 integrate
.. //depot/projects/smpng/sys/geom/geom_event.c#43 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#74 integrate
.. //depot/projects/smpng/sys/kern/subr_rman.c#47 integrate
.. //depot/projects/smpng/sys/mips/conf/AP93.hints#5 integrate
.. //depot/projects/smpng/sys/modules/i40e/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/dwc_otg/Makefile#4 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#82 integrate
.. //depot/projects/smpng/sys/netinet/in_rss.c#2 integrate
.. //depot/projects/smpng/sys/netinet/in_rss.h#2 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#139 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#161 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#96 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#64 integrate
.. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw_nat.c#7 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#17 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/db_disasm.c 266354 2014-05-17 21:10:03Z jhb $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/db_disasm.c 266449 2014-05-19 18:07:37Z jhb $");
/*
* Instruction disassembler.
@@ -1391,6 +1391,46 @@
i_size = NONE;
i_mode = 0;
break;
+ case 0xd8:
+ i_name = "vmrun";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xd9:
+ i_name = "vmmcall";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xda:
+ i_name = "vmload";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xdb:
+ i_name = "vmsave";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xdc:
+ i_name = "stgi";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xdd:
+ i_name = "clgi";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xde:
+ i_name = "skinit";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xdf:
+ i_name = "invlpga";
+ i_size = NONE;
+ i_mode = 0;
+ break;
case 0xf8:
i_name = "swapgs";
i_size = NONE;
==== //depot/projects/smpng/sys/amd64/include/vmm.h#11 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/include/vmm.h 266125 2014-05-15 14:16:55Z jhb $
+ * $FreeBSD: head/sys/amd64/include/vmm.h 266424 2014-05-19 03:50:07Z neel $
*/
#ifndef _VMM_H_
@@ -361,6 +361,7 @@
uint64_t cr3;
enum vie_cpu_mode cpu_mode;
enum vie_paging_mode paging_mode;
+ int cpl;
struct vie vie;
} inst_emul;
/*
==== //depot/projects/smpng/sys/amd64/include/vmm_instruction_emul.h#5 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/include/vmm_instruction_emul.h 261504 2014-02-05 04:39:03Z jhb $
+ * $FreeBSD: head/sys/amd64/include/vmm_instruction_emul.h 266424 2014-05-19 03:50:07Z neel $
*/
#ifndef _VMM_INSTRUCTION_EMUL_H_
@@ -119,7 +119,8 @@
*/
int vmm_fetch_instruction(struct vm *vm, int cpuid,
uint64_t rip, int inst_length, uint64_t cr3,
- enum vie_paging_mode paging_mode, struct vie *vie);
+ enum vie_paging_mode paging_mode, int cpl,
+ struct vie *vie);
void vie_init(struct vie *vie);
==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#14 (text+ko) ====
@@ -23,11 +23,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 265114 2014-04-30 02:08:27Z neel $
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 266424 2014-05-19 03:50:07Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 265114 2014-04-30 02:08:27Z neel $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 266424 2014-05-19 03:50:07Z neel $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1498,6 +1498,18 @@
return (HANDLED);
}
+/*
+ * From section "Guest Register State" in the Intel SDM: CPL = SS.DPL
+ */
+static int
+vmx_cpl(void)
+{
+ uint32_t ssar;
+
+ ssar = vmcs_read(VMCS_GUEST_SS_ACCESS_RIGHTS);
+ return ((ssar >> 5) & 0x3);
+}
+
static enum vie_cpu_mode
vmx_cpu_mode(void)
{
@@ -1522,6 +1534,18 @@
return (PAGING_MODE_PAE);
}
+static void
+vmexit_inst_emul(struct vm_exit *vmexit, uint64_t gpa, uint64_t gla)
+{
+ vmexit->exitcode = VM_EXITCODE_INST_EMUL;
+ vmexit->u.inst_emul.gpa = gpa;
+ vmexit->u.inst_emul.gla = gla;
+ vmexit->u.inst_emul.cr3 = vmcs_guest_cr3();
+ vmexit->u.inst_emul.cpu_mode = vmx_cpu_mode();
+ vmexit->u.inst_emul.paging_mode = vmx_paging_mode();
+ vmexit->u.inst_emul.cpl = vmx_cpl();
+}
+
static int
ept_fault_type(uint64_t ept_qual)
{
@@ -1713,12 +1737,8 @@
}
if (allowed) {
- vmexit->exitcode = VM_EXITCODE_INST_EMUL;
- vmexit->u.inst_emul.gpa = DEFAULT_APIC_BASE + offset;
- vmexit->u.inst_emul.gla = VIE_INVALID_GLA;
- vmexit->u.inst_emul.cr3 = vmcs_guest_cr3();
- vmexit->u.inst_emul.cpu_mode = vmx_cpu_mode();
- vmexit->u.inst_emul.paging_mode = vmx_paging_mode();
+ vmexit_inst_emul(vmexit, DEFAULT_APIC_BASE + offset,
+ VIE_INVALID_GLA);
}
/*
@@ -1949,12 +1969,7 @@
vmexit->u.paging.fault_type = ept_fault_type(qual);
vmm_stat_incr(vmx->vm, vcpu, VMEXIT_NESTED_FAULT, 1);
} else if (ept_emulation_fault(qual)) {
- vmexit->exitcode = VM_EXITCODE_INST_EMUL;
- vmexit->u.inst_emul.gpa = gpa;
- vmexit->u.inst_emul.gla = vmcs_gla();
- vmexit->u.inst_emul.cr3 = vmcs_guest_cr3();
- vmexit->u.inst_emul.cpu_mode = vmx_cpu_mode();
- vmexit->u.inst_emul.paging_mode = vmx_paging_mode();
+ vmexit_inst_emul(vmexit, gpa, vmcs_gla());
vmm_stat_incr(vmx->vm, vcpu, VMEXIT_INST_EMUL, 1);
}
/*
==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx.h#9 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/intel/vmx.h 264353 2014-04-11 20:15:53Z neel $
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx.h 266390 2014-05-18 03:50:17Z grehan $
*/
#ifndef _VMX_H_
@@ -67,7 +67,7 @@
int inst_fail_status;
/*
- * The pmap needs to be deactivated in vmx_exit_guest()
+ * The pmap needs to be deactivated in vmx_enter_guest()
* so keep a copy of the 'pmap' in each vmxctx.
*/
struct pmap *pmap;
@@ -121,10 +121,11 @@
#define VMX_VMLAUNCH_ERROR 2
#define VMX_INVEPT_ERROR 3
int vmx_enter_guest(struct vmxctx *ctx, struct vmx *vmx, int launched);
-void vmx_exit_guest(void);
void vmx_call_isr(uintptr_t entry);
u_long vmx_fix_cr0(u_long cr0);
u_long vmx_fix_cr4(u_long cr4);
+extern char vmx_exit_guest[];
+
#endif
==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_support.S#7 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/intel/vmx_support.S 264353 2014-04-11 20:15:53Z neel $
+ * $FreeBSD: head/sys/amd64/vmm/intel/vmx_support.S 266390 2014-05-18 03:50:17Z grehan $
*/
#include <machine/asmacros.h>
@@ -37,6 +37,10 @@
#define LK
#endif
+/* Be friendly to DTrace FBT's prologue/epilogue pattern matching */
+#define VENTER push %rbp ; mov %rsp,%rbp
+#define VLEAVE pop %rbp
+
/*
* Assumes that %rdi holds a pointer to the 'vmxctx'.
*
@@ -98,6 +102,7 @@
* Interrupts must be disabled on entry.
*/
ENTRY(vmx_enter_guest)
+ VENTER
/*
* Save host state before doing anything else.
*/
@@ -183,14 +188,17 @@
LK btrl %r10d, PM_ACTIVE(%r11)
VMX_HOST_RESTORE
+ VLEAVE
ret
-END(vmx_enter_guest)
/*
- * void vmx_exit_guest(void)
- * %rsp points to the struct vmxctx
+ * Non-error VM-exit from the guest. Make this a label so it can
+ * be used by C code when setting up the VMCS.
+ * The VMCS-restored %rsp points to the struct vmxctx
*/
-ENTRY(vmx_exit_guest)
+ ALIGN_TEXT
+ .globl vmx_exit_guest
+vmx_exit_guest:
/*
* Save guest state that is not automatically saved in the vmcs.
*/
@@ -229,8 +237,9 @@
* value of VMX_GUEST_VMEXIT.
*/
movl $VMX_GUEST_VMEXIT, %eax
+ VLEAVE
ret
-END(vmx_exit_guest)
+END(vmx_enter_guest)
/*
* %rdi = interrupt handler entry point
@@ -239,6 +248,7 @@
* instruction in Intel SDM, Vol 2.
*/
ENTRY(vmx_call_isr)
+ VENTER
mov %rsp, %r11 /* save %rsp */
and $~0xf, %rsp /* align on 16-byte boundary */
pushq $KERNEL_SS /* %ss */
@@ -247,5 +257,6 @@
pushq $KERNEL_CS /* %cs */
cli /* disable interrupts */
callq *%rdi /* push %rip and call isr */
+ VLEAVE
ret
END(vmx_call_isr)
==== //depot/projects/smpng/sys/amd64/vmm/vmm.c#11 (text+ko) ====
@@ -23,11 +23,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/vmm.c 265364 2014-05-05 16:19:24Z neel $
+ * $FreeBSD: head/sys/amd64/vmm/vmm.c 266424 2014-05-19 03:50:07Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 265364 2014-05-05 16:19:24Z neel $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 266424 2014-05-19 03:50:07Z neel $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1131,7 +1131,7 @@
struct vie *vie;
struct vcpu *vcpu;
struct vm_exit *vme;
- int error, inst_length;
+ int cpl, error, inst_length;
uint64_t rip, gla, gpa, cr3;
enum vie_cpu_mode cpu_mode;
enum vie_paging_mode paging_mode;
@@ -1147,6 +1147,7 @@
gla = vme->u.inst_emul.gla;
gpa = vme->u.inst_emul.gpa;
cr3 = vme->u.inst_emul.cr3;
+ cpl = vme->u.inst_emul.cpl;
cpu_mode = vme->u.inst_emul.cpu_mode;
paging_mode = vme->u.inst_emul.paging_mode;
vie = &vme->u.inst_emul.vie;
@@ -1155,7 +1156,7 @@
/* Fetch, decode and emulate the faulting instruction */
if (vmm_fetch_instruction(vm, vcpuid, rip, inst_length, cr3,
- paging_mode, vie) != 0)
+ paging_mode, cpl, vie) != 0)
return (EFAULT);
if (vmm_decode_instruction(vm, vcpuid, gla, cpu_mode, vie) != 0)
==== //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#9 (text+ko) ====
@@ -24,11 +24,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 264501 2014-04-15 15:11:10Z tychon $
+ * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 266424 2014-05-19 03:50:07Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 264501 2014-04-15 15:11:10Z tychon $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 266424 2014-05-19 03:50:07Z neel $");
#ifdef _KERNEL
#include <sys/param.h>
@@ -572,14 +572,16 @@
}
static int
-gla2gpa(struct vm *vm, uint64_t gla, uint64_t ptpphys,
- uint64_t *gpa, enum vie_paging_mode paging_mode)
+gla2gpa(struct vm *vm, uint64_t gla, uint64_t ptpphys, uint64_t *gpa,
+ enum vie_paging_mode paging_mode, int cpl)
{
- int nlevels, ptpshift, ptpindex;
+ int nlevels, ptpshift, ptpindex, usermode;
uint64_t *ptpbase, pte, pgsize;
uint32_t *ptpbase32, pte32;
void *cookie;
+ usermode = (cpl == 3 ? 1 : 0);
+
if (paging_mode == PAGING_MODE_FLAT) {
*gpa = gla;
return (0);
@@ -593,7 +595,7 @@
ptpbase32 = vm_gpa_hold(vm, ptpphys, PAGE_SIZE,
VM_PROT_READ, &cookie);
-
+
if (ptpbase32 == NULL)
goto error;
@@ -608,7 +610,11 @@
if ((pte32 & PG_V) == 0)
goto error;
- if (pte32 & PG_PS)
+ if (usermode && (pte32 & PG_U) == 0)
+ goto error;
+
+ /* XXX must be ignored if CR4.PSE=0 */
+ if (nlevels > 0 && (pte32 & PG_PS) != 0)
break;
ptpphys = pte32;
@@ -621,8 +627,8 @@
}
if (paging_mode == PAGING_MODE_PAE) {
- /* Zero out the lower 5 bits and the upper 12 bits */
- ptpphys >>= 5; ptpphys <<= 17; ptpphys >>= 12;
+ /* Zero out the lower 5 bits and the upper 32 bits */
+ ptpphys &= 0xffffffe0UL;
ptpbase = vm_gpa_hold(vm, ptpphys, sizeof(*ptpbase) * 4,
VM_PROT_READ, &cookie);
@@ -663,7 +669,10 @@
if ((pte & PG_V) == 0)
goto error;
- if (pte & PG_PS) {
+ if (usermode && (pte & PG_U) == 0)
+ goto error;
+
+ if (nlevels > 0 && (pte & PG_PS) != 0) {
if (pgsize > 1 * GB)
goto error;
else
@@ -684,7 +693,7 @@
int
vmm_fetch_instruction(struct vm *vm, int cpuid, uint64_t rip, int inst_length,
- uint64_t cr3, enum vie_paging_mode paging_mode,
+ uint64_t cr3, enum vie_paging_mode paging_mode, int cpl,
struct vie *vie)
{
int n, err, prot;
@@ -701,7 +710,7 @@
/* Copy the instruction into 'vie' */
while (vie->num_valid < inst_length) {
- err = gla2gpa(vm, rip, cr3, &gpa, paging_mode);
+ err = gla2gpa(vm, rip, cr3, &gpa, paging_mode, cpl);
if (err)
break;
==== //depot/projects/smpng/sys/boot/usb/bsd_kernel.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/boot/usb/bsd_kernel.c 246363 2013-02-05 14:44:25Z hselasky $ */
+/* $FreeBSD: head/sys/boot/usb/bsd_kernel.c 266396 2014-05-18 09:29:00Z hselasky $ */
/*-
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
@@ -380,8 +380,10 @@
}
void
-device_set_interrupt(device_t dev, intr_fn_t *fn, void *arg)
+device_set_interrupt(device_t dev, driver_filter_t *filter,
+ driver_intr_t *fn, void *arg)
{
+ dev->dev_irq_filter = filter;
dev->dev_irq_fn = fn;
dev->dev_irq_arg = arg;
}
@@ -395,8 +397,16 @@
return;
TAILQ_FOREACH(child, &parent->dev_children, dev_link) {
- if (child->dev_irq_fn != NULL)
- (child->dev_irq_fn) (child->dev_irq_arg);
+ int status;
+ if (child->dev_irq_filter != NULL)
+ status = child->dev_irq_filter(child->dev_irq_arg);
+ else
+ status = FILTER_SCHEDULE_THREAD;
+
+ if (status == FILTER_SCHEDULE_THREAD) {
+ if (child->dev_irq_fn != NULL)
+ (child->dev_irq_fn) (child->dev_irq_arg);
+ }
}
}
==== //depot/projects/smpng/sys/boot/usb/bsd_kernel.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/boot/usb/bsd_kernel.h 246363 2013-02-05 14:44:25Z hselasky $ */
+/* $FreeBSD: head/sys/boot/usb/bsd_kernel.h 266396 2014-05-18 09:29:00Z hselasky $ */
/*-
* Copyright (c) 2011 Hans Petter Selasky. All rights reserved.
*
@@ -96,6 +96,7 @@
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
#define MTX_DEF 0
+#define MTX_SPIN 0
#define MTX_RECURSE 0
#define SX_DUPOK 0
#define SX_NOWITNESS 0
@@ -201,6 +202,8 @@
void mtx_init(struct mtx *, const char *, const char *, int);
void mtx_lock(struct mtx *);
void mtx_unlock(struct mtx *);
+#define mtx_lock_spin(x) mtx_lock(x)
+#define mtx_unlock_spin(x) mtx_unlock(x)
int mtx_owned(struct mtx *);
void mtx_destroy(struct mtx *);
@@ -266,7 +269,11 @@
typedef struct driver driver_t;
typedef struct devclass *devclass_t;
typedef struct device *device_t;
-typedef void (intr_fn_t)(void *arg);
+typedef void (driver_intr_t)(void *arg);
+typedef int (driver_filter_t)(void *arg);
+#define FILTER_STRAY 0x01
+#define FILTER_HANDLED 0x02
+#define FILTER_SCHEDULE_THREAD 0x04
typedef int device_attach_t (device_t dev);
typedef int device_detach_t (device_t dev);
@@ -294,7 +301,8 @@
const struct module_data *dev_module;
void *dev_sc;
void *dev_aux;
- intr_fn_t *dev_irq_fn;
+ driver_filter_t *dev_irq_filter;
+ driver_intr_t *dev_irq_fn;
void *dev_irq_arg;
uint16_t dev_unit;
@@ -341,7 +349,7 @@
printf("%s: " fmt, device_get_nameunit(dev),## __VA_ARGS__)
device_t device_add_child(device_t dev, const char *name, int unit);
void device_quiet(device_t dev);
-void device_set_interrupt(device_t dev, intr_fn_t *fn, void *arg);
+void device_set_interrupt(device_t dev, driver_filter_t *, driver_intr_t *, void *);
void device_run_interrupts(device_t parent);
void device_set_ivars(device_t dev, void *ivars);
void *device_get_ivars(device_t dev);
==== //depot/projects/smpng/sys/conf/files#298 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/files 265813 2014-05-10 12:19:02Z loos $
+# $FreeBSD: head/sys/conf/files 266423 2014-05-19 01:21:02Z jfv $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1417,6 +1417,22 @@
dev/hwpmc/hwpmc_logging.c optional hwpmc
dev/hwpmc/hwpmc_mod.c optional hwpmc
dev/hwpmc/hwpmc_soft.c optional hwpmc
+dev/i40e/if_i40e.c optional i40e inet \
+ compile-with "${NORMAL_C} -I$S/dev/i40e -DSMP"
+dev/i40e/i40e_txrx.c optional i40e inet \
+ compile-with "${NORMAL_C} -I$S/dev/i40e -DSMP"
+dev/i40e/i40e_osdep.c optional i40e inet \
+ compile-with "${NORMAL_C} -I$S/dev/i40e -DSMP"
+dev/i40e/i40e_nvm.c optional i40e inet \
+ compile-with "${NORMAL_C} -I$S/dev/i40e -DSMP"
+dev/i40e/i40e_lan_hmc.c optional i40e inet \
+ compile-with "${NORMAL_C} -I$S/dev/i40e -DSMP"
+dev/i40e/i40e_hmc.c optional i40e inet \
+ compile-with "${NORMAL_C} -I$S/dev/i40e -DSMP"
+dev/i40e/i40e_common.c optional i40e inet \
+ compile-with "${NORMAL_C} -I$S/dev/i40e -DSMP"
+dev/i40e/i40e_adminq.c optional i40e inet \
+ compile-with "${NORMAL_C} -I$S/dev/i40e -DSMP"
dev/ichsmb/ichsmb.c optional ichsmb
dev/ichsmb/ichsmb_pci.c optional ichsmb pci
dev/ida/ida.c optional ida
==== //depot/projects/smpng/sys/conf/kern.opts.mk#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/kern.opts.mk 266349 2014-05-17 20:31:34Z imp $
+# $FreeBSD: head/sys/conf/kern.opts.mk 266446 2014-05-19 16:13:40Z imp $
# Options set in the build system that affect the kernel somehow.
@@ -16,6 +16,7 @@
# src tree.
__DEFAULT_YES_OPTIONS = \
+ ARM_EABI \
FORMAT_EXTENSIONS \
KERNEL_SYMBOLS
==== //depot/projects/smpng/sys/dev/usb/controller/dwc_otg.c#10 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/dev/usb/controller/dwc_otg.c 266012 2014-05-14 11:32:15Z hselasky $ */
+/* $FreeBSD: head/sys/dev/usb/controller/dwc_otg.c 266394 2014-05-18 09:13:29Z hselasky $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2010-2011 Aleksandr Rybalko. All rights reserved.
@@ -89,9 +89,6 @@
((struct dwc_otg_softc *)(((uint8_t *)(bus)) - \
((uint8_t *)&(((struct dwc_otg_softc *)0)->sc_bus))))
-#define DWC_OTG_PC2SC(pc) \
- DWC_OTG_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus)
-
#define DWC_OTG_PC2UDEV(pc) \
(USB_DMATAG_TO_XROOT((pc)->tag_parent)->udev)
@@ -104,6 +101,11 @@
GINTMSK_OTGINTMSK | \
GINTMSK_PRTINTMSK)
+#define DWC_OTG_MSK_GINT_THREAD_IRQ \
+ (GINTSTS_USBRST | GINTSTS_ENUMDONE | GINTSTS_PRTINT | \
+ GINTSTS_WKUPINT | GINTSTS_USBSUSP | GINTMSK_OTGINTMSK | \
+ GINTSTS_SESSREQINT)
+
static int dwc_otg_use_hsic;
static SYSCTL_NODE(_hw_usb, OID_AUTO, dwc_otg, CTLFLAG_RW, 0, "USB DWC OTG");
@@ -590,9 +592,8 @@
}
static uint8_t
-dwc_otg_host_channel_alloc(struct dwc_otg_td *td, uint8_t which, uint8_t is_out)
+dwc_otg_host_channel_alloc(struct dwc_otg_softc *sc, struct dwc_otg_td *td, uint8_t which, uint8_t is_out)
{
- struct dwc_otg_softc *sc;
uint32_t tx_p_size;
uint32_t tx_np_size;
uint8_t x;
@@ -604,9 +605,6 @@
if (DWC_OTG_PC2UDEV(td->pc)->flags.self_suspended != 0)
return (1); /* busy - cannot transfer data */
- /* get pointer to softc */
- sc = DWC_OTG_PC2SC(td->pc);
-
/* compute needed TX FIFO size */
if (is_out != 0) {
if (td->ep_type == UE_INTERRUPT ||
@@ -670,9 +668,8 @@
}
static void
-dwc_otg_host_channel_free(struct dwc_otg_td *td, uint8_t which)
+dwc_otg_host_channel_free(struct dwc_otg_softc *sc, struct dwc_otg_td *td, uint8_t which)
{
- struct dwc_otg_softc *sc;
uint8_t x;
if (td->channel[which] >= DWC_OTG_MAX_CHANNELS)
@@ -684,9 +681,6 @@
DPRINTF("CH=%d\n", x);
- /* get pointer to softc */
- sc = DWC_OTG_PC2SC(td->pc);
-
/*
* We need to let programmed host channels run till complete
* else the host channel will stop functioning. Assume that
@@ -714,17 +708,13 @@
}
static uint8_t
-dwc_otg_host_setup_tx(struct dwc_otg_td *td)
+dwc_otg_host_setup_tx(struct dwc_otg_softc *sc, struct dwc_otg_td *td)
{
struct usb_device_request req __aligned(4);
- struct dwc_otg_softc *sc;
uint32_t hcint;
uint32_t hcchar;
uint8_t delta;
- /* get pointer to softc */
- sc = DWC_OTG_PC2SC(td->pc);
-
if (td->channel[0] < DWC_OTG_MAX_CHANNELS) {
hcint = sc->sc_chan_state[td->channel[0]].hcint;
@@ -814,7 +804,7 @@
send_pkt:
/* free existing channel, if any */
- dwc_otg_host_channel_free(td, 0);
+ dwc_otg_host_channel_free(sc, td, 0);
if (sizeof(req) != td->remainder) {
td->error_any = 1;
@@ -837,7 +827,7 @@
}
/* allocate a new channel */
- if (dwc_otg_host_channel_alloc(td, 0, 1)) {
+ if (dwc_otg_host_channel_alloc(sc, td, 0, 1)) {
td->state = DWC_CHAN_ST_START;
goto busy;
}
@@ -875,7 +865,7 @@
send_cpkt:
/* free existing channel, if any */
- dwc_otg_host_channel_free(td, 0);
+ dwc_otg_host_channel_free(sc, td, 0);
delta = td->tt_complete_slot - sc->sc_last_frame_num - 1;
if (td->tt_scheduled == 0 || delta < DWC_OTG_TT_SLOT_MAX) {
@@ -890,7 +880,7 @@
goto complete;
}
/* allocate a new channel */
- if (dwc_otg_host_channel_alloc(td, 0, 0)) {
+ if (dwc_otg_host_channel_alloc(sc, td, 0, 0)) {
td->state = DWC_CHAN_ST_WAIT_C_PKT;
goto busy;
}
@@ -917,21 +907,17 @@
return (1); /* busy */
complete:
- dwc_otg_host_channel_free(td, 0);
+ dwc_otg_host_channel_free(sc, td, 0);
return (0); /* complete */
}
static uint8_t
-dwc_otg_setup_rx(struct dwc_otg_td *td)
+dwc_otg_setup_rx(struct dwc_otg_softc *sc, struct dwc_otg_td *td)
{
- struct dwc_otg_softc *sc;
struct usb_device_request req __aligned(4);
uint32_t temp;
uint16_t count;
- /* get pointer to softc */
- sc = DWC_OTG_PC2SC(td->pc);
-
/* check endpoint status */
if (sc->sc_last_rx_status == 0)
@@ -1072,13 +1058,8 @@
}
static uint8_t
-dwc_otg_host_rate_check(struct dwc_otg_td *td)
+dwc_otg_host_rate_check(struct dwc_otg_softc *sc, struct dwc_otg_td *td)
{
- struct dwc_otg_softc *sc;
-
- /* get pointer to softc */
- sc = DWC_OTG_PC2SC(td->pc);
-
if (td->ep_type == UE_ISOCHRONOUS) {
/* non TT isochronous traffic */
if ((td->tmr_val != 0) ||
@@ -1104,17 +1085,14 @@
}
static uint8_t
-dwc_otg_host_data_rx(struct dwc_otg_td *td)
+dwc_otg_host_data_rx(struct dwc_otg_softc *sc, struct dwc_otg_td *td)
{
- struct dwc_otg_softc *sc;
uint32_t hcint;
uint32_t hcchar;
uint32_t count;
uint8_t delta;
uint8_t channel;
- /* get pointer to softc */
- sc = DWC_OTG_PC2SC(td->pc);
channel = td->channel[td->tt_channel_tog];
if (channel < DWC_OTG_MAX_CHANNELS) {
@@ -1328,7 +1306,7 @@
receive_pkt:
/* free existing channel, if any */
- dwc_otg_host_channel_free(td, td->tt_channel_tog);
+ dwc_otg_host_channel_free(sc, td, td->tt_channel_tog);
if (td->hcsplt != 0) {
delta = td->tt_complete_slot - sc->sc_last_frame_num - 1;
@@ -1346,13 +1324,13 @@
/* complete split */
td->hcsplt |= HCSPLT_COMPSPLT;
} else if (td->tt_xactpos == HCSPLT_XACTPOS_BEGIN &&
- dwc_otg_host_rate_check(td)) {
+ dwc_otg_host_rate_check(sc, td)) {
td->state = DWC_CHAN_ST_WAIT_C_PKT;
goto busy;
}
/* allocate a new channel */
- if (dwc_otg_host_channel_alloc(td, td->tt_channel_tog, 0)) {
+ if (dwc_otg_host_channel_alloc(sc, td, td->tt_channel_tog, 0)) {
td->state = DWC_CHAN_ST_WAIT_C_PKT;
goto busy;
}
@@ -1417,8 +1395,8 @@
receive_spkt:
/* free existing channel(s), if any */
- dwc_otg_host_channel_free(td, 0);
- dwc_otg_host_channel_free(td, 1);
+ dwc_otg_host_channel_free(sc, td, 0);
+ dwc_otg_host_channel_free(sc, td, 1);
delta = td->tt_start_slot - sc->sc_last_frame_num - 1;
if (td->tt_scheduled == 0 || delta < DWC_OTG_TT_SLOT_MAX) {
@@ -1434,7 +1412,7 @@
}
/* allocate a new channel */
- if (dwc_otg_host_channel_alloc(td, 0, 0)) {
+ if (dwc_otg_host_channel_alloc(sc, td, 0, 0)) {
td->state = DWC_CHAN_ST_START;
goto busy;
}
@@ -1468,24 +1446,20 @@
return (1); /* busy */
complete:
- dwc_otg_host_channel_free(td, 0);
- dwc_otg_host_channel_free(td, 1);
+ dwc_otg_host_channel_free(sc, td, 0);
+ dwc_otg_host_channel_free(sc, td, 1);
return (0); /* complete */
}
static uint8_t
-dwc_otg_data_rx(struct dwc_otg_td *td)
+dwc_otg_data_rx(struct dwc_otg_softc *sc, struct dwc_otg_td *td)
{
- struct dwc_otg_softc *sc;
uint32_t temp;
uint16_t count;
uint8_t got_short;
got_short = 0;
- /* get pointer to softc */
- sc = DWC_OTG_PC2SC(td->pc);
-
/* check endpoint status */
if (sc->sc_last_rx_status == 0)
goto not_complete;
@@ -1587,17 +1561,14 @@
}
static uint8_t
-dwc_otg_host_data_tx(struct dwc_otg_td *td)
+dwc_otg_host_data_tx(struct dwc_otg_softc *sc, struct dwc_otg_td *td)
{
- struct dwc_otg_softc *sc;
uint32_t count;
uint32_t hcint;
uint32_t hcchar;
uint8_t delta;
uint8_t channel;
- /* get pointer to softc */
- sc = DWC_OTG_PC2SC(td->pc);
channel = td->channel[td->tt_channel_tog];
if (channel < DWC_OTG_MAX_CHANNELS) {
@@ -1723,14 +1694,14 @@
td->tt_xactpos++;
/* free existing channel, if any */
- dwc_otg_host_channel_free(td, td->tt_channel_tog);
+ dwc_otg_host_channel_free(sc, td, td->tt_channel_tog);
td->state = DWC_CHAN_ST_TX_PKT_ISOC;
/* FALLTHROUGH */
case DWC_CHAN_ST_TX_PKT_ISOC:
- if (dwc_otg_host_channel_alloc(td, 0, 1))
+ if (dwc_otg_host_channel_alloc(sc, td, 0, 1))
break;
channel = td->channel[0];
goto send_isoc_pkt;
@@ -1741,8 +1712,8 @@
send_pkt:
/* free existing channel(s), if any */
- dwc_otg_host_channel_free(td, 0);
- dwc_otg_host_channel_free(td, 1);
+ dwc_otg_host_channel_free(sc, td, 0);
+ dwc_otg_host_channel_free(sc, td, 1);
if (td->hcsplt != 0) {
delta = td->tt_start_slot - sc->sc_last_frame_num - 1;
@@ -1757,13 +1728,13 @@
td->state = DWC_CHAN_ST_START;
goto busy;
}
- } else if (dwc_otg_host_rate_check(td)) {
+ } else if (dwc_otg_host_rate_check(sc, td)) {
td->state = DWC_CHAN_ST_START;
goto busy;
}
/* allocate a new channel */
- if (dwc_otg_host_channel_alloc(td, 0, 1)) {
+ if (dwc_otg_host_channel_alloc(sc, td, 0, 1)) {
td->state = DWC_CHAN_ST_START;
goto busy;
}
@@ -1912,7 +1883,7 @@
send_cpkt:
/* free existing channel, if any */
- dwc_otg_host_channel_free(td, td->tt_channel_tog);
+ dwc_otg_host_channel_free(sc, td, td->tt_channel_tog);
delta = td->tt_complete_slot - sc->sc_last_frame_num - 1;
if (td->tt_scheduled == 0 || delta < DWC_OTG_TT_SLOT_MAX) {
@@ -1928,7 +1899,7 @@
}
/* allocate a new channel */
- if (dwc_otg_host_channel_alloc(td, td->tt_channel_tog, 0)) {
+ if (dwc_otg_host_channel_alloc(sc, td, td->tt_channel_tog, 0)) {
td->state = DWC_CHAN_ST_WAIT_C_PKT;
goto busy;
}
@@ -1986,15 +1957,14 @@
return (1); /* busy */
complete:
- dwc_otg_host_channel_free(td, 0);
- dwc_otg_host_channel_free(td, 1);
+ dwc_otg_host_channel_free(sc, td, 0);
+ dwc_otg_host_channel_free(sc, td, 1);
return (0); /* complete */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Jun 9 11:40:04 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8516472C; Mon, 9 Jun 2014 11:40:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 473D972A
for <perforce@freebsd.org>; Mon, 9 Jun 2014 11:40:04 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:1900:2254:2068::682: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 2874E2B91
for <perforce@freebsd.org>; Mon, 9 Jun 2014 11:40:04 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s59Be4jZ060162
for <perforce@freebsd.org>; Mon, 9 Jun 2014 11:40:04 GMT
(envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s59Be4q6060159
for perforce@freebsd.org; Mon, 9 Jun 2014 11:40:04 GMT
(envelope-from jonathan@freebsd.org)
Date: Mon, 9 Jun 2014 11:40:04 GMT
Message-Id: <201406091140.s59Be4q6060159@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 1196340 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jun 2014 11:40:04 -0000
http://p4web.freebsd.org/@@1196340?ac=10
Change 1196340 by jonathan@jonathan-on-zenith on 2014/06/09 11:39:36
Add the TESLA_ALL kernel configuration: like TESLA_ND_ALL, but not ND (No Debug).
Affected files ...
.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#18 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/libtesla.h#15 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#14 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#17 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_notification.c#20 edit
Differences ...
==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#18 (text+ko) ====
@@ -101,7 +101,7 @@
.if ${MK_TESLA} != "no" && !defined(EARLY_BUILD)
tesla.manifest: ${TESLA_FILES}
- cat ${TESLA_FILES} > ${.TARGET}
+ ${TESLA} cat ${TESLA_FILES} -o ${.TARGET}
DPADD+= ${LIBTESLA}
LDADD+= -ltesla
==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/libtesla.h#15 (text+ko) ====
@@ -92,12 +92,12 @@
*
* Input alphabet symbols are integers in the range [0,alphabet_size].
*/
- const int32_t ta_alphabet_size;
+ const uint32_t ta_alphabet_size;
/**
* The symbol number used to signal cleanup.
*/
- const int32_t ta_cleanup_symbol;
+ const uint32_t ta_cleanup_symbol;
/**
* Transitions that will be taken in response to events.
@@ -136,7 +136,7 @@
const char *tle_repr;
/** The length of @ref #tle_repr. */
- const int32_t tle_length;
+ const uint32_t tle_length;
/**
* A precomputed hash of @ref #tle_repr.
@@ -147,7 +147,7 @@
* All clients should be consistent, however; the TESLA instrumenter
* uses SuperFastHash.
*/
- const int32_t tle_hash;
+ const uint32_t tle_hash;
};
@@ -346,15 +346,15 @@
/** No @ref tesla_class instance was found to match a @ref tesla_key. */
typedef void (*tesla_ev_no_instance)(struct tesla_class *,
- int32_t symbol, const struct tesla_key *);
+ uint32_t symbol, const struct tesla_key *);
/** A @ref tesla_instance is not in the right state to take a transition. */
typedef void (*tesla_ev_bad_transition)(struct tesla_class *,
- struct tesla_instance *, int32_t symbol);
+ struct tesla_instance *, uint32_t symbol);
/** Generic error handler. */
typedef void (*tesla_ev_error)(const struct tesla_automaton *,
- int32_t symbol, int32_t errnum, const char *message);
+ uint32_t symbol, int32_t errnum, const char *message);
/** A @ref tesla_instance has accepted a sequence of events. */
typedef void (*tesla_ev_accept)(struct tesla_class *,
@@ -362,7 +362,7 @@
/** An event is being ignored. */
typedef void (*tesla_ev_ignored)(const struct tesla_class *,
- int32_t symbol, const struct tesla_key *);
+ uint32_t symbol, const struct tesla_key *);
/** A vector of event handlers. */
struct tesla_event_handlers {
==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#14 (text+ko) ====
@@ -51,17 +51,17 @@
"struct tesla_class *", "struct tesla_instance *",
"struct tesla_instance *", "struct tesla_transition *");
SDT_PROBE_DEFINE4(tesla, automata, fail, no_instance, no-instance-match,
- "struct tesla_class *", "const char *", "int32_t",
+ "struct tesla_class *", "const char *", "uint32_t",
"struct tesla_transitions *");
SDT_PROBE_DEFINE3(tesla, automata, fail, bad_transition, bad-transition,
"struct tesla_class *", "struct tesla_instance *",
- "int32_t");
+ "uint32_t");
SDT_PROBE_DEFINE4(tesla, automata, fail, other_err, other-error,
- "struct tesla_class *", "int32_t", "int", "const char *");
+ "struct tesla_class *", "uint32_t", "int32_t", "const char *");
SDT_PROBE_DEFINE2(tesla, automata, success, accept, accept,
"struct tesla_class *", "struct tesla_instance *");
SDT_PROBE_DEFINE3(tesla, automata, event, ignored, ignored-event,
- "struct tesla_class *", "int32_t", "struct tesla_key *");
+ "struct tesla_class *", "uint32_t", "struct tesla_key *");
static void
sunrise(enum tesla_context c, const struct tesla_lifetime *tl)
@@ -101,7 +101,7 @@
}
static void
-no_instance(struct tesla_class *tcp, int32_t symbol,
+no_instance(struct tesla_class *tcp, uint32_t symbol,
const struct tesla_key *tkp)
{
char instbuf[200];
@@ -130,7 +130,7 @@
static void
bad_transition(struct tesla_class *tcp, struct tesla_instance *tip,
- int32_t symbol)
+ uint32_t symbol)
{
SDT_PROBE(tesla, automata, fail, bad_transition, tcp, tip, symbol,
@@ -138,7 +138,7 @@
}
static void
-err(const struct tesla_automaton *tap, int32_t symbol, int32_t errnum,
+err(const struct tesla_automaton *tap, uint32_t symbol, int32_t errnum,
const char *message)
{
@@ -154,7 +154,7 @@
}
static void
-ignored(const struct tesla_class *tcp, int32_t symbol,
+ignored(const struct tesla_class *tcp, uint32_t symbol,
const struct tesla_key *tkp)
{
==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_internal.h#17 (text+ko) ====
@@ -416,14 +416,14 @@
const struct tesla_transition *);
void ev_clone(struct tesla_class *, struct tesla_instance *orig,
struct tesla_instance *copy, const struct tesla_transition *);
-void ev_no_instance(struct tesla_class *, int32_t symbol,
+void ev_no_instance(struct tesla_class *, uint32_t symbol,
const struct tesla_key *);
void ev_bad_transition(struct tesla_class *, struct tesla_instance *,
- int32_t symbol);
+ uint32_t symbol);
void ev_err(const struct tesla_automaton *, int symbol, int errnum,
const char *);
void ev_accept(struct tesla_class *, struct tesla_instance *);
-void ev_ignored(const struct tesla_class *, int32_t symbol,
+void ev_ignored(const struct tesla_class *, uint32_t symbol,
const struct tesla_key *);
/*
==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_notification.c#20 (text+ko) ====
@@ -159,7 +159,7 @@
}
void
-ev_no_instance(struct tesla_class *tcp, int32_t symbol,
+ev_no_instance(struct tesla_class *tcp, uint32_t symbol,
const struct tesla_key *tkp)
{
@@ -168,7 +168,7 @@
void
ev_bad_transition(struct tesla_class *tcp, struct tesla_instance *tip,
- int32_t symbol)
+ uint32_t symbol)
{
FOREACH_ERROR_HANDLER(teh_bad_transition, tcp, tip, symbol);
@@ -190,7 +190,7 @@
}
void
-ev_ignored(const struct tesla_class *tcp, int32_t symbol,
+ev_ignored(const struct tesla_class *tcp, uint32_t symbol,
const struct tesla_key *tkp)
{
@@ -266,7 +266,7 @@
}
static void
-print_no_instance(struct tesla_class *tcp, int32_t symbol,
+print_no_instance(struct tesla_class *tcp, uint32_t symbol,
const struct tesla_key *tkp)
{
@@ -293,7 +293,7 @@
static void
print_bad_transition(struct tesla_class *tcp, struct tesla_instance *tip,
- int32_t symbol)
+ uint32_t symbol)
{
assert(tcp != NULL);
@@ -326,7 +326,7 @@
}
static void
-print_error(const struct tesla_automaton *a, int symbol, int errnum,
+print_error(const struct tesla_automaton *a, uint32_t symbol, int32_t errnum,
const char *message)
{
@@ -345,7 +345,7 @@
}
static void
-print_ignored(const struct tesla_class *tcp, int32_t symbol,
+print_ignored(const struct tesla_class *tcp, uint32_t symbol,
__unused const struct tesla_key *tkp)
{
const struct tesla_automaton *a = tcp->tc_automaton;
@@ -385,7 +385,7 @@
* Wrappers that panic on failure:
*/
static void
-panic_no_instance(struct tesla_class *tcp, int32_t symbol,
+panic_no_instance(struct tesla_class *tcp, uint32_t symbol,
__unused const struct tesla_key *tkp)
{
const char *event_name = tcp->tc_automaton->ta_symbol_names[symbol];
@@ -396,7 +396,7 @@
static void
panic_bad_transition(struct tesla_class *tcp,
- __unused struct tesla_instance *tip, int32_t symbol)
+ __unused struct tesla_instance *tip, uint32_t symbol)
{
const char *event_name = tcp->tc_automaton->ta_symbol_names[symbol];
@@ -405,7 +405,7 @@
}
static void
-panic_error(const struct tesla_automaton *a, int symbol, int errnum,
+panic_error(const struct tesla_automaton *a, uint32_t symbol, int32_t errnum,
const char *message)
{