[illumos-gate merge]

commit 3698b9760f5a9315a5040e7606f7db7aaa3e1ffb
    5954 ffs(3c) manpage is a little confusing
commit 58865bb7f764a6ca11f3057bee77153724ebb239
    5955 pat_sync is clever enough to check for X86FSET_PAT
commit cdf815bb84cfaf9b71a4c5a51616e2da60c68bfc
    5852 remove SFW* from the gate's Makefiles
commit bb2183e0683124f79bf4b91cf4d48201e752109e
    5947 NULL is not a character in asm10k.c

6 files changed, 9 insertions, 17 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index be2dc4f91e..4fd684546c 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -115,11 +115,6 @@ ONBLD_TOOLS=		$(BUILD_TOOLS)/onbld
 
 JAVA_ROOT=	/usr/java
 
-SFW_ROOT=	/usr/sfw
-SFWINCDIR=	$(SFW_ROOT)/include
-SFWLIBDIR=	$(SFW_ROOT)/lib
-SFWLIBDIR64=	$(SFW_ROOT)/lib/$(MACH64)
-
 GCC_ROOT=	/opt/gcc/4.4.4
 GCCLIBDIR=	$(GCC_ROOT)/lib
 GCCLIBDIR64=	$(GCC_ROOT)/lib/$(MACH64)
@@ -154,7 +149,7 @@ ELFDUMP=	/usr/ccs/bin/elfdump
 M4=		/usr/ccs/bin/m4
 STRIP=		/usr/ccs/bin/strip
 LEX=		/usr/ccs/bin/lex
-FLEX=		$(SFW_ROOT)/bin/flex
+FLEX=		/usr/bin/flex
 YACC=		/usr/ccs/bin/yacc
 CPP=		/usr/lib/cpp
 JAVAC=		$(JAVA_ROOT)/bin/javac
@@ -772,7 +767,7 @@ NATIVE_MACH=	$(MACH:amd64=i386)
 #
 SPRO_ROOT=		$(BUILD_TOOLS)/SUNWspro
 SPRO_VROOT=		$(SPRO_ROOT)/SS12
-GNU_ROOT=		$(SFW_ROOT)
+GNU_ROOT=		/usr
 
 # Till SS12u1 formally becomes the NV CBE, LINT is hard
 # coded to be picked up from the $SPRO_ROOT/sunstudio12.1/
diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64
index c512cfc004..704a0411a4 100644
--- a/usr/src/Makefile.master.64
+++ b/usr/src/Makefile.master.64
@@ -50,9 +50,8 @@ LDLIBS.cmd =	$(LDLIBS64)
 LDLIBS.lib =	$(LDLIBS64)
 
 #
-# Override Makefile.master's settings of SFWLIBDIR and GCCLIBDIR
+# Override Makefile.master's settings of GCCLIBDIR
 #
-SFWLIBDIR=	$(SFWLIBDIR64)
 GCCLIBDIR=	$(GCCLIBDIR64)
 
 #
diff --git a/usr/src/man/man3c/ffs.3c b/usr/src/man/man3c/ffs.3c
index 62c6a3d247..af461d1ee7 100644
--- a/usr/src/man/man3c/ffs.3c
+++ b/usr/src/man/man3c/ffs.3c
@@ -8,7 +8,7 @@
 .\" 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 FFS 3C "Jul 24, 2002"
+.TH FFS 3C "May 21, 2015"
 .SH NAME
 ffs \- find first set bit
 .SH SYNOPSIS
@@ -26,7 +26,7 @@ ffs \- find first set bit
 
 \fBint\fR \fBflsl\fR(\fBlong\fR \fIi\fR);
 
-\fBint\fR \fBflsl\fR(\fBlong long\fR \fIi\fR);
+\fBint\fR \fBflsll\fR(\fBlong long\fR \fIi\fR);
 .fi
 
 .SH DESCRIPTION
@@ -37,7 +37,7 @@ Bits are numbered starting at one (the least significant bit).
 .sp
 .LP
 The \fBfls()\fR, \fBflsl()\fR, and \fBflsll()\fR functions find the last bit set
-(beginning with the most significant bit) and return the index of that bit.
+(beginning with the least significant bit) and return the index of that bit.
 Bits are numbered starting at one (the least significant bit).
 .SH RETURN VALUES
 .LP
diff --git a/usr/src/uts/common/io/audio/drv/audioemu10k/dsp/asm10k.c b/usr/src/uts/common/io/audio/drv/audioemu10k/dsp/asm10k.c
index 0a4ef058a3..af0e0b1cf3 100644
--- a/usr/src/uts/common/io/audio/drv/audioemu10k/dsp/asm10k.c
+++ b/usr/src/uts/common/io/audio/drv/audioemu10k/dsp/asm10k.c
@@ -214,7 +214,7 @@ getaline(FILE *input, char **tokens)
 
 			/* strip off any C++ style comments that CPP missed */
 			if ((s = strstr(line, "//")) != NULL) {
-				*s = NULL;
+				*s = '\0';
 			}
 			stmt = strtok_r(line, ";\n", &lasts);
 		} else {
diff --git a/usr/src/uts/i86pc/os/cpr_impl.c b/usr/src/uts/i86pc/os/cpr_impl.c
index 25d899c63e..f173a1dc57 100644
--- a/usr/src/uts/i86pc/os/cpr_impl.c
+++ b/usr/src/uts/i86pc/os/cpr_impl.c
@@ -958,8 +958,7 @@ i_cpr_start_cpu(void)
 	 * We need to Sync PAT with cpu0's PAT. We have to do
 	 * this with interrupts disabled.
 	 */
-	if (is_x86_feature(x86_featureset, X86FSET_PAT))
-		pat_sync();
+	pat_sync();
 
 	/*
 	 * If we use XSAVE, we need to restore XFEATURE_ENABLE_MASK register.
diff --git a/usr/src/uts/i86pc/os/mp_startup.c b/usr/src/uts/i86pc/os/mp_startup.c
index 412c66f4d4..a068914259 100644
--- a/usr/src/uts/i86pc/os/mp_startup.c
+++ b/usr/src/uts/i86pc/os/mp_startup.c
@@ -1671,8 +1671,7 @@ mp_startup_common(boolean_t boot)
 	/*
 	 * Program this cpu's PAT
 	 */
-	if (is_x86_feature(x86_featureset, X86FSET_PAT))
-		pat_sync();
+	pat_sync();
 #endif
 
 	/*