[illumos-gate merge]

commit db1c88f6dab43484b6c33636600ac4596ff4c354
    9576 hid_attach is missing one mutex_exit in error path
commit ea4ea50f064c5468142b24627acad09a41f060cb
    9565 ctf: cast between incompatible function types
commit a19d2449c7801a22d6c8370a965dab3d16c77925
    9538 rcapd make install fails due to race in subdirs (fix isaexec)
commit 6cfa0a7079eb1baa0a742f1e4def7cdabc8dcdab
    9042 multiples of tty streams modules cause weirdness
commit 207bc6d049369709a154c840750e0a74a9ff0a76
    9544 loader: i386/Makefile should have target all before other targets
commit 62877672b62bfe1e971061803b2a9c64897c13c3
    9536 sasinfo does not know about 12gb sas
commit 0f8051a0844ba1894eab81d4b73a76feca23554e
    9533 8079's check for Xen HVM is incomplete
commit d9241f995480d9097812b34500484c0fff9d7528
    9552 grep segfaults when you ask for context
commit fe12dc752b42da16028a16f4226e5295506fdb28
    9529 libefi: efi_alloc_and_read should check for PMBR
commit e53a4a814812099ec255c98f18f7ae1d0639ae57
    9279 libefi: use one-line-per-file pattern in Makefile
commit dec267e7ea9828898b1c64462daa6636c4ef5e29
    9454 ::zfs_blkstats should count embedded blocks
commit fe3ba4d1227d8746116ece7240682b13595c3142
    9424 ztest failure: "unprotected error in call to Lua API (Invalid value type 'function' for key 'error')"
commit cfd63e1b1bcf7ba4bf72f55ddbd87ce008d2986d
    9486 reduce memory used by device removal on fragmented pools
commit c7a7b2fa084facd68c3d1e860dfabe20c713877b
    9479 fix wrong format specifier for vdev_id
commit ddfe901b12348d31c500fb57f9174e88860a4061
    9457 libzfs_import.c:add_config() has a memory leak
commit 69d4acec15909325d6df21fec172510a50f77a8a
    9538 rcapd make install fails due to race in subdirs

9 files changed, 123 insertions, 321 deletions

diff --git a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c
index 7cf5e1c5a0..6b5439d47c 100644
--- a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c
+++ b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c
@@ -24,7 +24,7 @@
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	All Rights Reserved	*/
 
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
@@ -64,7 +64,7 @@
  *	bsize - block size
  *	fragsize - fragment size
  *	cgsize - The number of disk cylinders per cylinder group.
- * 	free - minimum free space
+ *	free - minimum free space
  *	rps - rotational speed (rev/sec).
  *	nbpi - number of data bytes per allocated inode
  *	opt - optimization (space, time)
@@ -248,7 +248,7 @@
 #include	<sys/statvfs.h>
 #include	<locale.h>
 #include	<fcntl.h>
-#include 	<sys/isa_defs.h>	/* for ENDIAN defines */
+#include	<sys/isa_defs.h>	/* for ENDIAN defines */
 #include	<sys/vtoc.h>
 
 #include	<sys/dkio.h>
@@ -508,9 +508,9 @@ long	ntrack = DFLNTRAK;		/* tracks per cylinder group */
 int	ntrack_flag = RC_DEFAULT;
 long	bsize = DESBLKSIZE;		/* filesystem block size */
 int	bsize_flag = RC_DEFAULT;
-long	fragsize = DESFRAGSIZE; 	/* filesystem fragment size */
+long	fragsize = DESFRAGSIZE;		/* filesystem fragment size */
 int	fragsize_flag = RC_DEFAULT;
-long	minfree = MINFREE; 		/* fs_minfree */
+long	minfree = MINFREE;		/* fs_minfree */
 int	minfree_flag = RC_DEFAULT;
 long	rps = DEFHZ;			/* revolutions/second of drive */
 int	rps_flag = RC_DEFAULT;
@@ -611,8 +611,8 @@ void		wlockfs(void);
 void		clockfs(void);
 void		wtsb(void);
 static int64_t	checkfragallocated(daddr32_t);
-static struct csum 	*read_summaryinfo(struct fs *);
-static diskaddr_t 	probe_summaryinfo();
+static struct csum	*read_summaryinfo(struct fs *);
+static diskaddr_t	probe_summaryinfo();
 
 int
 main(int argc, char *argv[])
@@ -765,7 +765,7 @@ main(int argc, char *argv[])
 		case 'G':	/* grow the file system */
 			grow = 1;
 			break;
-		case 'P':	/* probe the file system growing size 	*/
+		case 'P':	/* probe the file system growing size	*/
 			Pflag = 1;
 			grow = 1; /* probe mode implies fs growing	*/
 			break;
@@ -2379,6 +2379,17 @@ grow50:
 	return (0);
 }
 
+static diskaddr_t
+get_device_size(int fd)
+{
+	struct dk_minfo	disk_info;
+
+	if ((ioctl(fd, DKIOCGMEDIAINFO, (caddr_t)&disk_info)) == -1)
+		return (0);
+
+	return (disk_info.dki_capacity);
+}
+
 /*
  * Figure out how big the partition we're dealing with is.
  * The value returned is in disk blocks (sectors);
@@ -2403,23 +2414,32 @@ get_max_size(int fd)
 	}
 
 	if (index < 0) {
-		switch (index) {
-		case VT_ERROR:
-			break;
-		case VT_EIO:
-			errno = EIO;
-			break;
-		case VT_EINVAL:
-			errno = EINVAL;
+		/*
+		 * Since both attempts to read the label failed, we're
+		 * going to use DKIOCGMEDIAINFO to get device size.
+		 */
+
+		label_type = LABEL_TYPE_OTHER;
+		slicesize = get_device_size(fd);
+		if (slicesize == 0) {
+			switch (index) {
+			case VT_ERROR:
+				break;
+			case VT_EIO:
+				errno = EIO;
+				break;
+			case VT_EINVAL:
+				errno = EINVAL;
+			}
+			perror(gettext("Can not determine partition size"));
+			lockexit(32);
 		}
-		perror(gettext("Can not determine partition size"));
-		lockexit(32);
 	}
 
 	if (label_type == LABEL_TYPE_EFI) {
 		slicesize = efi_vtoc->efi_parts[index].p_size;
 		efi_free(efi_vtoc);
-	} else {
+	} else if (label_type == LABEL_TYPE_VTOC) {
 		/*
 		 * In the vtoc struct, p_size is a 32-bit signed quantity.
 		 * In the dk_gpt struct (efi's version of the vtoc), p_size
@@ -3265,8 +3285,8 @@ static void
 awtfs(diskaddr_t bno, int size, char *bf, int release)
 {
 	int n;
-	aio_trans 	*transp;
-	sigset_t 	old_mask;
+	aio_trans	*transp;
+	sigset_t	old_mask;
 
 	if (fso == -1)
 		return;
@@ -4452,9 +4472,9 @@ findcsfragino()
 		dp = gdinode((ino_t)i);
 		switch (dp->di_mode & IFMT) {
 			case IFSHAD	:
-			case IFLNK 	:
-			case IFDIR 	:
-			case IFREG 	: break;
+			case IFLNK	:
+			case IFDIR	:
+			case IFREG	: break;
 			default		: continue;
 		}
 
@@ -4537,7 +4557,7 @@ fixcsfragino()
 static struct csum *
 read_summaryinfo(struct	fs *fsp)
 {
-	struct csum 	*csp;
+	struct csum	*csp;
 	int		i;
 
 	if ((csp = malloc((size_t)fsp->fs_cssize)) == NULL) {
@@ -4565,7 +4585,7 @@ read_summaryinfo(struct	fs *fsp)
 int64_t
 checkfragallocated(daddr32_t frag)
 {
-	struct 	csfrag	*cfp;
+	struct	csfrag	*cfp;
 	/*
 	 * Since the lists are sorted we can break the search if the asked
 	 * frag is smaller then the one in the list.
@@ -4601,12 +4621,12 @@ diskaddr_t
 probe_summaryinfo()
 {
 	/* fragments by which the csum block can be extended. */
-	int64_t 	growth_csum_frags = 0;
+	int64_t		growth_csum_frags = 0;
 	/* fragments by which the filesystem can be extended. */
 	int64_t		growth_fs_frags = 0;
 	int64_t		new_fs_cssize;	/* size of csum blk in the new FS */
 	int64_t		new_fs_ncg;	/* number of cg in the new FS */
-	int64_t 	spare_csum;
+	int64_t		spare_csum;
 	daddr32_t	oldfrag_daddr;
 	daddr32_t	newfrag_daddr;
 	daddr32_t	daddr;
@@ -5690,7 +5710,7 @@ in_64bit_mode(void)
 static int
 validate_size(int fd, diskaddr_t size)
 {
-	char 		buf[DEV_BSIZE];
+	char	buf[DEV_BSIZE];
 	int rc;
 
 	if ((llseek(fd, (offset_t)((size - 1) * DEV_BSIZE), SEEK_SET) == -1) ||
diff --git a/usr/src/cmd/grep/grep.c b/usr/src/cmd/grep/grep.c
index eabd465cca..7054d1f602 100644
--- a/usr/src/cmd/grep/grep.c
+++ b/usr/src/cmd/grep/grep.c
@@ -35,6 +35,7 @@
  */
 
 /*
+ * Copyright 2018 RackTop Systems.
  * Copyright 2018 Nexenta Systems, Inc.
  * Copyright 2013 Damian Bogel. All rights reserved.
  */
@@ -1277,8 +1278,8 @@ L_start_process:
 			goto L_next_line;
 
 		/* Do we have room to add this line to the context buffer? */
-		if ((line_len + 1) > (conbuflen -
-		    (conptrend >= conptr) ? conptrend - conbuf : 0)) {
+		while ((line_len + 1) > (conbuflen -
+		    ((conptrend >= conptr) ? conptrend - conbuf : 0))) {
 			char *oldconbuf = conbuf;
 			char *oldconptr = conptr;
 			long tmp = matchptr - conptr;
diff --git a/usr/src/cmd/rcap/rcapd/Makefile b/usr/src/cmd/rcap/rcapd/Makefile
index 62112abd00..77f4d6812e 100644
--- a/usr/src/cmd/rcap/rcapd/Makefile
+++ b/usr/src/cmd/rcap/rcapd/Makefile
@@ -19,41 +19,88 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
-MANIFEST =	rcap.xml
+include ../../Makefile.cmd
+include ../../Makefile.cmd.64
 
-include		../../Makefile.cmd
+.KEEP_STATE:
+
+PROG				= rcapd
+ROOTUSRLIBRCAP			= $(ROOT)/usr/lib/rcap
+ROOTUSRLIBRCAPPROG		= $(ROOTUSRLIBRCAP)/$(PROG)
 
-ROOTMANIFESTDIR =	$(ROOTSVCSYSTEM)
+COMMON_DIR=	../common
 
+MANIFEST = rcap.xml
+ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
 $(ROOTSVCSYSTEM)/rcap.xml := FILEMODE = 0444
 
-.KEEP_STATE:
 
-SUBDIRS =		$(MACH)
-$(BUILD64)SUBDIRS +=	$(MACH64)
+SRCS =	rcapd_main.c \
+	rcapd_collection.c \
+	rcapd_collection_project.c \
+	rcapd_collection_zone.c \
+	rcapd_mapping.c \
+	rcapd_rfd.c \
+	rcapd_scanner.c \
+	rcapd_stat.c \
+	utils.c
+
+LINTSRCS = rcapd_main.c \
+	rcapd_collection.c \
+	rcapd_collection_project.c \
+	rcapd_collection_zone.c \
+	rcapd_mapping.c \
+	rcapd_rfd.c \
+	rcapd_scanner.c \
+	$(COMMON_DIR)/rcapd_stat.c \
+	$(COMMON_DIR)/utils.c
+
+$(NOT_RELEASE_BUILD)CPPFLAGS	+= -DDEBUG
+CPPFLAGS			+= -DDEBUG_MSG
+CPPFLAGS			+= -I$(COMMON_DIR)
+LDLIBS			+= -lkstat -lproc -lproject -lzonecfg -lumem -lscf
+LDLIBS			+= $(EXTRA_LDLIBS)
+
+LINTFLAGS64		+= -u
+
+OBJS =			$(SRCS:%.c=%.o) rcapd_conf.o
+
+POFILES =		$(OBJS:%.o=%.po)
+POFILE =		$(PROG).po
+
+CLOBBERFILES +=		$(POFILES) $(POFILE)
+
+include ../Makefile.com
+
+.NO_PARALLEL:
+.PARALLEL: $(OBJS)
+
+all: $(PROG)
 
-MSGSUBDIRS=		$(MACH)
+install: all $(ROOTUSRLIBRCAPPROG) $(ROOTUSRLIBRCAP) $(ROOTMANIFEST)
 
-all := TARGET = all
-clean := TARGET = clean
-clobber := TARGET = clobber
-install := TARGET = install
-lint := TARGET = lint
-_msg := TARGET = _msg
+$(PROG): $(OBJS)
+	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+	$(POST_PROCESS)
 
-all clean clobber lint: $(SUBDIRS)
+check: $(CHKMANIFEST)
 
-install:	all $(SUBDIRS) $(ROOTMANIFEST)
+clean:
+	$(RM) $(OBJS)
+	$(RM) rcapd_conf.c
 
-check:		$(CHKMANIFEST)
+lint:
+	$(LINT.c) $(LINTSRCS) $(LDLIBS)
 
-_msg: $(MSGSUBDIRS)
+$(POFILE): $(POFILES)
+	$(RM) $@
+	$(CAT) $(POFILES) > $@
 
-$(SUBDIRS): FRC
-	@cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET)
+$(ROOTUSRLIBRCAP)/%: $(ROOTUSRLIBRCAP) %
+	$(INS.file)
 
-FRC:
+include ../../Makefile.targ
diff --git a/usr/src/cmd/rcap/rcapd/Makefile.rcapd b/usr/src/cmd/rcap/rcapd/Makefile.rcapd
deleted file mode 100644
index f0ff0e0669..0000000000
--- a/usr/src/cmd/rcap/rcapd/Makefile.rcapd
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-.KEEP_STATE:
-.SUFFIXES:
-
-# 
-# subdirs must define COMMON_DIR and include Makefile.com
-#
-
-SRCS =	rcapd_main.c \
-	rcapd_collection.c \
-	rcapd_collection_project.c \
-	rcapd_collection_zone.c \
-	rcapd_mapping.c \
-	rcapd_rfd.c \
-	rcapd_scanner.c \
-	rcapd_stat.c \
-	utils.c
-
-LINTSRCS = ../rcapd_main.c \
-	../rcapd_collection.c \
-	../rcapd_collection_project.c \
-	../rcapd_collection_zone.c \
-	../rcapd_mapping.c \
-	../rcapd_rfd.c \
-	../rcapd_scanner.c \
-	$(COMMON_DIR)/rcapd_stat.c \
-	$(COMMON_DIR)/utils.c 
-
-$(NOT_RELEASE_BUILD)CPPFLAGS 	+= -DDEBUG
-CPPFLAGS			+= -DDEBUG_MSG
-CPPFLAGS 			+= -I$(COMMON_DIR)
-LDLIBS 				+= -lkstat -lproc -lproject -lzonecfg -lumem -lscf
-LDLIBS				+= $(EXTRA_LDLIBS)
-
-LINTFLAGS			+= -u
-LINTFLAGS64			+= -u
-
-PROG =			rcapd
-OBJS =			$(SRCS:%.c=%.o) rcapd_conf.o
-
-POFILES =		$(OBJS:%.o=%.po)
-POFILE =		$(PROG).po
-
-CLOBBERFILES +=		$(POFILES) $(POFILE)
-
-.NO_PARALLEL:
-.PARALLEL: $(OBJS)
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-%.o: ../%.c
-	$(COMPILE.c) $<
-%.po: ../%.c
-	$(COMPILE.cpp) $< > $<.i
-	$(BUILD.po)
-
-
-clean:
-	$(RM) $(OBJS)
-	$(RM) rcapd_conf.c
-
-lint:
-	$(LINT.c) $(LINTSRCS) $(LDLIBS)
-
-$(POFILE): $(POFILES)
-	$(RM) $@
-	$(CAT) $(POFILES) > $@
-
-
-ROOTUSRLIBRCAP			= $(ROOT)/usr/lib/rcap
-ROOTUSRLIBRCAP32		= $(ROOTUSRLIBRCAP)/$(MACH32)
-ROOTUSRLIBRCAP64		= $(ROOTUSRLIBRCAP)/$(MACH64)
-ROOTUSRLIBRCAPPROG		= $(ROOTUSRLIBRCAP)/$(PROG)
-ROOTUSRLIBRCAPPROG32		= $(ROOTUSRLIBRCAP32)/$(PROG)
-ROOTUSRLIBRCAPPROG64		= $(ROOTUSRLIBRCAP64)/$(PROG)
-$(ROOTUSRLIBRCAP)/%: $(ROOTUSRLIBRCAP) %
-	$(INS.file)
-$(ROOTUSRLIBRCAP32)/%: $(ROOTUSRLIBRCAP32) %
-	$(INS.file)
-$(ROOTUSRLIBRCAP64)/%: $(ROOTUSRLIBRCAP64) %
-	$(INS.file)
-
-include ../../../Makefile.targ
diff --git a/usr/src/cmd/rcap/rcapd/amd64/Makefile b/usr/src/cmd/rcap/rcapd/amd64/Makefile
deleted file mode 100644
index 489c7f4148..0000000000
--- a/usr/src/cmd/rcap/rcapd/amd64/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../../../Makefile.cmd
-include ../../../Makefile.cmd.64
-COMMON_DIR=	../../common	# for Makefile.com
-include ../Makefile.rcapd
-include ../../Makefile.com
-
-ROOTUSRLIBRCAPLINK=$(ROOTUSRLIBRCAPPROG)
-$(ROOTUSRLIBRCAPLINK): $(ISAEXEC) $(ROOTUSRLIBRCAP) $(ROOTUSRLIBRCAPPROG64)
-	-$(RM) $(ROOTUSRLIBRCAPPROG)
-	$(LN) $(ISAEXEC) $(ROOTUSRLIBRCAPPROG)
-
-install: all $(ROOTUSRLIBRCAPPROG64) $(ROOTUSRLIBRCAPLINK)
diff --git a/usr/src/cmd/rcap/rcapd/i386/Makefile b/usr/src/cmd/rcap/rcapd/i386/Makefile
deleted file mode 100644
index 22f6ebe30c..0000000000
--- a/usr/src/cmd/rcap/rcapd/i386/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-include ../../../Makefile.cmd
-COMMON_DIR=	../../common	# for Makefile.com
-include ../Makefile.rcapd
-include ../../Makefile.com
-
-ROOTUSRLIBRCAPLINK=$(ROOTUSRLIBRCAPPROG)
-$(ROOTUSRLIBRCAPLINK): $(ISAEXEC) $(ROOTUSRLIBRCAP) $(ROOTUSRLIBRCAPPROG32)
-	-$(RM) $(ROOTUSRLIBRCAPPROG)
-	$(LN) $(ISAEXEC) $(ROOTUSRLIBRCAPPROG)
-
-install: all $(ROOTUSRLIBRCAPPROG32) $(ROOTUSRLIBRCAPLINK)
diff --git a/usr/src/cmd/rcap/rcapd/sparc/Makefile b/usr/src/cmd/rcap/rcapd/sparc/Makefile
deleted file mode 100644
index 54841664c5..0000000000
--- a/usr/src/cmd/rcap/rcapd/sparc/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-include ../../../Makefile.cmd
-COMMON_DIR=	../../common	# for Makefile.com
-include ../Makefile.rcapd
-include ../../Makefile.com
-
-ROOTUSRLIBRCAPLINK=$(ROOTUSRLIBRCAPPROG)
-$(ROOTUSRLIBRCAPLINK): $(ISAEXEC) $(ROOTUSRLIBRCAPPROG32)
-	-$(RM) $(ROOTUSRLIBRCAPPROG)
-	$(LN) $(ISAEXEC) $(ROOTUSRLIBRCAPPROG)
-
-install: all $(ROOTUSRLIBRCAPPROG32) $(ROOTUSRLIBRCAPLINK)
diff --git a/usr/src/cmd/rcap/rcapd/sparcv9/Makefile b/usr/src/cmd/rcap/rcapd/sparcv9/Makefile
deleted file mode 100644
index 322d709cd6..0000000000
--- a/usr/src/cmd/rcap/rcapd/sparcv9/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-include ../../../Makefile.cmd
-include ../../../Makefile.cmd.64
-COMMON_DIR=	../../common	# for Makefile.com
-include ../Makefile.rcapd
-include ../../Makefile.com
-
-ROOTUSRLIBRCAPLINK=$(ROOTUSRLIBRCAPPROG)
-$(ROOTUSRLIBRCAPLINK): $(ISAEXEC) $(ROOTUSRLIBRCAP) $(ROOTUSRLIBRCAPPROG64)
-	-$(RM) $(ROOTUSRLIBRCAPPROG)
-	$(LN) $(ISAEXEC) $(ROOTUSRLIBRCAPPROG)
-
-install: all $(ROOTUSRLIBRCAPPROG64) $(ROOTUSRLIBRCAPLINK)
diff --git a/usr/src/cmd/sasinfo/printAttrs.c b/usr/src/cmd/sasinfo/printAttrs.c
index ae66526d59..2c0d71743f 100644
--- a/usr/src/cmd/sasinfo/printAttrs.c
+++ b/usr/src/cmd/sasinfo/printAttrs.c
@@ -99,6 +99,7 @@ static SAS_STATE phystate_string[] = {
 	HBA_SASSPEED_1_5GBIT,		"1.5Gbit",
 	HBA_SASSPEED_3GBIT,		"3Gbit",
 	HBA_SASSPEED_6GBIT,		"6Gbit",
+	HBA_SASSPEED_12GBIT,		"12Gbit",
 	-1,				NULL,
 };
 
@@ -165,7 +166,8 @@ getPhyStateString(HBA_UINT32 key, phystat_type phyt)
 	HBA_UINT32 physpeed[] = {
 		HBA_SASSPEED_1_5GBIT,
 		HBA_SASSPEED_3GBIT,
-		HBA_SASSPEED_6GBIT
+		HBA_SASSPEED_6GBIT,
+		HBA_SASSPEED_12GBIT
 	};
 
 	len = sizeof (physpeed) / sizeof (HBA_UINT32);