diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-15 13:04:31 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-15 13:04:31 +0000 |
| commit | 7a34fde236609b18147eb73e6a163e19162d96e2 (patch) | |
| tree | 11d647767f5036bbcccee110ad13891ed603a972 /usr/src/uts/intel/io | |
| parent | 0de99a4637b946f1cd1c7d9fb5949112e1afb82f (diff) | |
| parent | c653bb4713ca694c2d16b04b65d5b76c0bb46bd4 (diff) | |
| download | illumos-joyent-7a34fde236609b18147eb73e6a163e19162d96e2.tar.gz | |
[illumos-gate merge]
commit c653bb4713ca694c2d16b04b65d5b76c0bb46bd4
10197 build smatch in parallel
commit 15c07adc1c7b828006b5e3c4d528b92229d6bd23
10081 smatch indenting fixes for usr/src/uts
commit 5661bb7641e85c46713da7a3002b29ecd2c3daf0
10080 smatch Makefile changes for usr/src/cmd
commit 05ede3db5e3b7d540afbccdc872c735770e82ef3
10079 smatch Makefile changes for usr/src/lib
commit cadd68ea0014761eda6a293664086dfa80686d85
10078 smatch fixes for UCB
commit 1ea94c756c0bc9170021d7b570944a24f224c03f
10202 loader: use screen-#rows to find bottom left co-ordinates
commit 08487eea68a2fa501b5042131c6db068089f82e1
10173 loader: support newer ZFS versions
Conflicts:
usr/src/lib/libdladm/Makefile.com
usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
Diffstat (limited to 'usr/src/uts/intel/io')
| -rw-r--r-- | usr/src/uts/intel/io/dktp/disk/cmdk.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/drm/radeon_state.c | 16 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c | 8 |
3 files changed, 20 insertions, 10 deletions
diff --git a/usr/src/uts/intel/io/dktp/disk/cmdk.c b/usr/src/uts/intel/io/dktp/disk/cmdk.c index a3989f5746..628b0a60af 100644 --- a/usr/src/uts/intel/io/dktp/disk/cmdk.c +++ b/usr/src/uts/intel/io/dktp/disk/cmdk.c @@ -23,6 +23,10 @@ * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/scsi/scsi.h> #include <sys/dktp/cm.h> #include <sys/dktp/quetypes.h> @@ -826,7 +830,7 @@ rwcmd_copyout(struct dadkio_rwcmd *rwcmdp, caddr_t outaddr, int flag) case DDI_MODEL_NONE: { if (ddi_copyout(rwcmdp, outaddr, sizeof (struct dadkio_rwcmd), flag)) - return (EFAULT); + return (EFAULT); } } return (0); diff --git a/usr/src/uts/intel/io/drm/radeon_state.c b/usr/src/uts/intel/io/drm/radeon_state.c index 9323215254..2afd9ebf95 100644 --- a/usr/src/uts/intel/io/drm/radeon_state.c +++ b/usr/src/uts/intel/io/drm/radeon_state.c @@ -3,6 +3,10 @@ * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + /* radeon_state.c -- State support for Radeon -*- linux-c -*- */ /* * Copyright 2000 VA Linux Systems, Inc., Fremont, California. @@ -32,8 +36,6 @@ * Kevin E. Martin <martin@valinux.com> */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "drmP.h" #include "drm.h" #include "drm_sarea.h" @@ -2244,7 +2246,7 @@ static int radeon_cp_clear(DRM_IOCTL_ARGS) if (DRM_COPY_FROM_USER(&depth_boxes, clear.depth_boxes, sarea_priv->nbox * sizeof (depth_boxes[0]))) - return (EFAULT); + return (EFAULT); radeon_cp_dispatch_clear(dev, &clear, depth_boxes); @@ -2924,10 +2926,10 @@ radeon_emit_veclinear(drm_radeon_private_t *dev_priv, int start = header.veclinear.addr_lo | (header.veclinear.addr_hi << 8); RING_LOCALS; - if (!sz) - return (0); - if (sz * 4 > cmdbuf->bufsz) - return (EINVAL); + if (!sz) + return (0); + if (sz * 4 > cmdbuf->bufsz) + return (EINVAL); BEGIN_RING(5 + sz); OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0); diff --git a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c index c5b79857c3..281bbf410b 100644 --- a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c +++ b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c @@ -24,6 +24,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/time.h> #include <sys/nvpair.h> @@ -82,8 +86,8 @@ inhm_mc_snapshot_destroy() continue; kmem_free(inhm_mc_snapshot[i], inhm_mc_snapshotsz[i]); - inhm_mc_snapshot[i] = NULL; - inhm_mc_snapshotsz[i] = 0; + inhm_mc_snapshot[i] = NULL; + inhm_mc_snapshotsz[i] = 0; } inhm_mc_snapshotgen++; } |