diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-12-10 15:53:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-12-10 15:53:59 +1000 |
| commit | 814f695135f21aadeba77a3114df505d81a8d433 (patch) | |
| tree | 277da7e1c5dce9318591158435d2e367f3e495d3 /bsd-core/drm_lock.c | |
| parent | e51b3c8ff4bb88bc0f57473b7c3fe7fcd6b1a916 (diff) | |
| parent | cfa21b22b43c7113107b5eb086b5f4d4ec36dc0a (diff) | |
Merge branch 'master' into r500-support
Diffstat (limited to 'bsd-core/drm_lock.c')
| -rw-r--r-- | bsd-core/drm_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c index fb86fc68..9731ff92 100644 --- a/bsd-core/drm_lock.c +++ b/bsd-core/drm_lock.c @@ -140,7 +140,7 @@ int drm_lock(drm_device_t *dev, void *data, struct drm_file *file_priv) /* Contention */ #if defined(__FreeBSD__) && __FreeBSD_version > 500000 - ret = msleep((void *)&dev->lock.lock_queue, &dev->dev_lock, + ret = mtx_sleep((void *)&dev->lock.lock_queue, &dev->dev_lock, PZERO | PCATCH, "drmlk2", 0); #else ret = tsleep((void *)&dev->lock.lock_queue, PZERO | PCATCH, |