7615 libbe: cleanup compile warnings

Reviewed by: Yuri Pankov <yuri.pankov@gmail.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

72 files changed, 22 insertions, 162 deletions

diff --git a/usr/src/head/errno.h b/usr/src/head/errno.h
index cfabb2716b..d3cf1bff16 100644
--- a/usr/src/head/errno.h
+++ b/usr/src/head/errno.h
@@ -32,8 +32,6 @@
 #ifndef _ERRNO_H
 #define	_ERRNO_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.4.1.5 */
-
 /*
  * Error codes
  */
diff --git a/usr/src/head/iso/limits_iso.h b/usr/src/head/iso/limits_iso.h
index 4d979cab1f..d1cce47dd7 100644
--- a/usr/src/head/iso/limits_iso.h
+++ b/usr/src/head/iso/limits_iso.h
@@ -43,8 +43,6 @@
 #ifndef _ISO_LIMITS_ISO_H
 #define	_ISO_LIMITS_ISO_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" /* SVr4.0 1.34 */
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/head/iso/stdarg_c99.h b/usr/src/head/iso/stdarg_c99.h
index 628f555b4e..3d21bb41ad 100644
--- a/usr/src/head/iso/stdarg_c99.h
+++ b/usr/src/head/iso/stdarg_c99.h
@@ -31,8 +31,6 @@
 #ifndef _ISO_STDARG_C99_H
 #define	_ISO_STDARG_C99_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" /* SVr4.0 1.8 */
-
 /*
  * An application should not include this header directly.  Instead it
  * should be included only through the inclusion of other Sun headers.
diff --git a/usr/src/head/iso/stdarg_iso.h b/usr/src/head/iso/stdarg_iso.h
index abc0fed4ac..ce8abe047b 100644
--- a/usr/src/head/iso/stdarg_iso.h
+++ b/usr/src/head/iso/stdarg_iso.h
@@ -43,8 +43,6 @@
 #ifndef _ISO_STDARG_ISO_H
 #define	_ISO_STDARG_ISO_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" /* SVr4.0 1.8 */
-
 /*
  * This header defines the ISO C 1989 and ISO C++ 1998 variable
  * argument definitions.
diff --git a/usr/src/head/rctl.h b/usr/src/head/rctl.h
index 6bc8b9e9be..c1ebc6864d 100644
--- a/usr/src/head/rctl.h
+++ b/usr/src/head/rctl.h
@@ -27,8 +27,6 @@
 #ifndef	_RCTL_H
 #define	_RCTL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/rctl.h>
 #include <sys/types.h>
 
diff --git a/usr/src/head/stdint.h b/usr/src/head/stdint.h
index bd87d1ad15..135d0bc2fb 100644
--- a/usr/src/head/stdint.h
+++ b/usr/src/head/stdint.h
@@ -27,8 +27,6 @@
 #ifndef _STDINT_H
 #define	_STDINT_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This header was introduced by the ISO C Standard, ISO/IEC
  * 9899:1999 Programming language - C. It is a subset of the
diff --git a/usr/src/head/stdio_impl.h b/usr/src/head/stdio_impl.h
index 54ca353aab..734ef2671c 100644
--- a/usr/src/head/stdio_impl.h
+++ b/usr/src/head/stdio_impl.h
@@ -27,8 +27,6 @@
 #ifndef _STDIO_IMPL_H
 #define	_STDIO_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/isa_defs.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/head/stdio_tag.h b/usr/src/head/stdio_tag.h
index 818845a016..5377719988 100644
--- a/usr/src/head/stdio_tag.h
+++ b/usr/src/head/stdio_tag.h
@@ -27,8 +27,6 @@
 #ifndef _STDIO_TAG_H
 #define	_STDIO_TAG_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/head/termios.h b/usr/src/head/termios.h
index dfa6ca05eb..13bd97f7d5 100644
--- a/usr/src/head/termios.h
+++ b/usr/src/head/termios.h
@@ -26,8 +26,6 @@
 #ifndef _TERMIOS_H
 #define	_TERMIOS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.2	*/
-
 #include <sys/termios.h>
 
 #endif	/* _TERMIOS_H */
diff --git a/usr/src/lib/libbe/Makefile.com b/usr/src/lib/libbe/Makefile.com
index f1c828194c..8c939917a3 100644
--- a/usr/src/lib/libbe/Makefile.com
+++ b/usr/src/lib/libbe/Makefile.com
@@ -54,9 +54,6 @@ C99MODE=	$(C99_ENABLE)
 LDLIBS +=	-lficl-sys -lzfs -linstzones -luuid -lnvpair -lc -lgen
 LDLIBS +=	-ldevinfo -lefi
 CPPFLAGS +=	$(INCS)
-CERRWARN +=	-_gcc=-Wno-unused-label
-CERRWARN +=	-_gcc=-Wno-uninitialized
-CERRWARN +=	-_gcc=-Wno-address
 
 CLOBBERFILES += $(LIBRARY)
 
diff --git a/usr/src/lib/libbe/common/be_list.c b/usr/src/lib/libbe/common/be_list.c
index fe002a2ce1..373b8ef6e5 100644
--- a/usr/src/lib/libbe/common/be_list.c
+++ b/usr/src/lib/libbe/common/be_list.c
@@ -354,11 +354,9 @@ be_free_list(be_node_list_t *be_nodes)
  *		Semi-private (library wide use only)
  */
 int
-be_get_zone_be_list(
 /* LINTED */
-	char *zone_be_name,
-	char *zone_be_container_ds,
-	be_node_list_t **zbe_nodes)
+be_get_zone_be_list(char *zone_be_name, char *zone_be_container_ds,
+    be_node_list_t **zbe_nodes)
 {
 	zfs_handle_t *zhp = NULL;
 	list_callback_data_t cb = { 0 };
@@ -1066,7 +1064,7 @@ be_get_node_data(
 				be_node->be_active_on_boot = B_TRUE;
 			else
 				be_node->be_active_on_boot = B_FALSE;
-		else if (prop_buf != NULL && strcmp(prop_buf, be_ds) == 0)
+		else if (strcmp(prop_buf, be_ds) == 0)
 			be_node->be_active_on_boot = B_TRUE;
 		else
 			be_node->be_active_on_boot = B_FALSE;
diff --git a/usr/src/lib/libbe/common/be_utils.c b/usr/src/lib/libbe/common/be_utils.c
index 1d79c51a4f..fb2f662fc7 100644
--- a/usr/src/lib/libbe/common/be_utils.c
+++ b/usr/src/lib/libbe/common/be_utils.c
@@ -1519,7 +1519,7 @@ be_change_grub_default(char *be_name, char *be_root_pool)
 {
 	zfs_handle_t	*zhp = NULL;
 	char	grub_file[MAXPATHLEN];
-	char	*temp_grub;
+	char	*temp_grub = NULL;
 	char	*pool_mntpnt = NULL;
 	char	*ptmp_mntpnt = NULL;
 	char	*orig_mntpnt = NULL;
diff --git a/usr/src/lib/libbe/common/be_zones.c b/usr/src/lib/libbe/common/be_zones.c
index 8b2af7efee..e257b62125 100644
--- a/usr/src/lib/libbe/common/be_zones.c
+++ b/usr/src/lib/libbe/common/be_zones.c
@@ -111,7 +111,7 @@ int
 be_find_active_zone_root(zfs_handle_t *be_zhp, char *zonepath_ds,
     char *zoneroot_ds, int zoneroot_ds_size)
 {
-	active_zone_root_data_t		azr_data = { 0 };
+	active_zone_root_data_t		azr_data = { { 0 }, NULL };
 	zfs_handle_t			*zhp;
 	char				zone_container_ds[MAXPATHLEN];
 	int				ret = BE_SUCCESS;
diff --git a/usr/src/lib/libmd/common/md5.h b/usr/src/lib/libmd/common/md5.h
index 39525cf355..dd0c249cf9 100644
--- a/usr/src/lib/libmd/common/md5.h
+++ b/usr/src/lib/libmd/common/md5.h
@@ -6,8 +6,6 @@
 #ifndef _MD5_H
 #define	_MD5_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * MD5.H - header file for MD5C.C
  */
diff --git a/usr/src/uts/common/net/if_dl.h b/usr/src/uts/common/net/if_dl.h
index a4810cb793..675d19a264 100644
--- a/usr/src/uts/common/net/if_dl.h
+++ b/usr/src/uts/common/net/if_dl.h
@@ -38,7 +38,6 @@
 #ifndef	_NET_IF_DL_H
 #define	_NET_IF_DL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 /* from UCB 8.1 (Berkeley) 6/10/93 */
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/common/sys/aio_req.h b/usr/src/uts/common/sys/aio_req.h
index 5569f411c1..9619b72d00 100644
--- a/usr/src/uts/common/sys/aio_req.h
+++ b/usr/src/uts/common/sys/aio_req.h
@@ -26,8 +26,6 @@
 #ifndef _SYS_AIO_REQ_H
 #define	_SYS_AIO_REQ_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/buf.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/common/sys/avl_impl.h b/usr/src/uts/common/sys/avl_impl.h
index 620685f370..4522895cc2 100644
--- a/usr/src/uts/common/sys/avl_impl.h
+++ b/usr/src/uts/common/sys/avl_impl.h
@@ -27,8 +27,6 @@
 #ifndef	_AVL_IMPL_H
 #define	_AVL_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This is a private header file.  Applications should not directly include
  * this file.
diff --git a/usr/src/uts/common/sys/contract.h b/usr/src/uts/common/sys/contract.h
index faf4f62529..0e81f8ffbf 100644
--- a/usr/src/uts/common/sys/contract.h
+++ b/usr/src/uts/common/sys/contract.h
@@ -26,8 +26,6 @@
 #ifndef	_SYS_CONTRACT_H
 #define	_SYS_CONTRACT_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/common/sys/copyops.h b/usr/src/uts/common/sys/copyops.h
index e04c92bd3a..54b754eaa2 100644
--- a/usr/src/uts/common/sys/copyops.h
+++ b/usr/src/uts/common/sys/copyops.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_COPYOPS_H
 #define	_SYS_COPYOPS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/thread.h>
 #include <sys/buf.h>
diff --git a/usr/src/uts/common/sys/dacf.h b/usr/src/uts/common/sys/dacf.h
index b6b7124870..80cc30a94f 100644
--- a/usr/src/uts/common/sys/dacf.h
+++ b/usr/src/uts/common/sys/dacf.h
@@ -26,8 +26,6 @@
 #ifndef	_DACF_H
 #define	_DACF_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Device autoconfiguration framework (dacf)
  */
diff --git a/usr/src/uts/common/sys/dacf_impl.h b/usr/src/uts/common/sys/dacf_impl.h
index af32afad30..0d30ae061c 100644
--- a/usr/src/uts/common/sys/dacf_impl.h
+++ b/usr/src/uts/common/sys/dacf_impl.h
@@ -27,8 +27,6 @@
 #ifndef	_DACF_IMPL_H
 #define	_DACF_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Implementation-Private definitions for Device autoconfiguration (dacf)
  */
diff --git a/usr/src/uts/common/sys/ddifm.h b/usr/src/uts/common/sys/ddifm.h
index 07fc00754f..ef2dc453c8 100644
--- a/usr/src/uts/common/sys/ddifm.h
+++ b/usr/src/uts/common/sys/ddifm.h
@@ -26,8 +26,6 @@
 #ifndef	_DDIFM_H
 #define	_DDIFM_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/ddimapreq.h b/usr/src/uts/common/sys/ddimapreq.h
index c77b44e822..0237e0620c 100644
--- a/usr/src/uts/common/sys/ddimapreq.h
+++ b/usr/src/uts/common/sys/ddimapreq.h
@@ -26,8 +26,6 @@
 #ifndef	_SYS_DDIMAPREQ_H
 #define	_SYS_DDIMAPREQ_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/mman.h>
 #include <sys/dditypes.h>
 
diff --git a/usr/src/uts/common/sys/door_impl.h b/usr/src/uts/common/sys/door_impl.h
index ea5c22465e..1210f8a16c 100644
--- a/usr/src/uts/common/sys/door_impl.h
+++ b/usr/src/uts/common/sys/door_impl.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_DOOR_IMPL_H
 #define	_SYS_DOOR_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Common definitions for <sys/door.h> and <sys/proc.h>.
  */
diff --git a/usr/src/uts/common/sys/errno.h b/usr/src/uts/common/sys/errno.h
index 406cfb4c5d..063611d8ef 100644
--- a/usr/src/uts/common/sys/errno.h
+++ b/usr/src/uts/common/sys/errno.h
@@ -40,8 +40,6 @@
 #ifndef _SYS_ERRNO_H
 #define	_SYS_ERRNO_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/errorq.h b/usr/src/uts/common/sys/errorq.h
index 971b19e6cc..5ae6f9e901 100644
--- a/usr/src/uts/common/sys/errorq.h
+++ b/usr/src/uts/common/sys/errorq.h
@@ -27,8 +27,6 @@
 #ifndef	_ERRORQ_H
 #define	_ERRORQ_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/nvpair.h>
diff --git a/usr/src/uts/common/sys/hwconf.h b/usr/src/uts/common/sys/hwconf.h
index 4e9966a7b7..af240461a4 100644
--- a/usr/src/uts/common/sys/hwconf.h
+++ b/usr/src/uts/common/sys/hwconf.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_HWCONF_H
 #define	_SYS_HWCONF_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/dditypes.h>
 #include <sys/ddipropdefs.h>
 
diff --git a/usr/src/uts/common/sys/inttypes.h b/usr/src/uts/common/sys/inttypes.h
index ebf4cadb0b..8bf21a1b85 100644
--- a/usr/src/uts/common/sys/inttypes.h
+++ b/usr/src/uts/common/sys/inttypes.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_INTTYPES_H
 #define	_SYS_INTTYPES_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This header, <sys/inttypes.h>, contains (through nested inclusion) the
  * vast majority of the facilities specified for <inttypes.h> as defined
diff --git a/usr/src/uts/common/sys/ioctl.h b/usr/src/uts/common/sys/ioctl.h
index 9728c896c0..9fba15d031 100644
--- a/usr/src/uts/common/sys/ioctl.h
+++ b/usr/src/uts/common/sys/ioctl.h
@@ -30,8 +30,6 @@
 #ifndef _SYS_IOCTL_H
 #define	_SYS_IOCTL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/ipc_rctl.h b/usr/src/uts/common/sys/ipc_rctl.h
index 42ec222a77..f1c8303e19 100644
--- a/usr/src/uts/common/sys/ipc_rctl.h
+++ b/usr/src/uts/common/sys/ipc_rctl.h
@@ -26,8 +26,6 @@
 #ifndef	_SYS_IPC_RCTL_H
 #define	_SYS_IPC_RCTL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/rctl.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/common/sys/kiconv.h b/usr/src/uts/common/sys/kiconv.h
index aa342ae02f..46dcb4467d 100644
--- a/usr/src/uts/common/sys/kiconv.h
+++ b/usr/src/uts/common/sys/kiconv.h
@@ -26,8 +26,6 @@
 #ifndef _SYS_KICONV_H
 #define	_SYS_KICONV_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/ksynch.h b/usr/src/uts/common/sys/ksynch.h
index 6befc77818..3b627b6f6b 100644
--- a/usr/src/uts/common/sys/ksynch.h
+++ b/usr/src/uts/common/sys/ksynch.h
@@ -30,8 +30,6 @@
 #ifndef _SYS_KSYNCH_H
 #define	_SYS_KSYNCH_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * The presence of this file is specified by the DKI/DDI.
  */
diff --git a/usr/src/uts/common/sys/list.h b/usr/src/uts/common/sys/list.h
index 8339b6226d..6db92ed429 100644
--- a/usr/src/uts/common/sys/list.h
+++ b/usr/src/uts/common/sys/list.h
@@ -26,8 +26,6 @@
 #ifndef	_SYS_LIST_H
 #define	_SYS_LIST_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/list_impl.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/common/sys/list_impl.h b/usr/src/uts/common/sys/list_impl.h
index 9c42f88320..a6614f9a38 100644
--- a/usr/src/uts/common/sys/list_impl.h
+++ b/usr/src/uts/common/sys/list_impl.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_LIST_IMPL_H
 #define	_SYS_LIST_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/common/sys/md5.h b/usr/src/uts/common/sys/md5.h
index 798f1bd2e2..1781654cc9 100644
--- a/usr/src/uts/common/sys/md5.h
+++ b/usr/src/uts/common/sys/md5.h
@@ -37,8 +37,6 @@
 #ifndef _SYS_MD5_H
 #define	_SYS_MD5_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>		/* for uint_* */
 
 /*
diff --git a/usr/src/uts/common/sys/model.h b/usr/src/uts/common/sys/model.h
index f9f71b349d..d3286ad1ec 100644
--- a/usr/src/uts/common/sys/model.h
+++ b/usr/src/uts/common/sys/model.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_MODEL_H
 #define	_SYS_MODEL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/msacct.h b/usr/src/uts/common/sys/msacct.h
index 97a58d9b8e..426f359b0f 100644
--- a/usr/src/uts/common/sys/msacct.h
+++ b/usr/src/uts/common/sys/msacct.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_MSACCT_H
 #define	_SYS_MSACCT_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/ndifm.h b/usr/src/uts/common/sys/ndifm.h
index bc94e8f79f..962fee08c9 100644
--- a/usr/src/uts/common/sys/ndifm.h
+++ b/usr/src/uts/common/sys/ndifm.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_NDIFM_H
 #define	_SYS_NDIFM_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/nexusdefs.h b/usr/src/uts/common/sys/nexusdefs.h
index e05df8e4f0..fb0f41a2b8 100644
--- a/usr/src/uts/common/sys/nexusdefs.h
+++ b/usr/src/uts/common/sys/nexusdefs.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_NEXUSDEFS_H
 #define	_SYS_NEXUSDEFS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/note.h b/usr/src/uts/common/sys/note.h
index 2cb7fd89b7..6625b68d9e 100644
--- a/usr/src/uts/common/sys/note.h
+++ b/usr/src/uts/common/sys/note.h
@@ -39,8 +39,6 @@
 #ifndef	_SYS_NOTE_H
 #define	_SYS_NOTE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/procset.h b/usr/src/uts/common/sys/procset.h
index c3b5867574..66076d8ca9 100644
--- a/usr/src/uts/common/sys/procset.h
+++ b/usr/src/uts/common/sys/procset.h
@@ -31,8 +31,6 @@
 #ifndef _SYS_PROCSET_H
 #define	_SYS_PROCSET_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.6 */
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/rwstlock.h b/usr/src/uts/common/sys/rwstlock.h
index 17fc9b6a67..c491aef82a 100644
--- a/usr/src/uts/common/sys/rwstlock.h
+++ b/usr/src/uts/common/sys/rwstlock.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_RWSTLOCK_H
 #define	_SYS_RWSTLOCK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Alternate rwlock that is interruptible and can be released by a thread
  * other than the one that acquired the lock.
diff --git a/usr/src/uts/common/sys/semaphore.h b/usr/src/uts/common/sys/semaphore.h
index 5ab71b890b..0bfb5d1ce4 100644
--- a/usr/src/uts/common/sys/semaphore.h
+++ b/usr/src/uts/common/sys/semaphore.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_SEMAPHORE_H
 #define	_SYS_SEMAPHORE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Public interface to semaphores.  See semaphore(9F) for details.
  */
diff --git a/usr/src/uts/common/sys/siginfo.h b/usr/src/uts/common/sys/siginfo.h
index f6268dd8a5..c8721c3c95 100644
--- a/usr/src/uts/common/sys/siginfo.h
+++ b/usr/src/uts/common/sys/siginfo.h
@@ -30,8 +30,6 @@
 #ifndef _SYS_SIGINFO_H
 #define	_SYS_SIGINFO_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/feature_tests.h>
 #include <sys/types.h>
 
diff --git a/usr/src/uts/common/sys/stdint.h b/usr/src/uts/common/sys/stdint.h
index 1e6808f3c5..ec1656055f 100644
--- a/usr/src/uts/common/sys/stdint.h
+++ b/usr/src/uts/common/sys/stdint.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_STDINT_H
 #define	_SYS_STDINT_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This header is included by <stdint.h> which was introduced by
  * the ISO C Standard, ISO/IEC 9899:1999 Programming language - C.
diff --git a/usr/src/uts/common/sys/strmdep.h b/usr/src/uts/common/sys/strmdep.h
index 3d246e44e6..f9d70022db 100644
--- a/usr/src/uts/common/sys/strmdep.h
+++ b/usr/src/uts/common/sys/strmdep.h
@@ -31,8 +31,6 @@
 #ifndef _SYS_STRMDEP_H
 #define	_SYS_STRMDEP_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.3	*/
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/synch.h b/usr/src/uts/common/sys/synch.h
index 6431bf22bc..c32f3217ad 100644
--- a/usr/src/uts/common/sys/synch.h
+++ b/usr/src/uts/common/sys/synch.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_SYNCH_H
 #define	_SYS_SYNCH_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef _ASM
 #include <sys/types.h>
 #include <sys/int_types.h>
diff --git a/usr/src/uts/common/sys/t_lock.h b/usr/src/uts/common/sys/t_lock.h
index 01ac64b290..34b0ad9d34 100644
--- a/usr/src/uts/common/sys/t_lock.h
+++ b/usr/src/uts/common/sys/t_lock.h
@@ -33,8 +33,6 @@
 #ifndef _SYS_T_LOCK_H
 #define	_SYS_T_LOCK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef	_ASM
 #include <sys/machlock.h>
 #include <sys/param.h>
diff --git a/usr/src/uts/common/sys/ttydev.h b/usr/src/uts/common/sys/ttydev.h
index 29c9c4a564..772b7d06b8 100644
--- a/usr/src/uts/common/sys/ttydev.h
+++ b/usr/src/uts/common/sys/ttydev.h
@@ -26,8 +26,6 @@
 #ifndef _SYS_TTYDEV_H
 #define	_SYS_TTYDEV_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* UCB 4.3 83/05/18 */
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/types32.h b/usr/src/uts/common/sys/types32.h
index daa27eaf76..32af133581 100644
--- a/usr/src/uts/common/sys/types32.h
+++ b/usr/src/uts/common/sys/types32.h
@@ -26,8 +26,6 @@
 #ifndef _SYS_TYPES32_H
 #define	_SYS_TYPES32_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/int_types.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/common/sys/tzfile.h b/usr/src/uts/common/sys/tzfile.h
index 8f451f27d9..66e3c72a70 100644
--- a/usr/src/uts/common/sys/tzfile.h
+++ b/usr/src/uts/common/sys/tzfile.h
@@ -30,8 +30,6 @@
 #ifndef _SYS_TZFILE_H
 #define	_SYS_TZFILE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/u8_textprep.h b/usr/src/uts/common/sys/u8_textprep.h
index e30f064b2d..acbcdb03e4 100644
--- a/usr/src/uts/common/sys/u8_textprep.h
+++ b/usr/src/uts/common/sys/u8_textprep.h
@@ -26,8 +26,6 @@
 #ifndef	_SYS_U8_TEXTPREP_H
 #define	_SYS_U8_TEXTPREP_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/isa_defs.h>
 #include <sys/types.h>
 #include <sys/errno.h>
diff --git a/usr/src/uts/common/sys/uuid.h b/usr/src/uts/common/sys/uuid.h
index 683643e312..9ce872e345 100644
--- a/usr/src/uts/common/sys/uuid.h
+++ b/usr/src/uts/common/sys/uuid.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_UUID_H
 #define	_SYS_UUID_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/sys/watchpoint.h b/usr/src/uts/common/sys/watchpoint.h
index c92a50557a..36eb3addc2 100644
--- a/usr/src/uts/common/sys/watchpoint.h
+++ b/usr/src/uts/common/sys/watchpoint.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_WATCHPOINT_H
 #define	_SYS_WATCHPOINT_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <vm/seg_enum.h>
 #include <sys/copyops.h>
diff --git a/usr/src/uts/common/vm/faultcode.h b/usr/src/uts/common/vm/faultcode.h
index f5f12f065a..18d709f657 100644
--- a/usr/src/uts/common/vm/faultcode.h
+++ b/usr/src/uts/common/vm/faultcode.h
@@ -39,8 +39,6 @@
 #ifndef	_VM_FAULTCODE_H
 #define	_VM_FAULTCODE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/common/vm/seg_enum.h b/usr/src/uts/common/vm/seg_enum.h
index 5c37e2b178..fedb6fd983 100644
--- a/usr/src/uts/common/vm/seg_enum.h
+++ b/usr/src/uts/common/vm/seg_enum.h
@@ -33,8 +33,6 @@
 #ifndef	_VM_SEG_ENUM_H
 #define	_VM_SEG_ENUM_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/intel/ia32/sys/machtypes.h b/usr/src/uts/intel/ia32/sys/machtypes.h
index c4cbd311dd..232b03028c 100644
--- a/usr/src/uts/intel/ia32/sys/machtypes.h
+++ b/usr/src/uts/intel/ia32/sys/machtypes.h
@@ -26,8 +26,6 @@
 #ifndef _IA32_SYS_MACHTYPES_H
 #define	_IA32_SYS_MACHTYPES_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/intel/ia32/sys/privregs.h b/usr/src/uts/intel/ia32/sys/privregs.h
index a1b5e0ae9f..44d8f71aab 100644
--- a/usr/src/uts/intel/ia32/sys/privregs.h
+++ b/usr/src/uts/intel/ia32/sys/privregs.h
@@ -27,8 +27,6 @@
 #ifndef	_IA32_SYS_PRIVREGS_H
 #define	_IA32_SYS_PRIVREGS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/intel/sys/machlock.h b/usr/src/uts/intel/sys/machlock.h
index d740bc6212..d21e6175dd 100644
--- a/usr/src/uts/intel/sys/machlock.h
+++ b/usr/src/uts/intel/sys/machlock.h
@@ -26,8 +26,6 @@
 #ifndef _SYS_MACHLOCK_H
 #define	_SYS_MACHLOCK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef _ASM
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr/src/uts/intel/sys/machsig.h b/usr/src/uts/intel/sys/machsig.h
index 7839195538..f4829bef2a 100644
--- a/usr/src/uts/intel/sys/machsig.h
+++ b/usr/src/uts/intel/sys/machsig.h
@@ -31,8 +31,6 @@
 #ifndef	_SYS_MACHSIG_H
 #define	_SYS_MACHSIG_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/feature_tests.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/intel/sys/machtypes.h b/usr/src/uts/intel/sys/machtypes.h
index 3237c99889..05ad8896d4 100644
--- a/usr/src/uts/intel/sys/machtypes.h
+++ b/usr/src/uts/intel/sys/machtypes.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_MACHTYPES_H
 #define	_SYS_MACHTYPES_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/feature_tests.h>
 
 #if defined(__i386) || defined(__amd64)
diff --git a/usr/src/uts/intel/sys/obpdefs.h b/usr/src/uts/intel/sys/obpdefs.h
index 9de8421016..67fce65ef6 100644
--- a/usr/src/uts/intel/sys/obpdefs.h
+++ b/usr/src/uts/intel/sys/obpdefs.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_OBPDEFS_H
 #define	_SYS_OBPDEFS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/intel/sys/privregs.h b/usr/src/uts/intel/sys/privregs.h
index 375dcd726f..c428e81bef 100644
--- a/usr/src/uts/intel/sys/privregs.h
+++ b/usr/src/uts/intel/sys/privregs.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_PRIVREGS_H
 #define	_SYS_PRIVREGS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #if defined(__amd64)
 
 #include <amd64/sys/privregs.h>
diff --git a/usr/src/uts/intel/sys/utrap.h b/usr/src/uts/intel/sys/utrap.h
index 487dcbb23a..fc018eb2f1 100644
--- a/usr/src/uts/intel/sys/utrap.h
+++ b/usr/src/uts/intel/sys/utrap.h
@@ -27,8 +27,6 @@
 #ifndef _UTRAP_H
 #define	_UTRAP_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/sparc/sys/ddi_isa.h b/usr/src/uts/sparc/sys/ddi_isa.h
index f03d5c9200..8ef2540df6 100644
--- a/usr/src/uts/sparc/sys/ddi_isa.h
+++ b/usr/src/uts/sparc/sys/ddi_isa.h
@@ -26,8 +26,6 @@
 #ifndef	_SYS_DDI_ISA_H
 #define	_SYS_DDI_ISA_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/isa_defs.h>
 #include <sys/ndifm.h>
 #include <sys/dditypes.h>
@@ -160,62 +158,62 @@ i_ddi_swap_put64(ddi_acc_impl_t *hdlp, uint64_t *addr, uint64_t value);
  */
 void
 i_ddi_rep_get8(ddi_acc_impl_t *hdlp, uint8_t *host_addr, uint8_t *dev_addr,
-	size_t repcount, uint_t flags);
+    size_t repcount, uint_t flags);
 
 void
 i_ddi_rep_get16(ddi_acc_impl_t *hdlp, uint16_t *host_addr, uint16_t *dev_addr,
-	size_t repcount, uint_t flags);
+    size_t repcount, uint_t flags);
 
 void
 i_ddi_rep_get32(ddi_acc_impl_t *hdlp, uint32_t *host_addr, uint32_t *dev_addr,
-	size_t repcount, uint_t flags);
+    size_t repcount, uint_t flags);
 
 void
 i_ddi_rep_get64(ddi_acc_impl_t *hdlp, uint64_t *host_addr, uint64_t *dev_addr,
-	size_t repcount, uint_t flags);
+    size_t repcount, uint_t flags);
 
 void
 i_ddi_swap_rep_get16(ddi_acc_impl_t *hdlp, uint16_t *host_addr,
-	uint16_t *dev_addr, size_t repcount, uint_t flags);
+    uint16_t *dev_addr, size_t repcount, uint_t flags);
 
 void
 i_ddi_swap_rep_get32(ddi_acc_impl_t *hdlp, uint32_t *host_addr,
-	uint32_t *dev_addr, size_t repcount, uint_t flags);
+    uint32_t *dev_addr, size_t repcount, uint_t flags);
 
 void
 i_ddi_swap_rep_get64(ddi_acc_impl_t *hdlp, uint64_t *host_addr,
-	uint64_t *dev_addr, size_t repcount, uint_t flags);
+    uint64_t *dev_addr, size_t repcount, uint_t flags);
 
 /*
  * Repeated output functions for memory mapped IO
  */
 void
 i_ddi_rep_put8(ddi_acc_impl_t *hdlp, uint8_t *host_addr, uint8_t *dev_addr,
-	size_t repcount, uint_t flags);
+    size_t repcount, uint_t flags);
 
 void
 i_ddi_rep_put16(ddi_acc_impl_t *hdlp, uint16_t *host_addr, uint16_t *dev_addr,
-	size_t repcount, uint_t flags);
+    size_t repcount, uint_t flags);
 
 void
 i_ddi_rep_put32(ddi_acc_impl_t *hdl, uint32_t *host_addr, uint32_t *dev_addr,
-	size_t repcount, uint_t flags);
+    size_t repcount, uint_t flags);
 
 void
 i_ddi_rep_put64(ddi_acc_impl_t *hdl, uint64_t *host_addr, uint64_t *dev_addr,
-	size_t repcount, uint_t flags);
+    size_t repcount, uint_t flags);
 
 void
 i_ddi_swap_rep_put16(ddi_acc_impl_t *hdlp, uint16_t *host_addr,
-	uint16_t *dev_addr, size_t repcount, uint_t flags);
+    uint16_t *dev_addr, size_t repcount, uint_t flags);
 
 void
 i_ddi_swap_rep_put32(ddi_acc_impl_t *hdl, uint32_t *host_addr,
-	uint32_t *dev_addr, size_t repcount, uint_t flags);
+    uint32_t *dev_addr, size_t repcount, uint_t flags);
 
 void
 i_ddi_swap_rep_put64(ddi_acc_impl_t *hdl, uint64_t *host_addr,
-	uint64_t *dev_addr, size_t repcount, uint_t flags);
+    uint64_t *dev_addr, size_t repcount, uint_t flags);
 
 /*
  * Default fault-checking and notification functions
diff --git a/usr/src/uts/sparc/sys/machlock.h b/usr/src/uts/sparc/sys/machlock.h
index 72664a37b5..f317df4ab4 100644
--- a/usr/src/uts/sparc/sys/machlock.h
+++ b/usr/src/uts/sparc/sys/machlock.h
@@ -26,8 +26,6 @@
 #ifndef _SYS_MACHLOCK_H
 #define	_SYS_MACHLOCK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/sparc/sys/machsig.h b/usr/src/uts/sparc/sys/machsig.h
index e4bbaab342..1a53e47083 100644
--- a/usr/src/uts/sparc/sys/machsig.h
+++ b/usr/src/uts/sparc/sys/machsig.h
@@ -31,8 +31,6 @@
 #ifndef	_SYS_MACHSIG_H
 #define	_SYS_MACHSIG_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/feature_tests.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/sparc/sys/machtypes.h b/usr/src/uts/sparc/sys/machtypes.h
index 574a533831..6fe7676f06 100644
--- a/usr/src/uts/sparc/sys/machtypes.h
+++ b/usr/src/uts/sparc/sys/machtypes.h
@@ -31,8 +31,6 @@
 #ifndef _SYS_MACHTYPES_H
 #define	_SYS_MACHTYPES_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/feature_tests.h>
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/sparc/sys/stat_impl.h b/usr/src/uts/sparc/sys/stat_impl.h
index 4b351b9cec..e17d5343ca 100644
--- a/usr/src/uts/sparc/sys/stat_impl.h
+++ b/usr/src/uts/sparc/sys/stat_impl.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_STAT_IMPL_H
 #define	_SYS_STAT_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/feature_tests.h>
 #include <sys/types.h>
 
diff --git a/usr/src/uts/sparc/sys/utrap.h b/usr/src/uts/sparc/sys/utrap.h
index 4dc0573f23..eb819c3391 100644
--- a/usr/src/uts/sparc/sys/utrap.h
+++ b/usr/src/uts/sparc/sys/utrap.h
@@ -27,8 +27,6 @@
 #ifndef _UTRAP_H
 #define	_UTRAP_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -88,7 +86,7 @@ typedef void *utrap_handler_t;	/* user trap handler entry point */
 #ifdef __sparcv8plus
 int
 install_utrap(utrap_entry_t type, utrap_handler_t new_handler,
-	utrap_handler_t *old_handlerp);
+    utrap_handler_t *old_handlerp);
 #endif /* __sparcv8plus */
 
 #ifdef _KERNEL
@@ -100,8 +98,8 @@ void utrap_free(struct proc *p);
 #ifdef __sparcv9
 int
 __sparc_utrap_install(utrap_entry_t type,
-	utrap_handler_t new_precise, utrap_handler_t new_deferred,
-	utrap_handler_t *old_precise, utrap_handler_t *old_deferred);
+    utrap_handler_t new_precise, utrap_handler_t new_deferred,
+    utrap_handler_t *old_precise, utrap_handler_t *old_deferred);
 #endif
 
 /* The trap_instruction user traps are precise only. */
diff --git a/usr/src/uts/sparc/v7/sys/privregs.h b/usr/src/uts/sparc/v7/sys/privregs.h
index bf58558ba2..59a22369f5 100644
--- a/usr/src/uts/sparc/v7/sys/privregs.h
+++ b/usr/src/uts/sparc/v7/sys/privregs.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_PRIVREGS_H
 #define	_SYS_PRIVREGS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI" /* from SunOS psl.h 1.2 */
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/sun/sys/obpdefs.h b/usr/src/uts/sun/sys/obpdefs.h
index 2a9fb15989..909c18db64 100644
--- a/usr/src/uts/sun/sys/obpdefs.h
+++ b/usr/src/uts/sun/sys/obpdefs.h
@@ -26,8 +26,6 @@
 #ifndef	_SYS_OBPDEFS_H
 #define	_SYS_OBPDEFS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif