PERFORCE change 1199101 for review

[John Baldwin]

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

Change 1199101 by jhb at jhb_pippin on 2014/08/22 21:16:36

	- Add a bios_smap_xattr structure.
	- Don't return an SMAP data for the EFI case instead of panicing.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#126 edit
.. //depot/projects/smpng/sys/amd64/include/pc/bios.h#8 edit
.. //depot/projects/smpng/sys/i386/include/pc/bios.h#11 edit

Differences ...

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

@@ -2106,6 +2106,8 @@
 		kmdp = preload_search_by_type("elf64 kernel");
 	smapbase = (struct bios_smap *)preload_search_info(kmdp,
 	    MODINFO_METADATA | MODINFOMD_SMAP);
+	if (smapbase == NULL)
+		return (0);
 	smapsize = *((u_int32_t *)smapbase - 1);
 	return (SYSCTL_OUT(req, smapbase, smapsize));
 }

==== //depot/projects/smpng/sys/amd64/include/pc/bios.h#8 (text+ko) ====

@@ -51,6 +51,14 @@
     u_int32_t	type;
 } __packed;
 
+/* Structure extended to include extended attribute field in ACPI 3.0. */
+struct bios_smap_xattr {
+    u_int64_t	base;
+    u_int64_t	length;
+    u_int32_t	type;
+    u_int32_t	xattr;
+} __packed;
+	
 /*
  * System Management BIOS
  */

==== //depot/projects/smpng/sys/i386/include/pc/bios.h#11 (text+ko) ====

@@ -221,6 +221,14 @@
     u_int32_t	type;
 } __packed;
 
+/* Structure extended to include extended attribute field in ACPI 3.0. */
+struct bios_smap_xattr {
+    u_int64_t	base;
+    u_int64_t	length;
+    u_int32_t	type;
+    u_int32_t	xattr;
+} __packed;
+
 /*
  * System Management BIOS
  */