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-core/mga_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-core/mga_drv.c')
| -rw-r--r-- | linux-core/mga_drv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c index a8cf0c78..4aaac625 100644 --- a/linux-core/mga_drv.c +++ b/linux-core/mga_drv.c @@ -29,7 +29,6 @@ * * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c,v 1.4 2000/08/28 02:43:15 tsi Exp $ */ #include <linux/config.h> #include "drmP.h" @@ -37,10 +36,10 @@ #define MGA_NAME "mga" #define MGA_DESC "Matrox G200/G400" -#define MGA_DATE "20000910" +#define MGA_DATE "20000928" #define MGA_MAJOR 2 #define MGA_MINOR 0 -#define MGA_PATCHLEVEL 0 +#define MGA_PATCHLEVEL 1 static drm_device_t mga_device; drm_ctx_t mga_res_ctx; @@ -524,6 +523,7 @@ int mga_release(struct inode *inode, struct file *filp) DECLARE_WAITQUEUE(entry, current); add_wait_queue(&dev->lock.lock_queue, &entry); for (;;) { + current->state = TASK_INTERRUPTIBLE; if (!dev->lock.hw_lock) { /* Device has been unregistered */ retcode = -EINTR; @@ -538,7 +538,6 @@ int mga_release(struct inode *inode, struct file *filp) } /* Contention */ atomic_inc(&dev->total_sleeps); - current->state = TASK_INTERRUPTIBLE; schedule(); if (signal_pending(current)) { retcode = -ERESTARTSYS; |