3 files changed, 9 insertions, 6 deletions
diff --git a/usr/src/lib/libuutil/common/libuutil.h b/usr/src/lib/libuutil/common/libuutil.h
index 6675424466..ec1bf907c1 100644
--- a/usr/src/lib/libuutil/common/libuutil.h
+++ b/usr/src/lib/libuutil/common/libuutil.h
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Joyent, Inc. All rights reserved.
  */
 
 #ifndef	_LIBUUTIL_H
@@ -90,6 +91,8 @@ extern void uu_vdie(const char *, va_list) __NORETURN;
 /*PRINTFLIKE2*/
 extern void uu_xdie(int, const char *, ...) __NORETURN;
 extern void uu_vxdie(int, const char *, va_list) __NORETURN;
+/*PRINTFLIKE1*/
+extern void uu_panic(const char *, ...) __NORETURN;
 
 /*
  * Exit status functions (not to be used directly)
diff --git a/usr/src/lib/libuutil/common/libuutil_impl.h b/usr/src/lib/libuutil/common/libuutil_impl.h
index 9466e59745..6b73e0f72d 100644
--- a/usr/src/lib/libuutil/common/libuutil_impl.h
+++ b/usr/src/lib/libuutil/common/libuutil_impl.h
@@ -24,11 +24,13 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2015, Joyent, Inc. All rights reserved.
+ */
+
 #ifndef	_LIBUUTIL_IMPL_H
 #define	_LIBUUTIL_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <libuutil.h>
 #include <pthread.h>
 
@@ -42,10 +44,6 @@ extern "C" {
 void uu_set_error(uint_t);
 #pragma rarely_called(uu_set_error)
 
-/*PRINTFLIKE1*/
-void uu_panic(const char *format, ...);
-#pragma rarely_called(uu_panic)
-
 struct uu_dprintf {
 	char	*uud_name;
 	uu_dprintf_severity_t uud_severity;
diff --git a/usr/src/lib/libuutil/common/mapfile-vers b/usr/src/lib/libuutil/common/mapfile-vers
index 75295894b6..c9d740bc8d 100644
--- a/usr/src/lib/libuutil/common/mapfile-vers
+++ b/usr/src/lib/libuutil/common/mapfile-vers
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, Joyent, Inc. All rights reserved.
 #
 
 #
@@ -101,6 +102,7 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	uu_memdup;
 	uu_msprintf;
 	uu_open_tmp;
+	uu_panic;
 	uu_setpname;
 	uu_strbw;
 	uu_strcaseeq;