summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2014-07-18 19:48:34 +0000
committerriastradh <riastradh@NetBSD.org>2014-07-18 19:48:34 +0000
commitbb114fb43d8f7afdeebb1d4f9603dbfab4887754 (patch)
tree2821badda9d0e1a1cc6c64c2fbcb3861c38a2800 /sys
parent97cbbb0662d298f2bbf17fc0e157b4eb0b1c1cc4 (diff)
Fix formatting and locking errors.
Format time_t by casting to intmax_t and using PRIdMAX, since we have no PRIxyz for time_t. We already hold the irq lock on entry to i915_record_ring_state, so don't take it again.
Diffstat (limited to 'sys')
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c b/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
index 44522e1ef22..3b3bde4cbb5 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
@@ -334,7 +334,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
}
err_printf(m, "%s\n", error->error_msg);
- err_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
+ err_printf(m, "Time: %"PRIdMAX" s %ld us\n", (intmax_t)error->time.tv_sec,
(long)error->time.tv_usec);
#ifndef __NetBSD__ /* XXX kernel version */
err_printf(m, "Kernel: " UTS_RELEASE "\n");
@@ -809,10 +809,8 @@ static void i915_record_ring_state(struct drm_device *dev,
}
#ifdef __NetBSD__
- spin_lock(&dev_priv->irq_lock);
ering->waiting = DRM_SPIN_WAITERS_P(&ring->irq_queue,
&dev_priv->irq_lock);
- spin_unlock(&dev_priv->irq_lock);
#else
ering->waiting = waitqueue_active(&ring->irq_queue);
#endif