From 39a659e87718d8b6bbf138510e83de7a1e95d855 Mon Sep 17 00:00:00 2001 From: Rik Faith Date: Fri, 29 Sep 2000 01:47:11 +0000 Subject: 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 --- linux/sis_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'linux/sis_drv.c') 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 #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 -- cgit v1.2.3