[illumos-gate merge]

commit 077efea49519c17f19d69473223f9664f3c94812
    11239 usr/src/lib/nsswitch/nis/common/switch_err.c is unused
commit 6bf877adf2723073f60a3b3716918191ca1309d1
    11225 There are no positrons
commit 37b221f0ca7d390480c67caa3db64384a2b81406
    11248 Panic in smb_ofile_free after 11016

4 files changed, 16 insertions, 127 deletions

diff --git a/usr/src/lib/nsswitch/nis/common/switch_err.c b/usr/src/lib/nsswitch/nis/common/switch_err.c
deleted file mode 100644
index 3290a06c44..0000000000
--- a/usr/src/lib/nsswitch/nis/common/switch_err.c
+++ /dev/null
@@ -1,72 +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
- */
-/*
- *	switch_err.c
- *
- *	Copyright (c) 1988-1992 Sun Microsystems Inc
- *	All Rights Reserved.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <rpcsvc/ypclnt.h>
-#include <nsswitch.h>
-
-/*
- * maps errors returned by libnsl/yp routines into switch errors
- */
-
-int
-switch_err(ypclnt_err)
-	int ypclnt_err;
-{
-	int serr;
-
-	switch (ypclnt_err) {
-	case 0:
-		serr = __NSW_SUCCESS;
-		break;
-	case YPERR_BADARGS:
-	case YPERR_KEY:
-	case YPERR_NOMORE:
-		serr = __NSW_NOTFOUND;
-		break;
-	case YPERR_RPC:
-	case YPERR_DOMAIN:
-	case YPERR_MAP:
-	case YPERR_YPERR:
-	case YPERR_RESRC:
-	case YPERR_PMAP:
-	case YPERR_YPBIND:
-	case YPERR_YPSERV:
-	case YPERR_NODOM:
-	case YPERR_BADDB:
-	case YPERR_VERS:
-	case YPERR_ACCESS:
-		serr = __NSW_UNAVAIL;
-		break;
-	case YPERR_BUSY:
-		serr = __NSW_TRYAGAIN; /* :-) */
-	}
-
-	return (serr);
-}
diff --git a/usr/src/uts/common/fs/smbsrv/smb_ofile.c b/usr/src/uts/common/fs/smbsrv/smb_ofile.c
index 046f550710..0142bf9164 100644
--- a/usr/src/uts/common/fs/smbsrv/smb_ofile.c
+++ b/usr/src/uts/common/fs/smbsrv/smb_ofile.c
@@ -1378,9 +1378,6 @@ smb_ofile_free(smb_ofile_t *of)
 
 	ASSERT(of->f_state == SMB_OFILE_STATE_ALLOC);
 
-	/* Make sure it's not in the persistid hash. */
-	ASSERT(of->f_persistid == 0);
-
 	if (tree != NULL) {
 		if (of->f_fid != 0)
 			smb_idpool_free(&tree->t_fid_pool, of->f_fid);
diff --git a/usr/src/uts/sun4/os/startup.c b/usr/src/uts/sun4/os/startup.c
index 6ebb07412f..c8752a16ac 100644
--- a/usr/src/uts/sun4/os/startup.c
+++ b/usr/src/uts/sun4/os/startup.c
@@ -23,6 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 by Delphix. All rights reserved.
  * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Peter Tribble.
  */
 
 #include <sys/machsystm.h>
@@ -276,10 +277,8 @@ uint_t hblk1_min = H1MIN;
 
 
 /*
- * Hooks for unsupported platforms and down-rev firmware
+ * Hook for down-rev firmware
  */
-int iam_positron(void);
-#pragma weak iam_positron
 static void do_prom_version_check(void);
 
 /*
@@ -613,7 +612,7 @@ uint64_t sync_tt;
 void
 sync_handler(void)
 {
-	struct  panic_trap_info 	ti;
+	struct  panic_trap_info	ti;
 	int i;
 
 	/*
@@ -685,7 +684,7 @@ startup_init(void)
 	 * 20 == num of %p substrings
 	 * 16 == max num of chars %p will expand to.
 	 */
-	char 		bp[sizeof (sync_str) + 16 * 20];
+	char		bp[sizeof (sync_str) + 16 * 20];
 
 	/*
 	 * Initialize ptl1 stack for the 1st CPU.
@@ -868,7 +867,7 @@ static size_t boot_physinstalled_len, boot_physavail_len, boot_virtavail_len;
  *
  * pseudo code:
  * if (context != 0) {
- * 	return false
+ *	return false
  * } else if (miss_va in range[kmem64_base, kmem64_end)) {
  *	tte = tte_template +
  *		(((miss_va & pagemask) - kmem64_base));
@@ -977,8 +976,8 @@ startup_memlist(void)
 	 * We're loaded by boot with the following configuration (as
 	 * specified in the sun4u/conf/Mapfile):
 	 *
-	 * 	text:		4 MB chunk aligned on a 4MB boundary
-	 * 	data & bss:	4 MB chunk aligned on a 4MB boundary
+	 *	text:		4 MB chunk aligned on a 4MB boundary
+	 *	data & bss:	4 MB chunk aligned on a 4MB boundary
 	 *
 	 * These two chunks will eventually be mapped by 2 locked 4MB
 	 * ttes and will represent the nucleus of the kernel.  This gives
@@ -1519,22 +1518,6 @@ startup_modules(void)
 	mod_setup();
 
 	/*
-	 * If this is a positron, complain and halt.
-	 */
-	if (&iam_positron && iam_positron()) {
-		cmn_err(CE_WARN, "This hardware platform is not supported"
-		    " by this release of Solaris.\n");
-#ifdef DEBUG
-		prom_enter_mon();	/* Type 'go' to resume */
-		cmn_err(CE_WARN, "Booting an unsupported platform.\n");
-		cmn_err(CE_WARN, "Booting with down-rev firmware.\n");
-
-#else /* DEBUG */
-		halt(0);
-#endif /* DEBUG */
-	}
-
-	/*
 	 * If we are running firmware that isn't 64-bit ready
 	 * then complain and halt.
 	 */
@@ -2906,19 +2889,19 @@ char obp_tte_str[] =
 	"      dup HMEBLK_ENDPA <> if     ( sfmmup hmeblkp ) ( r: hblktag ) "
 	"         dup hmeblk_tag + phys-x@ r@ = if ( sfmmup hmeblkp )	  "
 	"	     dup hmeblk_tag + 8 + phys-x@ 2 pick = if		  "
-	"		  true 	( sfmmup hmeblkp true ) ( r: hblktag )	  "
+	"		  true	( sfmmup hmeblkp true ) ( r: hblktag )	  "
 	"	     else						  "
-	"	     	  hmeblk_next + phys-x@ false 			  "
+	"		  hmeblk_next + phys-x@ false			  "
 	"			( sfmmup hmeblkp false ) ( r: hblktag )   "
-	"	     then  						  "
+	"	     then						  "
 	"	  else							  "
-	"	     hmeblk_next + phys-x@ false 			  "
+	"	     hmeblk_next + phys-x@ false			  "
 	"			( sfmmup hmeblkp false ) ( r: hblktag )   "
-	"	  then 							  "
+	"	  then							  "
 	"      else							  "
-	"         drop 0 true 						  "
-	"      then  							  "
-	"   until r> drop 						  "
+	"         drop 0 true						  "
+	"      then							  "
+	"   until r> drop						  "
 	"; "
 
 	": HME_HASH_TAG ( sfmmup rehash addr -- hblktag ) "
diff --git a/usr/src/uts/sun4u/os/mach_startup.c b/usr/src/uts/sun4u/os/mach_startup.c
index 8a407607c3..47a8ca1355 100644
--- a/usr/src/uts/sun4u/os/mach_startup.c
+++ b/usr/src/uts/sun4u/os/mach_startup.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2019 Peter Tribble.
  */
 
 #include <sys/machsystm.h>
@@ -495,26 +496,6 @@ load_mach_drivers(void)
 }
 
 /*
- * Return true if the machine we're running on is a Positron.
- * (Positron is an unsupported developers platform.)
- */
-int
-iam_positron(void)
-{
-	char model[32];
-	const char proto_model[] = "SUNW,501-2732";
-	pnode_t root = prom_rootnode();
-
-	if (prom_getproplen(root, "model") != sizeof (proto_model))
-		return (0);
-
-	(void) prom_getprop(root, "model", model);
-	if (strcmp(model, proto_model) == 0)
-		return (1);
-	return (0);
-}
-
-/*
  * Find a physically contiguous area of twice the largest ecache size
  * to be used while doing displacement flush of ecaches.
  */