Hi,
Please consider applying.
Description: Rather than use custom code in DRM_WAIT_ON() to do exactly
what wait_event_interruptible_timeout() does, use the function and just
change the return values appropriately.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
--- 2.6.11-kj-v/drivers/char/drm/drm_os_linux.h 2005-03-01 23:38:26.000000000
-0800
+++ 2.6.11-kj/drivers/char/drm/drm_os_linux.h 2005-03-02 12:30:45.000000000
-0800
@@ -6,6 +6,7 @@
#include <linux/interrupt.h> /* For task queue support */
#include <linux/delay.h>
+#include <linux/wait.h>
/** File pointer type */
#define DRMFILE struct file *
@@ -121,26 +122,12 @@ do {
\
#define DRM_WAIT_ON( ret, queue, timeout, condition ) \
do { \
- DECLARE_WAITQUEUE(entry, current); \
- unsigned long end = jiffies + (timeout); \
- add_wait_queue(&(queue), &entry); \
- \
- for (;;) { \
- __set_current_state(TASK_INTERRUPTIBLE); \
- if (condition) \
- break; \
- if (time_after_eq(jiffies, end)) { \
- ret = -EBUSY; \
- break; \
- } \
- schedule_timeout((HZ/100 > 1) ? HZ/100 : 1); \
- if (signal_pending(current)) { \
- ret = -EINTR; \
- break; \
- } \
- } \
- __set_current_state(TASK_RUNNING); \
- remove_wait_queue(&(queue), &entry); \
+ long __ret; \
+ __ret = wait_event_interruptible_timeout(queue, condition, timeout); \
+ if (__ret == 0) \
+ ret = -EBUSY; \
+ else if (__ret == -ERESTARTSYS) \
+ ret = -EINTR; \
} while (0)
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
