[illumos-gate merge]

commit 739415d128746863863f9005c1923d9f5dd397e4
    8916 man pages should refer to our own Dynamic Tracing Guide
    8915 remove reference to kgmon in lockstat(1m)
commit 435a78cc932ae710cfa076091a136712cf13ccf2
    8885 64-bit libbsm:adt_do_ipv[46]_address creates non-compressible at_port.
commit f6969e9b236c140638ae16b1d5c8dff401e31465
    8848 hbaapi: variable set but not used
commit 4c307623be8d9c2d69ed7e8622a1ab0a6348d0dd
    8843 libnls: variable 'version' set but not used
commit 19700af4088d99a0f173873dcdfcf51fdb90335b
    8830 libshell: variable set but not used
commit 1d6eba5f15dcb03614b687ec6ddaa6477b7baa41
    8823 print: variable 'error' set but not used
commit a1a46df055863a267eb7a80b7961c9379bc457ec
    8822 libsmbfs: variable set but not used
commit 8f33f62fe3b6ef9b5f9a849a5d2081f34e048be2
    8819 x86 unix: variable set but not used
commit ea6a05275c5cbe13e3a79eb7efb3a0a097613149
    8813 rdsv3: variable 'timeo' set but not used
commit 8b9a0f1ef5cee53073074965f0ea1d015d66926f
    8812 xge: variable set but not used
commit a3907569cb648b92b09b4854131a106aafecab36
    8911 loader: move ficl outb and inb into libi386

2 files changed, 6 insertions, 49 deletions

diff --git a/usr/src/common/ficl/loader.c b/usr/src/common/ficl/loader.c
index be642c3b46..d581015c5c 100644
--- a/usr/src/common/ficl/loader.c
+++ b/usr/src/common/ficl/loader.c
@@ -43,9 +43,6 @@
 #include <termios.h>
 #else
 #include <stand.h>
-#ifdef __i386__
-#include <machine/cpufunc.h>
-#endif
 #include "bootstrap.h"
 #endif
 #ifdef _STANDALONE
@@ -852,42 +849,6 @@ fkey(ficlVm *pVM)
 	ficlStackPushInteger(ficlVmGetDataStack(pVM), i > 0 ? ch : -1);
 }
 
-
-#ifdef _STANDALONE
-#ifdef __i386__
-
-/*
- * outb ( port# c -- )
- * Store a byte to I/O port number port#
- */
-void
-ficlOutb(ficlVm *pVM)
-{
-	uint8_t c;
-	uint32_t port;
-
-	port = ficlStackPopUnsigned(ficlVmGetDataStack(pVM));
-	c = ficlStackPopInteger(ficlVmGetDataStack(pVM));
-	outb(port, c);
-}
-
-/*
- * inb ( port# -- c )
- * Fetch a byte from I/O port number port#
- */
-void
-ficlInb(ficlVm *pVM)
-{
-	uint8_t c;
-	uint32_t port;
-
-	port = ficlStackPopUnsigned(ficlVmGetDataStack(pVM));
-	c = inb(port);
-	ficlStackPushInteger(ficlVmGetDataStack(pVM), c);
-}
-#endif
-#endif
-
 /*
  * Retrieves free space remaining on the dictionary
  */
@@ -954,10 +915,6 @@ ficlSystemCompilePlatform(ficlSystem *pSys)
 	ficlDictionarySetPrimitive(dp, "uuid-to-string", ficlUuidToString,
 	    FICL_WORD_DEFAULT);
 #ifdef _STANDALONE
-#ifdef __i386__
-	ficlDictionarySetPrimitive(dp, "outb", ficlOutb, FICL_WORD_DEFAULT);
-	ficlDictionarySetPrimitive(dp, "inb", ficlInb, FICL_WORD_DEFAULT);
-#endif
 	/* Register words from linker set. */
 	SET_FOREACH(fnpp, Xficl_compile_set)
 		(*fnpp)(pSys);
diff --git a/usr/src/common/smbclnt/smbfs_ntacl.c b/usr/src/common/smbclnt/smbfs_ntacl.c
index 6780d891ee..dcc0d55e79 100644
--- a/usr/src/common/smbclnt/smbfs_ntacl.c
+++ b/usr/src/common/smbclnt/smbfs_ntacl.c
@@ -66,16 +66,16 @@
 #define	FREESZ(p, sz) kmem_free(p, sz)
 #else	/* _KERNEL */
 #define	MALLOC(size) malloc(size)
-#ifndef lint
-#define	FREESZ(p, sz) free(p)
-#else	/* lint */
+/*
+ * Define FREESZ() as inline function so the compiler will not
+ * trigger variable set but not used warning for sz in calling function.
+ */
 /* ARGSUSED */
-static void
-FREESZ(void *p, size_t sz)
+static inline void
+FREESZ(void *p, size_t sz __unused)
 {
 	free(p);
 }
-#endif	/* lint */
 #endif	/* _KERNEL */
 
 #define	ERRCHK(expr)	if ((error = expr) != 0) goto errout