diff options
| author | Peter Tribble <peter.tribble@gmail.com> | 2019-01-17 18:12:06 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2019-01-20 23:46:47 +0000 |
| commit | 730a650a8706d6e53fbb34bcaa857f3db68b1000 (patch) | |
| tree | 025d163b4a162d8b2a09ce119bd15868ad61c73d /usr/src/uts/sun4u | |
| parent | fec628e60aec45b40824841a8b7246141504d1cc (diff) | |
| download | illumos-joyent-730a650a8706d6e53fbb34bcaa857f3db68b1000.tar.gz | |
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>
Diffstat (limited to 'usr/src/uts/sun4u')
| -rw-r--r-- | usr/src/uts/sun4u/montecarlo/io/scsb.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/starcat/io/dman.c | 5 |
2 files changed, 6 insertions, 4 deletions
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; |