[illumos-gate merge]

commit 995a963f85d39c82ddd55378042f53b3a58c2519
    10726 elfexec: NULL pointer errors
commit ffc2b7d4ae69a2eeeab283452dc5c0d70ce7519f
    10723 hci1394: NULL pointer errors
commit accc298111fac9235e2da8bc29e5447a704f03d3
    10722 rdsib: NULL pointer errors
commit dd26c2a4ed479de9278176640c3799952ea71ae2
    10719 eibnx: NULL pointer errors
commit 11b5d82fcd2fe348d89f47fa6e7abbcd64f9948b
    10716 usbvc: NULL pointer errors
commit 2888301ab934162a32ecd126389b2d9ba0ffa01e
    10683 kb8042: implement kb8042_rsrv() to get out of interrupt context
commit e6b6ca04e8507fd588b555801518e701ceab9eeb
    10605 loader: boot2 build should use ldscript
commit fb8e13ed8c6a64edaf592a26d8888d50e8462971
    10832 system(4) refers to coffexec

	Conflicts:
	usr/src/uts/common/exec/elf/elf.c

20 files changed, 193 insertions, 143 deletions

diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version
index c81856bc9a..fcf8fcba05 100644
--- a/usr/src/boot/Makefile.version
+++ b/usr/src/boot/Makefile.version
@@ -33,4 +33,4 @@ LOADER_VERSION = 1.1
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2019.04.12.1
+BOOT_VERSION = $(LOADER_VERSION)-2019.04.15.1
diff --git a/usr/src/boot/sys/boot/Makefile.inc b/usr/src/boot/sys/boot/Makefile.inc
index f8075d21b2..96cc368155 100644
--- a/usr/src/boot/sys/boot/Makefile.inc
+++ b/usr/src/boot/sys/boot/Makefile.inc
@@ -43,6 +43,7 @@ CPPFLAGS=	-D_STANDALONE -_gcc=-nostdinc
 CFLAGS64=	-_gcc=-mno-red-zone
 
 CFLAGS=		-_gcc=-Os -_gcc=-fPIC -_gcc=-ffreestanding -_gcc=-fno-builtin
+CFLAGS +=	-_gcc=-ffunction-sections -_gcc=-fdata-sections
 CFLAGS +=	-_gcc=-mno-mmx -_gcc=-mno-3dnow -_gcc=-mno-sse -_gcc=-mno-sse2
 CFLAGS +=	-_gcc=-mno-sse3 -_gcc=-msoft-float
 CFLAGS +=	-_gcc=-mno-avx -_gcc=-mno-aes
diff --git a/usr/src/boot/sys/boot/common/bcache.c b/usr/src/boot/sys/boot/common/bcache.c
index e5a237827d..fd43ebd68e 100644
--- a/usr/src/boot/sys/boot/common/bcache.c
+++ b/usr/src/boot/sys/boot/common/bcache.c
@@ -464,7 +464,6 @@ bcache_invalidate(struct bcache *bc, daddr_t blkno)
     }
 }
 
-#ifndef BOOT2
 COMMAND_SET(bcachestat, "bcachestat", "get disk block cache stats", command_bcache);
 
 static int
@@ -484,4 +483,3 @@ command_bcache(int argc, char *argv[] __attribute((unused)))
 	bcache_bypasses, bcache_hits, bcache_misses);
     return(CMD_OK);
 }
-#endif
diff --git a/usr/src/boot/sys/boot/common/zfs_cmd.c b/usr/src/boot/sys/boot/common/zfs_cmd.c
index 957bfb004d..fd8edd10c3 100644
--- a/usr/src/boot/sys/boot/common/zfs_cmd.c
+++ b/usr/src/boot/sys/boot/common/zfs_cmd.c
@@ -35,7 +35,6 @@
 
 #include "libzfs.h"
 
-#ifndef BOOT2
 COMMAND_SET(lszfs, "lszfs", "list child datasets of a zfs dataset",
 	    command_lszfs);
 
@@ -56,7 +55,6 @@ command_lszfs(int argc, char *argv[])
 	}
 	return (CMD_OK);
 }
-#endif
 
 uint64_t
 ldi_get_size(void *priv)
diff --git a/usr/src/boot/sys/boot/i386/Makefile b/usr/src/boot/sys/boot/i386/Makefile
index 9c76eb1e4c..bfcf99270b 100644
--- a/usr/src/boot/sys/boot/i386/Makefile
+++ b/usr/src/boot/sys/boot/i386/Makefile
@@ -33,7 +33,7 @@ all clean clobber: $(SUBDIRS)
 
 install: all .WAIT $(INSTDIRS)
 
-loader: libi386
+loader gptzfsboot: libi386
 pxeldr: loader
 cdboot gptzfsboot loader pxeldr isoboot: btx
 
diff --git a/usr/src/boot/sys/boot/i386/boot.ldscript b/usr/src/boot/sys/boot/i386/boot.ldscript
new file mode 100644
index 0000000000..5e6b97b197
--- /dev/null
+++ b/usr/src/boot/sys/boot/i386/boot.ldscript
@@ -0,0 +1,48 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+/*
+ * Copyright 2019 Toomas Soome <tsoome@me.com>
+ */
+
+OUTPUT_FORMAT("elf32-i386-sol2", "elf32-i386-sol2", "elf32-i386-sol2")
+OUTPUT_ARCH(i386)
+ENTRY(_start)
+SECTIONS
+{
+	. = 0x0;
+	.text . :
+	{
+		*(.text .text.*)
+		*(.plt)
+	}
+	.data :
+	{
+		*(.rodata .rodata.*)
+		*(.rodata1)
+		*(.data .data.*)
+		*(.got.plt .got)
+		_edata = .;
+	}
+	.bss :
+	{
+		__bss_start = . ;
+		*(.bss .bss.*)
+		*(COMMON)
+	}
+	.edata :
+	{
+		_end = . ;
+	}
+	/DISCARD/ :		/* Not used in boot2 */
+	{
+		*(set_Xcommand_set)
+	}
+}
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
index 184ffbe9a8..466a2f1276 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
+++ b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
@@ -35,9 +35,9 @@ ORG2=	0x0
 CPPFLAGS += -DBOOTPROG=\"gptzfsboot\" \
 	-DGPT -DBOOT2 \
 	-DLOADER_MBR_SUPPORT -DLOADER_GPT_SUPPORT \
-	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
-	-DSIOFMT=${B2SIOFMT} \
-	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
+	-DSIOPRT=$(BOOT_COMCONSOLE_PORT) \
+	-DSIOFMT=$(B2SIOFMT) \
+	-DSIOSPD=$(BOOT_COMCONSOLE_SPEED) \
 	-I../../../../include \
 	-I../../../../lib/libstand \
 	-I../../common \
@@ -48,8 +48,11 @@ CPPFLAGS += -DBOOTPROG=\"gptzfsboot\" \
 	-I../../.. \
 	-I../libi386
 
-LD_FLAGS=-static -N --gc-sections
+LDSCRIPT=	../boot.ldscript
+LD_FLAGS=	-static -N --gc-sections
+LIBI386=	../libi386/libi386.a
 LIBSTAND=	../../libstand/$(MACH)/libstand.a
+LIBS=		$(LIBI386) $(LIBSTAND)
 
 include ../Makefile.inc
 
@@ -59,9 +62,8 @@ all: $(PROG)
 
 install: all $(ROOTBOOTPROG)
 
-OBJS =	multiboot.o zfsboot.o sio.o cons.o devopen.o bio.o \
-	part.o biosmem.o smbios.o biosdisk.o devicename.o disk.o bcache.o \
-	time.o zfs_cmd.o
+OBJS =	multiboot.o zfsboot.o sio.o cons.o devopen.o \
+	part.o disk.o bcache.o zfs_cmd.o
 
 part.o := CPPFLAGS += -I$(ZLIB)
 smbios.o := CPPFLAGS += -DSMBIOS_SERIAL_NUMBERS
@@ -69,25 +71,25 @@ smbios.o := CPPFLAGS += -DSMBIOS_LITTLE_ENDIAN_UUID
 
 CLEANFILES=	gptzfsboot $(OBJS)
 
-gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN}
-	$(BTXLD) -E ${ORG2} -f bin -b ${BTXKERN} -V ${BOOT_VERSION} -l \
+gptzfsboot: gptldr.bin gptzfsboot.bin $(BTXKERN)
+	$(BTXLD) -E $(ORG2) -f bin -b $(BTXKERN) -V $(BOOT_VERSION) -l \
 		gptldr.bin -o $@ gptzfsboot.bin
 
 CLEANFILES +=	gptldr.bin gptldr.out gptldr.o
 
 gptldr.bin: gptldr.out
-	${OBJCOPY} -S -O binary gptldr.out $@
+	$(OBJCOPY) -S -O binary gptldr.out $@
 
 gptldr.out: gptldr.o
-	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o $@ gptldr.o
+	$(LD) $(LD_FLAGS) -e start -Ttext $(ORG1) -o $@ gptldr.o
 
 CLEANFILES +=	gptzfsboot.bin gptzfsboot.out
 
 gptzfsboot.bin: gptzfsboot.out
-	${OBJCOPY} -S -O binary gptzfsboot.out $@
+	$(OBJCOPY) -S -O binary gptzfsboot.out $@
 
-gptzfsboot.out: ${BTXCRT} ${OBJS} ${LIBSTAND}
-	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o $@ ${BTXCRT} ${OBJS} ${LIBSTAND}
+gptzfsboot.out: $(BTXCRT) $(OBJS) $(LIBSTAND)
+	$(LD) $(LD_FLAGS) -T $(LDSCRIPT) -o $@ $(BTXCRT) $(OBJS) $(LIBS)
 
 machine:
 	$(RM) machine
@@ -108,9 +110,6 @@ $(OBJS): machine x86
 multiboot.o: ../../common/multiboot.S
 	$(COMPILE.S) ../../common/multiboot.S
 
-%.o: ../libi386/%.c
-	$(COMPILE.c) $<
-
 clobber: clean
 
 clean:
diff --git a/usr/src/boot/sys/boot/i386/isoboot/Makefile b/usr/src/boot/sys/boot/i386/isoboot/Makefile
index 5b13aa6f65..fd23e8e2a3 100644
--- a/usr/src/boot/sys/boot/i386/isoboot/Makefile
+++ b/usr/src/boot/sys/boot/i386/isoboot/Makefile
@@ -30,9 +30,9 @@ ORG2= 0x0
 ISOBOOTSIZE= 30720
 
 CPPFLAGS += -DBOOTPROG=\"isoboot\" \
-	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
-	-DSIOFMT=${B2SIOFMT} \
-	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
+	-DSIOPRT=$(BOOT_COMCONSOLE_PORT) \
+	-DSIOFMT=$(B2SIOFMT) \
+	-DSIOSPD=$(BOOT_COMCONSOLE_SPEED) \
 	-I../../../../include \
 	-I../../../../lib/libstand \
 	-I. \
@@ -42,6 +42,7 @@ CPPFLAGS += -DBOOTPROG=\"isoboot\" \
 	-I../../common \
 	-I../gptzfsboot
 
+LDSCRIPT=	../boot.ldscript
 LD_FLAGS=	-static -N --gc-sections
 LIBSTAND=	../../libstand/$(MACH)/libstand.a
 
@@ -55,27 +56,27 @@ OBJS= multiboot.o isoboot.o sio.o drv.o cons.o gptldr.o
 
 CLEANFILES += isoboot
 
-isoboot: gptldr.bin isoboot.bin ${BTXKERN}
-	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -V ${BOOT_VERSION} -l \
+isoboot: gptldr.bin isoboot.bin $(BTXKERN)
+	btxld -v -E $(ORG2) -f bin -b $(BTXKERN) -V $(BOOT_VERSION) -l \
 		gptldr.bin -o $@ isoboot.bin
-	@set -- `ls -l $@`; x=$$((${ISOBOOTSIZE}-$$5)); \
+	@set -- `ls -l $@`; x=$$(($(ISOBOOTSIZE)-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 
 CLEANFILES += gptldr.bin gptldr.out gptldr.o
 
 gptldr.bin: gptldr.out
-	${OBJCOPY} -S -O binary gptldr.out $@
+	$(OBJCOPY) -S -O binary gptldr.out $@
 
 gptldr.out:	gptldr.o
-	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o $@ gptldr.o
+	$(LD) $(LD_FLAGS) -e start -Ttext $(ORG1) -o $@ gptldr.o
 
-CLEANFILES += isoboot.bin isoboot.out ${OBJS}
+CLEANFILES += isoboot.bin isoboot.out $(OBJS)
 
 isoboot.bin: isoboot.out
-	${OBJCOPY} -S -O binary isoboot.out $@
+	$(OBJCOPY) -S -O binary isoboot.out $@
 
-isoboot.out: ${BTXCRT} ${OBJS}
-	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o $@ ${BTXCRT} ${OBJS} ${LIBSTAND}
+isoboot.out: $(BTXCRT) $(OBJS)
+	$(LD) $(LD_FLAGS) -T $(LDSCRIPT) -o $@ $(BTXCRT) $(OBJS) $(LIBSTAND)
 
 machine:
 	$(RM) machine
diff --git a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c b/usr/src/boot/sys/boot/i386/libi386/biosdisk.c
index 38eda5171a..08d7ac2ffe 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c
+++ b/usr/src/boot/sys/boot/i386/libi386/biosdisk.c
@@ -304,10 +304,8 @@ fd_init(void)
 		}
 		if (bd->bd_sectors == 0)
 			bd->bd_flags |= BD_NO_MEDIA;
-#ifndef BOOT2
 		printf("BIOS drive %c: is %s%d\n", ('A' + unit),
 		    biosfd.dv_name, unit);
-#endif
 		STAILQ_INSERT_TAIL(&fdinfo, bd, bd_link);
 	}
 
@@ -333,10 +331,8 @@ bd_init(void)
 			free(bd);
 			break;
 		}
-#ifndef BOOT2
 		printf("BIOS drive %c: is %s%d\n", ('C' + unit),
 		    bioshd.dv_name, unit);
-#endif
 		STAILQ_INSERT_TAIL(&hdinfo, bd, bd_link);
 	}
 	bcache_add_dev(unit);
diff --git a/usr/src/boot/sys/boot/i386/libi386/biosmem.c b/usr/src/boot/sys/boot/i386/libi386/biosmem.c
index ad59d61bf9..05d3c2521f 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biosmem.c
+++ b/usr/src/boot/sys/boot/i386/libi386/biosmem.c
@@ -224,7 +224,6 @@ bios_getmem(void)
 	}
 }
 
-#ifndef	BOOT2
 static int
 command_biosmem(int argc, char *argv[])
 {
@@ -256,4 +255,3 @@ command_biosmem(int argc, char *argv[])
 }
 
 COMMAND_SET(biosmem, "biosmem", "show BIOS memory setup", command_biosmem);
-#endif
diff --git a/usr/src/boot/sys/boot/i386/loader/Makefile b/usr/src/boot/sys/boot/i386/loader/Makefile
index ac4ea6ce0c..ab866d6338 100644
--- a/usr/src/boot/sys/boot/i386/loader/Makefile
+++ b/usr/src/boot/sys/boot/i386/loader/Makefile
@@ -38,11 +38,11 @@ ROOTBOOTFORTH=$(FORTH:%=$(ROOT_BOOT_FORTH)/%)
 ROOTBOOTDEFAULTS=$(DEFFILES:%=$(ROOT_BOOT_DEFAULTS)/%)
 FILEMODE=0444
 
-all: ${LOADER} loader.help
+all: $(LOADER) loader.help
 
 install: all $(ROOTBOOTLOADER)
 
-PROG=		${LOADER}.sym
+PROG=		$(LOADER).sym
 
 # architecture-specific loader code
 SRCS=		main.c conf.c vers.c chain.c
@@ -81,7 +81,7 @@ SRCS +=	interp_forth.c
 CPPFLAGS +=	-I../../common
 CPPFLAGS +=	-I.
 
-CLEANFILES=	vers.c ${LOADER} ${LOADER}.sym ${LOADER}.bin loader.help
+CLEANFILES=	vers.c $(LOADER) $(LOADER).sym $(LOADER).bin loader.help
 CLEANFILES +=	$(FONT).c
 
 LDFLAGS=	-static -Ttext 0x0
@@ -104,20 +104,20 @@ include ../Makefile.inc
 CPPFLAGS +=	-I$(SRC)/uts/common
 
 vers.c:	../../common/newvers.sh $(SRC)/boot/Makefile.version
-	$(SH) ../../common/newvers.sh ${LOADER_VERSION} ${NEWVERSWHAT}
+	$(SH) ../../common/newvers.sh $(LOADER_VERSION) $(NEWVERSWHAT)
 
-${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
-	$(BTXLD) -f aout -e ${LOADER_ADDRESS} -o $@ -l ${BTXLDR} \
-		-b ${BTXKERN} ${LOADER}.bin
+$(LOADER): $(LOADER).bin $(BTXLDR) $(BTXKERN)
+	$(BTXLD) -f aout -e $(LOADER_ADDRESS) -o $@ -l $(BTXLDR) \
+		-b $(BTXKERN) $(LOADER).bin
 
-${LOADER}.bin: ${LOADER}.sym
+$(LOADER).bin: $(LOADER).sym
 	$(CP) $^ $@
 	$(GSTRIP) -R .comment -R .note $@
 
 loader.help: ../../common/help.common help.i386
 	$(CAT) $^ | $(AWK) -f ../../common/merge_help.awk > $@
 
-FILES=	${LOADER} loader.help
+FILES=	$(LOADER) loader.help
 
 include	../../forth/Makefile.inc
 FORTH +=	pcibios.4th
@@ -127,8 +127,8 @@ FORTH +=	menu.rc
 
 # XXX crt0.o needs to be first for pxeboot(8) to work
 
-DPADD=	${LIBFICL} ${LIBI386} ${LIBCRYPTO} ${LIBSTAND}
-LDADD=	${LIBFICL} ${LIBI386} ${LIBCRYPTO} ${LIBSTAND}
+DPADD=	$(LIBFICL) $(LIBI386) $(LIBCRYPTO) $(LIBSTAND)
+LDADD=	$(LIBFICL) $(LIBI386) $(LIBCRYPTO) $(LIBSTAND)
 
 CLEANFILES +=	machine x86
 
@@ -142,9 +142,9 @@ x86:
 
 OBJS=		$(SRCS:%.c=%.o)
 
-${OBJS}: machine x86
+$(OBJS): machine x86
 
-${PROG}: ${OBJS} $(LDADD)
+$(PROG): $(OBJS) $(LDADD)
 	$(LD) $(LDFLAGS) -o $@ $(BTXCRT) $(OBJS) $(LDADD)
 
 clean: clobber
diff --git a/usr/src/man/man4/system.4 b/usr/src/man/man4/system.4
index 1b42fc3a75..7420c833ba 100644
--- a/usr/src/man/man4/system.4
+++ b/usr/src/man/man4/system.4
@@ -2,11 +2,12 @@
 .\" Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
 .\" Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
 .\" Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+.\" Copyright 2019 Peter Tribble
 .\" Copyright 1989 AT&T
 .\" 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]
-.TH SYSTEM 4 "Jan 29, 2019"
+.TH SYSTEM 4 "Apr 20, 2019"
 .SH NAME
 system \- system configuration information file
 .SH DESCRIPTION
@@ -68,7 +69,7 @@ Modules in this namespace are execution format modules. The following
 .sp
 .ne 2
 .na
-\fBOnly on SPARC system:\fR
+\fBOnly on SPARC systems:\fR
 .ad
 .RS 28n
 .sp
@@ -84,22 +85,6 @@ aoutexec
 .sp
 .ne 2
 .na
-\fBOnly on x86 system:\fR
-.ad
-.RS 28n
-.sp
-.in +2
-.nf
-coffexec
-.fi
-.in -2
-.sp
-
-.RE
-
-.sp
-.ne 2
-.na
 \fBOn SPARC and IA systems:\fR
 .ad
 .RS 28n
diff --git a/usr/src/uts/common/exec/elf/elf.c b/usr/src/uts/common/exec/elf/elf.c
index cf5e0bdfd9..a4078bb351 100644
--- a/usr/src/uts/common/exec/elf/elf.c
+++ b/usr/src/uts/common/exec/elf/elf.c
@@ -266,7 +266,7 @@ mapexec_brand(vnode_t *vp, uarg_t *args, Ehdr *ehdr, Addr *uphdr_vaddr,
 	size_t		execsz;
 
 	if (lddatap != NULL)
-		*lddatap = NULL;
+		*lddatap = 0;
 
 	if (minaddrp != NULL)
 		*minaddrp = NULL;
@@ -1117,8 +1117,9 @@ elfexec(vnode_t *vp, execa_t *uap, uarg_t *args, intpdata_t *idatap,
 		 * take care of the FPU entries.
 		 */
 #if defined(__amd64)
-		if (args->commpage != NULL ||
-		    (args->commpage = (uintptr_t)comm_page_mapin()) != NULL) {
+		if (args->commpage != (uintptr_t)NULL ||
+		    (args->commpage = (uintptr_t)comm_page_mapin()) !=
+		    (uintptr_t)NULL) {
 			ADDAUX(aux, AT_SUN_COMMPAGE, args->commpage)
 		} else {
 			/*
diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_comp.c b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_comp.c
index 130fd439f8..31048d5a4d 100644
--- a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_comp.c
+++ b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_comp.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * hci1394_ixl_comp.c
  *    Isochronous IXL Compiler.
@@ -179,7 +177,7 @@ hci1394_compile_ixl_init(hci1394_comp_ixl_vars_t *wvp,
 	wvp->ctxtp = ctxtp;
 
 	/* init/clear ctxtp values */
-	ctxtp->dma_mem_execp = NULL;
+	ctxtp->dma_mem_execp = 0;
 	ctxtp->dma_firstp = NULL;
 	ctxtp->dma_last_time = 0;
 	ctxtp->xcs_firstp = NULL;
@@ -372,9 +370,9 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp)
 
 		/* error if xmit/recv mode not appropriate for current cmd */
 		if ((((wvp->ixl_io_mode & HCI1394_ISO_CTXT_RECV) != 0) &&
-			((ixlopcode & IXL1394_OPF_ONRECV) == 0)) ||
+		    ((ixlopcode & IXL1394_OPF_ONRECV) == 0)) ||
 		    (((wvp->ixl_io_mode & HCI1394_ISO_CTXT_RECV) == 0) &&
-			((ixlopcode & IXL1394_OPF_ONXMIT) == 0))) {
+		    ((ixlopcode & IXL1394_OPF_ONXMIT) == 0))) {
 
 			/* check if command op failed because it was invalid */
 			if (hci1394_is_opcode_valid(ixlopcode) != B_TRUE) {
@@ -835,13 +833,13 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp)
 			    ixlcurp;
 
 			if ((wvp->ixl_setskipmode_cmdp->skipmode !=
-				IXL1394_SKIP_TO_NEXT) &&
+			    IXL1394_SKIP_TO_NEXT) &&
 			    (wvp->ixl_setskipmode_cmdp->skipmode !=
-				IXL1394_SKIP_TO_SELF) &&
+			    IXL1394_SKIP_TO_SELF) &&
 			    (wvp->ixl_setskipmode_cmdp->skipmode !=
-				IXL1394_SKIP_TO_STOP) &&
+			    IXL1394_SKIP_TO_STOP) &&
 			    (wvp->ixl_setskipmode_cmdp->skipmode !=
-				IXL1394_SKIP_TO_LABEL)) {
+			    IXL1394_SKIP_TO_LABEL)) {
 
 				TNF_PROBE_3(hci1394_parse_ixl_dup_set_error,
 				    HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string,
@@ -858,10 +856,10 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp)
 			 * references an IXL1394_OP_LABEL
 			 */
 			if ((wvp->ixl_setskipmode_cmdp->skipmode ==
-				IXL1394_SKIP_TO_LABEL) &&
+			    IXL1394_SKIP_TO_LABEL) &&
 			    ((wvp->ixl_setskipmode_cmdp->label == NULL) ||
 			    (wvp->ixl_setskipmode_cmdp->label->ixl_opcode !=
-				IXL1394_OP_LABEL))) {
+			    IXL1394_OP_LABEL))) {
 
 				TNF_PROBE_3(hci1394_parse_ixl_jump_error,
 				    HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string,
@@ -1350,8 +1348,8 @@ hci1394_finalize_cur_xfer_desc(hci1394_comp_ixl_vars_t *wvp)
 	if (wvp->xfer_hci_flush != 0) {
 		if (((wvp->ixl_cur_xfer_stp->ixl_opcode &
 		    IXL1394_OPTY_XFER_PKT_ST) != 0) || ((wvp->xfer_hci_flush &
-			(UPDATEABLE_XFER | UPDATEABLE_SET | INITIATING_LBL)) !=
-			0)) {
+		    (UPDATEABLE_XFER | UPDATEABLE_SET | INITIATING_LBL)) !=
+		    0)) {
 
 			if (hci1394_flush_hci_cache(wvp) != DDI_SUCCESS) {
 				TNF_PROBE_0_DEBUG(
@@ -2386,7 +2384,7 @@ hci1394_set_next_xfer_buf(hci1394_comp_ixl_vars_t *wvp, uint32_t bufp,
 	    HCI1394_TNF_HAL_STACK_ISOCH, "");
 
 	/* error if buffer pointer is null (size may be 0) */
-	if (bufp == NULL) {
+	if (bufp == 0) {
 
 		wvp->dma_bld_error = IXL1394_ENULL_BUFFER_ADDR;
 
@@ -2444,7 +2442,7 @@ hci1394_flush_end_desc_check(hci1394_comp_ixl_vars_t *wvp, uint32_t count)
 
 	if ((count != 0) ||
 	    ((wvp->xfer_hci_flush & (UPDATEABLE_XFER | UPDATEABLE_SET |
-		INITIATING_LBL)) == 0)) {
+	    INITIATING_LBL)) == 0)) {
 
 		if (wvp->xfer_hci_flush & UPDATEABLE_JUMP) {
 			if (hci1394_flush_hci_cache(wvp) != DDI_SUCCESS) {
@@ -2575,7 +2573,7 @@ hci1394_alloc_storevalue_dma_mem(hci1394_comp_ixl_vars_t *wvp)
 		    tnf_opaque, ixl_commandp, wvp->ixl_cur_cmdp);
 		TNF_PROBE_0_DEBUG(hci1394_alloc_storevalue_dma_mem_exit,
 		    HCI1394_TNF_HAL_STACK_ISOCH, "");
-		return (NULL);
+		return (0);
 	}
 
 	TNF_PROBE_0_DEBUG(hci1394_alloc_storevalue_dma_mem_exit,
@@ -2669,7 +2667,7 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size,
 	 */
 	if ((wvp->dma_currentp == NULL) ||
 	    (size > (wvp->dma_currentp->mem.bi_cookie.dmac_size -
-		wvp->dma_currentp->used))) {
+	    wvp->dma_currentp->used))) {
 #ifdef _KERNEL
 		/* kernel-mode memory allocation for driver */
 
@@ -2746,7 +2744,7 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size,
 		/* user-mode memory allocation for user mode compiler tests */
 		/* allocate another dma_desc_mem struct */
 		if ((dma_new = (hci1394_idma_desc_mem_t *)
-			calloc(1, sizeof (hci1394_idma_desc_mem_t))) == NULL) {
+		    calloc(1, sizeof (hci1394_idma_desc_mem_t))) == NULL) {
 			TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_exit,
 			    HCI1394_TNF_HAL_STACK_ISOCH, "");
 			return (NULL);
@@ -2754,7 +2752,7 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size,
 		dma_new->mem.bi_dma_handle = NULL;
 		dma_new->mem.bi_handle = NULL;
 		if ((dma_new->mem.bi_kaddr = (caddr_t)calloc(1,
-			    HCI1394_IXL_PAGESIZE)) == NULL) {
+		    HCI1394_IXL_PAGESIZE)) == NULL) {
 			TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_exit,
 			    HCI1394_TNF_HAL_STACK_ISOCH, "");
 			return (NULL);
diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c
index 55e4f67f8c..45db7e614f 100644
--- a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c
+++ b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c
@@ -1010,7 +1010,7 @@ hci1394_ixl_update_prep_recv_pkt(hci1394_ixl_update_vars_t *uvp)
 	}
 
 	/* if new IXL buffer addrs are null, return error */
-	if ((new_xfer_pkt_ixlp->ixl_buf.ixldmac_addr == NULL) ||
+	if ((new_xfer_pkt_ixlp->ixl_buf.ixldmac_addr == 0) ||
 	    (new_xfer_pkt_ixlp->mem_bufp == NULL)) {
 
 		uvp->upd_status = IXL1394_EXFER_BUF_MISSING;
@@ -1149,7 +1149,7 @@ hci1394_ixl_update_prep_recv_buf(hci1394_ixl_update_vars_t *uvp)
 	}
 
 	/* if new IXL buffer addrs are null, return error */
-	if ((new_xfer_buf_ixlp->ixl_buf.ixldmac_addr == NULL) ||
+	if ((new_xfer_buf_ixlp->ixl_buf.ixldmac_addr == 0) ||
 	    (new_xfer_buf_ixlp->mem_bufp == NULL)) {
 
 		uvp->upd_status = IXL1394_EXFER_BUF_MISSING;
@@ -1258,7 +1258,7 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp)
 	}
 
 	/* if new ixl buffer addrs are null, return error */
-	if ((new_xfer_pkt_ixlp->ixl_buf.ixldmac_addr == NULL) ||
+	if ((new_xfer_pkt_ixlp->ixl_buf.ixldmac_addr == 0) ||
 	    (new_xfer_pkt_ixlp->mem_bufp == NULL)) {
 
 		uvp->upd_status = IXL1394_EXFER_BUF_MISSING;
@@ -1424,7 +1424,7 @@ hci1394_ixl_update_prep_send_buf(hci1394_ixl_update_vars_t *uvp)
 	}
 
 	/* if new IXL buffer addresses are null, return error */
-	if ((new_xfer_buf_ixlp->ixl_buf.ixldmac_addr == NULL) ||
+	if ((new_xfer_buf_ixlp->ixl_buf.ixldmac_addr == 0) ||
 	    (new_xfer_buf_ixlp->mem_bufp == NULL)) {
 
 		uvp->upd_status = IXL1394_EXFER_BUF_MISSING;
diff --git a/usr/src/uts/common/io/ib/clients/eoib/enx_misc.c b/usr/src/uts/common/io/ib/clients/eoib/enx_misc.c
index a79cdb084f..a465dd3dce 100644
--- a/usr/src/uts/common/io/ib/clients/eoib/enx_misc.c
+++ b/usr/src/uts/common/io/ib/clients/eoib/enx_misc.c
@@ -616,7 +616,7 @@ eibnx_make_nodename(eibnx_thr_info_t *info, uint16_t gw_portid)
 {
 	char *name;
 
-	if (info->ti_ident[0] == NULL)
+	if (info->ti_ident[0] == '\0')
 		return (NULL);
 
 	name = kmem_zalloc(MAXNAMELEN, KM_SLEEP);
diff --git a/usr/src/uts/common/io/ib/clients/rds/rdsib_buf.c b/usr/src/uts/common/io/ib/clients/rds/rdsib_buf.c
index e2a7c43ada..dd641ebaeb 100644
--- a/usr/src/uts/common/io/ib/clients/rds/rdsib_buf.c
+++ b/usr/src/uts/common/io/ib/clients/rds/rdsib_buf.c
@@ -369,7 +369,7 @@ rds_free_send_pool(rds_ep_t *ep)
 			}
 
 			kmem_free((void *)ep->ep_ack_addr, sizeof (uintptr_t));
-			ep->ep_ack_addr = NULL;
+			ep->ep_ack_addr = (uintptr_t)NULL;
 		}
 	}
 
@@ -392,7 +392,7 @@ rds_init_send_pool(rds_ep_t *ep, ib_guid_t hca_guid)
 	ibt_mr_desc_t   mem_desc;
 	uint8_t		*memp;
 	rds_buf_t	*bufmemp;
-	uintptr_t	ack_addr = NULL;
+	uintptr_t	ack_addr = (uintptr_t)NULL;
 	uint_t		memsize;
 	uint_t		nbuf;
 	rds_bufpool_t   *spool;
@@ -483,7 +483,7 @@ rds_init_send_pool(rds_ep_t *ep, ib_guid_t hca_guid)
 		    "failed: %d", ep, ret);
 		kmem_free(memp, memsize);
 		kmem_free(bufmemp, nbuf * sizeof (rds_buf_t));
-		if (ack_addr != NULL)
+		if (ack_addr != (uintptr_t)NULL)
 			kmem_free((void *)ack_addr, sizeof (uintptr_t));
 		return (-1);
 	}
@@ -588,7 +588,7 @@ rds_reinit_send_pool(rds_ep_t *ep, ib_guid_t hca_guid)
 			ep->ep_ack_rkey = 0;
 		}
 
-		ep->ep_hca_guid = NULL;
+		ep->ep_hca_guid = 0;
 	}
 
 	/* get the hcap for the new HCA */
diff --git a/usr/src/uts/common/io/ib/clients/rds/rdsib_ep.c b/usr/src/uts/common/io/ib/clients/rds/rdsib_ep.c
index c4a8ef9639..8221f3d363 100644
--- a/usr/src/uts/common/io/ib/clients/rds/rdsib_ep.c
+++ b/usr/src/uts/common/io/ib/clients/rds/rdsib_ep.c
@@ -399,8 +399,8 @@ rds_ep_init(rds_ep_t *ep, ib_guid_t hca_guid)
 	mutex_enter(&ep->ep_lock);
 	ep->ep_state = RDS_EP_STATE_UNCONNECTED;
 	ep->ep_hca_guid = hca_guid;
-	ep->ep_lbufid = NULL;
-	ep->ep_rbufid = NULL;
+	ep->ep_lbufid = 0;
+	ep->ep_rbufid = 0;
 	ep->ep_segfbp = NULL;
 	ep->ep_seglbp = NULL;
 
@@ -411,7 +411,7 @@ rds_ep_init(rds_ep_t *ep, ib_guid_t hca_guid)
 	ep->ep_ackwr.wr_opcode = IBT_WRC_RDMAW;
 	ep->ep_ackwr.wr_nds = 1;
 	ep->ep_ackwr.wr_sgl = &ep->ep_ackds;
-	ep->ep_ackwr.wr.rc.rcwr.rdma.rdma_raddr = NULL;
+	ep->ep_ackwr.wr.rc.rcwr.rdma.rdma_raddr = 0;
 	ep->ep_ackwr.wr.rc.rcwr.rdma.rdma_rkey = 0;
 	mutex_exit(&ep->ep_lock);
 
@@ -532,7 +532,7 @@ rds_session_reinit(rds_session_t *sp, ib_gid_t lgid)
 	rds_unmark_all_ports(sp, RDS_REMOTE);
 
 	/* This should not happen but just a safe guard */
-	if (sp->session_dataep.ep_ack_addr == NULL) {
+	if (sp->session_dataep.ep_ack_addr == 0) {
 		RDS_DPRINTF2("rds_session_reinit",
 		    "ERROR: Unexpected: SP(0x%p) - state: %d",
 		    sp, sp->session_state);
@@ -1761,7 +1761,7 @@ rds_resend_messages(void *arg)
 
 	ASSERT(spool->pool_nfree == spool->pool_nbuffers);
 
-	if (ep->ep_lbufid == NULL) {
+	if (ep->ep_lbufid == 0) {
 		RDS_DPRINTF2("rds_resend_messages",
 		    "SP(%p) Remote session is cleaned up ", sp);
 		/*
diff --git a/usr/src/uts/common/io/kb8042/kb8042.c b/usr/src/uts/common/io/kb8042/kb8042.c
index 0b1480bf1f..2a599fdc8f 100644
--- a/usr/src/uts/common/io/kb8042/kb8042.c
+++ b/usr/src/uts/common/io/kb8042/kb8042.c
@@ -20,7 +20,7 @@
  */
 /*	Copyright (c) 1990, 1991 UNIX System Laboratories, Inc.	*/
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989, 1990 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
@@ -140,6 +140,7 @@ static void kb8042_process_key(struct kb8042 *, kbtrans_key_t, enum keystate);
 static int kb8042_polled_ischar(cons_polledio_arg_t arg);
 static int kb8042_polled_getchar(cons_polledio_arg_t arg);
 static void kb8042_cleanup(struct kb8042 *kb8042);
+static void kb8042_received_byte(struct kb8042 *, int);
 
 static struct kbtrans_callbacks kb8042_callbacks = {
 	kb8042_streams_setled,
@@ -156,7 +157,8 @@ static	char	module_name[] = "kb8042";
 static int kb8042_open(queue_t *qp, dev_t *devp, int flag, int sflag,
 			cred_t *credp);
 static int kb8042_close(queue_t *qp, int flag, cred_t *credp);
-static int kb8042_wsrv();
+static int kb8042_rsrv(queue_t *);
+static int kb8042_wsrv(queue_t *);
 
 struct module_info kb8042_sinfo = {
 	.mi_idnum = 42,			/* Module ID */
@@ -169,7 +171,7 @@ struct module_info kb8042_sinfo = {
 
 static struct qinit kb8042_rinit = {
 	.qi_putp = NULL,
-	.qi_srvp = NULL,
+	.qi_srvp = kb8042_rsrv,
 	.qi_qopen = kb8042_open,
 	.qi_qclose = kb8042_close,
 	.qi_qadmin = NULL,
@@ -208,7 +210,7 @@ static int kb8042_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg,
 static int kb8042_attach(dev_info_t *, ddi_attach_cmd_t);
 static int kb8042_detach(dev_info_t *, ddi_detach_cmd_t);
 
-static 	struct cb_ops cb_kb8042_ops = {
+static struct cb_ops cb_kb8042_ops = {
 	.cb_open = nulldev,
 	.cb_close = nulldev,
 	.cb_strategy = nodev,
@@ -807,6 +809,22 @@ kb8042_close(queue_t *qp, int flag, cred_t *credp)
 }
 
 static int
+kb8042_rsrv(queue_t *qp)
+{
+	mblk_t *mp;
+	struct kb8042 *kb8042;
+
+	while ((mp = getq(qp)) != NULL) {
+		if (mp->b_datap->db_type == M_DATA) {
+			kb8042 = (struct kb8042 *)qp->q_ptr;
+			kb8042_received_byte(kb8042, *mp->b_rptr);
+		}
+		freemsg(mp);
+	}
+	return (0);
+}
+
+static int
 kb8042_wsrv(queue_t *qp)
 {
 	struct kb8042 *kb8042;
@@ -1040,24 +1058,6 @@ kb8042_received_byte(
 	enum keystate	state;
 	boolean_t	synthetic_release_needed;
 
-	/*
-	 * Intercept ACK and RESEND and signal the condition that
-	 * kb8042_send_and_wait is waiting for.
-	 */
-	if (scancode == KB_ACK) {
-		mutex_enter(&kb8042->w_hw_mutex);
-		kb8042->acked = 1;
-		cv_signal(&kb8042->cmd_cv);
-		mutex_exit(&kb8042->w_hw_mutex);
-		return;
-	} else if (scancode == KB_RESEND) {
-		mutex_enter(&kb8042->w_hw_mutex);
-		kb8042->need_retry = 1;
-		cv_signal(&kb8042->cmd_cv);
-		mutex_exit(&kb8042->w_hw_mutex);
-		return;
-	}
-
 	if (!kb8042->w_init)	/* can't do anything anyway */
 		return;
 
@@ -1164,12 +1164,39 @@ kb8042_intr(caddr_t arg)
 
 	while (ddi_get8(kb8042->handle, kb8042->addr + I8042_INT_INPUT_AVAIL)
 	    != 0) {
+		mblk_t *mp;
+
 		rc = DDI_INTR_CLAIMED;
 
 		scancode = ddi_get8(kb8042->handle,
 		    kb8042->addr + I8042_INT_INPUT_DATA);
 
-		kb8042_received_byte(kb8042, scancode);
+		/*
+		 * Intercept ACK and RESEND and signal the condition that
+		 * kb8042_send_and_wait is waiting for.
+		 */
+		switch (scancode) {
+		case KB_ACK:
+			mutex_enter(&kb8042->w_hw_mutex);
+			kb8042->acked = 1;
+			cv_signal(&kb8042->cmd_cv);
+			mutex_exit(&kb8042->w_hw_mutex);
+			return (rc);
+		case KB_RESEND:
+			mutex_enter(&kb8042->w_hw_mutex);
+			kb8042->need_retry = 1;
+			cv_signal(&kb8042->cmd_cv);
+			mutex_exit(&kb8042->w_hw_mutex);
+			return (rc);
+		default:
+			break;
+		}
+
+		if ((mp = allocb(sizeof (scancode), BPRI_HI)) == NULL)
+			return (rc);
+		*mp->b_wptr++ = scancode;
+		if (putq(RD(kb8042->w_qp), mp) == 0)
+			freemsg(mp);
 	}
 
 	return (rc);
diff --git a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
index 6257ec100e..1ce34ed9a4 100644
--- a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
+++ b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
@@ -355,7 +355,7 @@ _info(struct modinfo *modinfop)
 /*ARGSUSED*/
 static int
 usbvc_info(dev_info_t *dip, ddi_info_cmd_t infocmd,
-			void *arg, void **result)
+    void *arg, void **result)
 {
 	usbvc_state_t	*usbvcp;
 	int error = DDI_FAILURE;
@@ -808,7 +808,7 @@ usbvc_read(dev_t dev, struct uio *uio_p, cred_t *cred_p)
 
 	/* start polling if it is not started yet */
 	if (strm_if->start_polling != 1) {
-		if (usbvc_start_isoc_polling(usbvcp, strm_if, NULL) !=
+		if (usbvc_start_isoc_polling(usbvcp, strm_if, 0) !=
 		    USB_SUCCESS) {
 			USB_DPRINTF_L2(PRINT_MASK_READ,
 			    usbvcp->usbvc_log_handle,
@@ -964,7 +964,7 @@ usbvc_minphys(struct buf *bp)
 /*ARGSUSED*/
 static int
 usbvc_ioctl(dev_t dev, int cmd, intptr_t arg,
-		int mode, cred_t *cred_p, int *rval_p)
+    int mode, cred_t *cred_p, int *rval_p)
 {
 	int		rv = 0;
 	usbvc_state_t	*usbvcp =
@@ -1011,7 +1011,7 @@ usbvc_ioctl(dev_t dev, int cmd, intptr_t arg,
 /* Entry for mmap system call */
 static int
 usbvc_devmap(dev_t dev, devmap_cookie_t handle, offset_t off,
-	size_t len, size_t *maplen, uint_t model)
+    size_t len, size_t *maplen, uint_t model)
 {
 	usbvc_state_t		*usbvcp;
 	int			error, i;
@@ -2384,7 +2384,7 @@ usbvc_parse_stream_ifs(usbvc_state_t *usbvcp)
  */
 static void
 usbvc_parse_color_still(usbvc_state_t *usbvcp, usbvc_format_group_t *fmtgrp,
-	usb_cvs_data_t *cvs_data, uint_t cvs_num, uint_t altif_n_cvs)
+    usb_cvs_data_t *cvs_data, uint_t cvs_num, uint_t altif_n_cvs)
 {
 	uint8_t		frame_cnt;
 	uint_t		last_frame, i;
@@ -2469,7 +2469,7 @@ usbvc_parse_color_still(usbvc_state_t *usbvcp, usbvc_format_group_t *fmtgrp,
  */
 static void
 usbvc_parse_frames(usbvc_state_t *usbvcp, usbvc_format_group_t *fmtgrp,
-	usb_cvs_data_t *cvs_data, uint_t cvs_num, uint_t altif_n_cvs)
+    usb_cvs_data_t *cvs_data, uint_t cvs_num, uint_t altif_n_cvs)
 {
 	uint_t		last_frame;
 	usbvc_frames_t	*frm;
@@ -2558,7 +2558,7 @@ usbvc_parse_frames(usbvc_state_t *usbvcp, usbvc_format_group_t *fmtgrp,
 /* Parse one of the format groups in a stream interface */
 static int
 usbvc_parse_format_group(usbvc_state_t *usbvcp, usbvc_format_group_t *fmtgrp,
-	usb_cvs_data_t *cvs_data, uint_t cvs_num, uint_t altif_n_cvs)
+    usb_cvs_data_t *cvs_data, uint_t cvs_num, uint_t altif_n_cvs)
 {
 	usbvc_format_descr_t *fmt;
 
@@ -2919,7 +2919,7 @@ usbvc_free_read_bufs(usbvc_state_t *usbvcp, usbvc_stream_if_t *strm_if)
  */
 int
 usbvc_alloc_map_bufs(usbvc_state_t *usbvcp, usbvc_stream_if_t *strm_if,
-	int buf_cnt, int buf_len)
+    int buf_cnt, int buf_len)
 {
 	int		i = 0;
 	usbvc_buf_t	*bufs;
@@ -3401,7 +3401,7 @@ usbvc_set_alt(usbvc_state_t *usbvcp, usbvc_stream_if_t *strm_if)
  */
 static int
 usbvc_decode_stream_header(usbvc_state_t *usbvcp, usbvc_buf_grp_t *bufgrp,
-	mblk_t *data, int actual_len)
+    mblk_t *data, int actual_len)
 {
 	uint32_t len, buf_left, data_len;
 	usbvc_stream_if_t *strm_if;
@@ -3631,7 +3631,7 @@ usbvc_vc_get_ctrl(usbvc_state_t *usbvcp, uint8_t req_code, uint8_t entity_id,
 /* Send req to video control interface to get ctrl */
 int
 usbvc_vc_set_ctrl(usbvc_state_t *usbvcp, uint8_t req_code,  uint8_t entity_id,
-	uint16_t cs, uint16_t wlength, mblk_t *data)
+    uint16_t cs, uint16_t wlength, mblk_t *data)
 {
 	usb_cb_flags_t	cb_flags;
 	usb_cr_t	cr;
@@ -3660,7 +3660,7 @@ usbvc_vc_set_ctrl(usbvc_state_t *usbvcp, uint8_t req_code,  uint8_t entity_id,
 /* Set probe or commit ctrl for video stream interface */
 int
 usbvc_vs_set_probe_commit(usbvc_state_t *usbvcp, usbvc_stream_if_t *strm_if,
-	usbvc_vs_probe_commit_t *ctrl_pc, uchar_t cs)
+    usbvc_vs_probe_commit_t *ctrl_pc, uchar_t cs)
 {
 	mblk_t *data;
 	usb_cb_flags_t	cb_flags;
@@ -3717,7 +3717,7 @@ usbvc_vs_set_probe_commit(usbvc_state_t *usbvcp, usbvc_stream_if_t *strm_if,
 /* Get probe ctrl for vodeo stream interface */
 int
 usbvc_vs_get_probe(usbvc_state_t *usbvcp, usbvc_stream_if_t *strm_if,
-	usbvc_vs_probe_commit_t *ctrl_pc, uchar_t bRequest)
+    usbvc_vs_probe_commit_t *ctrl_pc, uchar_t bRequest)
 {
 	mblk_t *data = NULL;
 	usb_cb_flags_t	cb_flags;