Module Name: src
Committed By: riastradh
Date: Sat Feb 28 05:37:10 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_i2c.c
Log Message:
This one is uninterruptible upstream too.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.8 Sat Feb 28 04:54:12 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c Sat Feb 28 05:37:10 2015
@@ -350,7 +350,7 @@ gmbus_wait_idle(struct drm_i915_private
#ifdef __NetBSD__
spin_lock(&dev_priv->gmbus_wait_lock);
- DRM_SPIN_TIMED_WAIT_UNTIL(ret, &dev_priv->gmbus_wait_queue,
+ DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, &dev_priv->gmbus_wait_queue,
&dev_priv->gmbus_wait_lock, msecs_to_jiffies_timeout(10),
C);
spin_unlock(&dev_priv->gmbus_wait_lock);
