PERFORCE change 1199529 for review

[John Baldwin]

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

Change 1199529 by jhb at 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;