diff options
| author | Rik Faith <faith@alephnull.com> | 2000-09-29 01:47:11 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-09-29 01:47:11 +0000 |
| commit | 39a659e87718d8b6bbf138510e83de7a1e95d855 (patch) | |
| tree | 5d7ed3ac4e9f3d08e8abb94f46fe2db2d0a764d8 /linux/sis_drv.c | |
| parent | b0a7efb5a959a6105486d303d25d06d69d5d569e (diff) | |
Audit calls to schedule() Remove tags from files shared with Linux kernel
tree Remove debugging statements to make debugging more useful Other
minor cleanups in preparation for sync with Linux 2.4.0-test9-pre7
Diffstat (limited to 'linux/sis_drv.c')
| -rw-r--r-- | linux/sis_drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/sis_drv.c b/linux/sis_drv.c index 0b1990b0..2f98e322 100644 --- a/linux/sis_drv.c +++ b/linux/sis_drv.c @@ -24,7 +24,6 @@ * DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c,v 1.5 2000/09/22 11:35:47 alanh Exp $ */ #include <linux/config.h> #include "drmP.h" @@ -575,6 +574,7 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd, #endif add_wait_queue(&dev->lock.lock_queue, &entry); for (;;) { + current->state = TASK_INTERRUPTIBLE; if (!dev->lock.hw_lock) { /* Device has been unregistered */ ret = -EINTR; @@ -590,7 +590,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd, /* Contention */ atomic_inc(&dev->total_sleeps); - current->state = TASK_INTERRUPTIBLE; #if 1 current->policy |= SCHED_YIELD; #endif |