diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2003-09-09 07:45:12 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2003-09-09 07:45:12 +0000 |
| commit | 6fc41e25e5acbbfae4d2e93a0d9e6f980f8ae477 (patch) | |
| tree | e527134e5d867d79c4f03f798d60a480b50816f7 | |
| parent | 4d6d3572029414419289fd512416effb9a9ad832 (diff) | |
Use spldrm/splx around tsleep() in DRM_WAIT_ONtrunk-20030912
| -rw-r--r-- | bsd-core/drm_os_freebsd.h | 12 | ||||
| -rw-r--r-- | bsd/drm_os_freebsd.h | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h index 2addf2f46..a5049f548 100644 --- a/bsd-core/drm_os_freebsd.h +++ b/bsd-core/drm_os_freebsd.h @@ -204,11 +204,13 @@ do { \ #define DRM_HZ hz -#define DRM_WAIT_ON( ret, queue, timeout, condition ) \ -while (!condition) { \ - ret = tsleep( &(queue), PZERO | PCATCH, "drmwtq", (timeout) ); \ - if ( ret ) \ - return ret; \ +#define DRM_WAIT_ON( ret, queue, timeout, condition ) \ +for ( ret = 0 ; !ret && !(condition) ; ) { \ + int s = spldrm(); \ + if (!(condition)) \ + ret = tsleep( &(queue), PZERO | PCATCH, \ + "drmwtq", (timeout) ); \ + splx(s); \ } #define DRM_WAKEUP( queue ) wakeup( queue ) diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h index 2addf2f46..a5049f548 100644 --- a/bsd/drm_os_freebsd.h +++ b/bsd/drm_os_freebsd.h @@ -204,11 +204,13 @@ do { \ #define DRM_HZ hz -#define DRM_WAIT_ON( ret, queue, timeout, condition ) \ -while (!condition) { \ - ret = tsleep( &(queue), PZERO | PCATCH, "drmwtq", (timeout) ); \ - if ( ret ) \ - return ret; \ +#define DRM_WAIT_ON( ret, queue, timeout, condition ) \ +for ( ret = 0 ; !ret && !(condition) ; ) { \ + int s = spldrm(); \ + if (!(condition)) \ + ret = tsleep( &(queue), PZERO | PCATCH, \ + "drmwtq", (timeout) ); \ + splx(s); \ } #define DRM_WAKEUP( queue ) wakeup( queue ) |