From owner-p4-projects@FreeBSD.ORG  Mon Sep  8 04:52: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 C133C1137; Mon,  8 Sep 2014 04:52: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 039B69E7
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:51:22 +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 DD91A1ECD
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:51:21 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pLxg027252
 for <perforce@freebsd.org>; Mon, 8 Sep 2014 04:51:21 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pLCt027249
 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:21 GMT
 (envelope-from jhb@freebsd.org)
Date: Mon, 8 Sep 2014 04:51:21 GMT
Message-Id: <201409080451.s884pLCt027249@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 1199529 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
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, 08 Sep 2014 04:52:51 -0000

http://p4web.freebsd.org/@@1199529?ac=10

Change 1199529 by jhb@jhb_pippin on 2014/08/29 16:53:24

	Compile.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#128 edit
.. //depot/projects/smpng/sys/kern/uipc_shm.c#25 edit
.. //depot/projects/smpng/sys/sys/mman.h#22 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#128 (text+ko) ====

@@ -2110,9 +2110,9 @@
 	    MODINFO_METADATA | MODINFOMD_SMAP);
 	if (smapbase == NULL)
 		return (0);
-	smapattr = (uint32_t *) = preload_search_info(kmdp,
+	smapattr = (uint32_t *)preload_search_info(kmdp,
 	    MODINFO_METADATA | MODINFOMD_SMAP_XATTR);
-	count = *((u_int32_t *)smapbase - 1) / sizeof(*smapbase);
+	count = *((uint32_t *)smapbase - 1) / sizeof(*smapbase);
 	error = 0;
 	for (i = 0; i < count; i++) {
 		smap.base = smapbase[i].base;
@@ -2134,7 +2134,7 @@
 {
 	struct efi_map_header *efihdr;
 	caddr_t kmdp;
-	uint32_t *efisize;
+	uint32_t efisize;
 
 	kmdp = preload_search_by_type("elf kernel");
 	if (kmdp == NULL)

==== //depot/projects/smpng/sys/kern/uipc_shm.c#25 (text+ko) ====

@@ -49,6 +49,7 @@
 
 #include <sys/param.h>
 #include <sys/capsicum.h>
+#include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>

==== //depot/projects/smpng/sys/sys/mman.h#22 (text+ko) ====

@@ -219,6 +219,7 @@
 	struct timespec	shm_mtime;
 	struct timespec	shm_ctime;
 	struct timespec	shm_birthtime;
+	ino_t		shm_ino;
 
 	struct label	*shm_label;		/* MAC label */
 	const char	*shm_path;