Illumos sync

4 files changed, 2 insertions, 29 deletions

diff --git a/usr/src/cmd/mdb/common/kmdb/kmdb_stubs.c b/usr/src/cmd/mdb/common/kmdb/kmdb_stubs.c
index 1b82d15662..804f85aba4 100644
--- a/usr/src/cmd/mdb/common/kmdb/kmdb_stubs.c
+++ b/usr/src/cmd/mdb/common/kmdb/kmdb_stubs.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Stubs for basic system services otherwise unavailable to the debugger.
  */
@@ -33,7 +31,6 @@
 #include <unistd.h>
 #include <libproc.h>
 #include <sys/time.h>
-#include <sys/utsname.h>
 
 #include <kmdb/kmdb_dpi.h>
 #include <kmdb/kmdb_promif.h>
@@ -179,12 +176,3 @@ exit(int status)
 	kmdb_dpi_reboot();
 #endif
 }
-
-#if defined(__i386) && !defined(__amd64)
-/*ARGSUSED*/
-int
-_nuname(struct utsname *buf)
-{
-	return (-1);
-}
-#endif
diff --git a/usr/src/cmd/mdb/common/kmdb/mapfile_skel b/usr/src/cmd/mdb/common/kmdb/mapfile_skel
index 46ea67e874..bbf6767bf3 100644
--- a/usr/src/cmd/mdb/common/kmdb/mapfile_skel
+++ b/usr/src/cmd/mdb/common/kmdb/mapfile_skel
@@ -49,11 +49,6 @@ SYMBOL_SCOPE {
 		/* There should be only one - ours */
 		errno;		/* variable */
 
-		/* <sys/utsname.h> implictly references this on x86 */
-#if defined(__i386) && !defined(__amd64)
-		_nuname;
-#endif
-
 		mdb_tgt_aread;
 		mdb_dis_create;
 		mdb_dis_destroy;
diff --git a/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c b/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c
index bca314efdd..f600e5c9b1 100644
--- a/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c
+++ b/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c
@@ -24,23 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * MDB developer support module.  This module is loaded automatically when the
  * proc target is initialized and the target is mdb itself.  In the future, we
  * should document these facilities in the answerbook to aid module developers.
  */
 
-/*
- * The mere inclusion of sys/utsname.h causes _uname() and uname() to be
- * defined on Intel, along with an external reference to _nuname().  Since we
- * don't actually use uname (or utsname, for that matter) in this dmod, we'll
- * prevent its inclusion.
- */
-#define	_SYS_UTSNAME_H
-struct utsname;
-
 #define	_MDB
 #include <mdb/mdb_modapi.h>
 #include <mdb/mdb_frame.h>
diff --git a/usr/src/cmd/mdb/common/modules/zfs/zfs.c b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
index d907a5057a..022f1b9b95 100644
--- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c
+++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
@@ -905,7 +905,8 @@ arc_print(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	const char *suffix;
 
 	static const char *bytestats[] = {
-		"p", "c", "c_min", "c_max", "size", NULL
+		"p", "c", "c_min", "c_max", "size", "duplicate_buffers_size",
+		NULL
 	};
 
 	static const char *extras[] = {