10258 Not all the qinit changes were copied to sparc

Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Andy Fiddaman <af@citrus-it.net>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

5 files changed, 15 insertions, 10 deletions

diff --git a/usr/src/uts/sun/io/zs_async.c b/usr/src/uts/sun/io/zs_async.c
index 3275359089..6470434f6c 100644
--- a/usr/src/uts/sun/io/zs_async.c
+++ b/usr/src/uts/sun/io/zs_async.c
@@ -22,6 +22,7 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright (c) 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2019 Peter Tribble.
  */
 
 /*
@@ -443,7 +444,7 @@ int zsa_h_log_n[40];
 
 
 static int zsa_open(queue_t *rq, dev_t *dev, int flag, int sflag, cred_t *cr);
-static int zsa_close(queue_t *q, int flag);
+static int zsa_close(queue_t *q, int flag, cred_t *cr);
 static void zsa_wput(queue_t *q, mblk_t *mp);
 static void zsa_rsrv(queue_t *q);
 
@@ -963,7 +964,7 @@ zs_progress_check(void *arg)
 
 /*ARGSUSED*/
 static int
-zsa_close(queue_t *q, int flag)
+zsa_close(queue_t *q, int flag, cred_t *cr __unused)
 {
 	struct asyncline *za;
 	struct zscom *zs;
diff --git a/usr/src/uts/sun/io/zs_hdlc.c b/usr/src/uts/sun/io/zs_hdlc.c
index 229747ec03..5b9b1d45e2 100644
--- a/usr/src/uts/sun/io/zs_hdlc.c
+++ b/usr/src/uts/sun/io/zs_hdlc.c
@@ -22,6 +22,7 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright (c) 2011 Bayard G. Bell. All rights reserved.
+ * Copyright (c) 2019 Peter Tribble.
  */
 
 
@@ -158,7 +159,7 @@ static int  zsh_probe(dev_info_t *dev);
 static int  zsh_attach(dev_info_t *dev, ddi_attach_cmd_t cmd);
 static int  zsh_detach(dev_info_t *dev, ddi_detach_cmd_t cmd);
 static int  zsh_open(queue_t *rq, dev_t *dev, int flag, int sflag, cred_t *cr);
-static int  zsh_close(queue_t *rq, int flag);
+static int  zsh_close(queue_t *rq, int flag, cred_t *cr);
 static void zsh_wput(queue_t *wq, mblk_t *mp);
 static int zsh_start(struct zscom *zs, struct syncline *zss);
 static void zsh_ioctl(queue_t *wq, mblk_t *mp);
@@ -633,7 +634,7 @@ int zsh_tx_enable_in_close = 0;
 
 /*ARGSUSED*/
 static int
-zsh_close(queue_t *rq, int flag)
+zsh_close(queue_t *rq, int flag, cred_t *cr __unused)
 {
 	struct ser_str *stp;
 	struct zscom *zs;
diff --git a/usr/src/uts/sun4/io/su_driver.c b/usr/src/uts/sun4/io/su_driver.c
index b35126776e..bab12d1a9b 100644
--- a/usr/src/uts/sun4/io/su_driver.c
+++ b/usr/src/uts/sun4/io/su_driver.c
@@ -26,6 +26,7 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright (c) 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2019 Peter Tribble.
  */
 
 
@@ -200,7 +201,7 @@ int baudtable[] = {
 };
 
 static int asyopen(queue_t *rq, dev_t *dev, int flag, int sflag, cred_t *cr);
-static int asyclose(queue_t *q, int flag);
+static int asyclose(queue_t *q, int flag, cred_t *cr);
 static void asywput(queue_t *q, mblk_t *mp);
 static void asyrsrv(queue_t *q);
 
@@ -1107,7 +1108,7 @@ async_progress_check(void *arg)
  * Close routine.
  */
 static int
-asyclose(queue_t *q, int flag)
+asyclose(queue_t *q, int flag, cred_t *cr __unused)
 {
 	struct asyncline *async;
 	struct asycom	 *asy;
diff --git a/usr/src/uts/sun4u/montecarlo/io/scsb.c b/usr/src/uts/sun4u/montecarlo/io/scsb.c
index d530d549a1..75fd61d128 100644
--- a/usr/src/uts/sun4u/montecarlo/io/scsb.c
+++ b/usr/src/uts/sun4u/montecarlo/io/scsb.c
@@ -22,6 +22,7 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2019 Peter Tribble.
  */
 
 /*
@@ -110,7 +111,7 @@ static	char	*scsb_build_version = SCSB_BUILD_VERSION;
  * cb_ops section of scsb driver.
  */
 static	int	sm_open(queue_t *, dev_t *, int, int, cred_t *);
-static	int	sm_close(queue_t *, int, int, cred_t *);
+static	int	sm_close(queue_t *, int, cred_t *);
 
 static	int	sm_rput(queue_t *, mblk_t *);	/* from i2c below */
 static	int	sm_wput(queue_t *, mblk_t *);	/* from above */
@@ -1202,7 +1203,7 @@ sm_open(queue_t *q, dev_t *devp, int flag, int sflag, cred_t *credp)
 
 /*ARGSUSED*/
 static int
-sm_close(queue_t *q, int flag, int otyp, cred_t *credp)
+sm_close(queue_t *q, int flag, cred_t *credp)
 {
 	scsb_state_t	*scsb;
 	int		clone;
diff --git a/usr/src/uts/sun4u/starcat/io/dman.c b/usr/src/uts/sun4u/starcat/io/dman.c
index 2e6caa4ea7..ca01477ef1 100644
--- a/usr/src/uts/sun4u/starcat/io/dman.c
+++ b/usr/src/uts/sun4u/starcat/io/dman.c
@@ -23,6 +23,7 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright (c) 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2019 Peter Tribble.
  */
 
 
@@ -443,7 +444,7 @@ static int	man_deconfigure(void);
 static int	man_init_dests(man_t *, manstr_t *);
 static void	man_start_dest(man_dest_t *, manstr_t *, man_pg_t *);
 static void	man_set_optimized_dest(manstr_t *);
-static int	man_close(queue_t *);
+static int	man_close(queue_t *, int, cred_t *);
 static void	man_cancel_timers(man_adest_t *);
 static int	man_uwput(queue_t *, mblk_t *);
 static int	man_start(queue_t *, mblk_t *, eaddr_t *);
@@ -1426,7 +1427,7 @@ exit:
  *		- failure - errno value for failure
  */
 static int
-man_close(queue_t *rq)
+man_close(queue_t *rq, int flag __unused, cred_t *cr __unused)
 {
 	manstr_t		*close_msp;
 	manstr_t		*msp;