diff options
| author | Rik Faith <faith@alephnull.com> | 2000-07-19 18:38:41 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-07-19 18:38:41 +0000 |
| commit | aed8549e91ade1582505ebce50e4a79d99b4436f (patch) | |
| tree | 75fae913a2327facdbd944b373a7e9ebe4ec9c8c /linux/fops.c | |
| parent | 7b888f87fa5ec559df97a7e911dd5a3328895f6f (diff) | |
Sync with Linux 2.4.0-test4 kernel
Diffstat (limited to 'linux/fops.c')
| -rw-r--r-- | linux/fops.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/linux/fops.c b/linux/fops.c index 4ade7aa1..f3966d96 100644 --- a/linux/fops.c +++ b/linux/fops.c @@ -94,7 +94,8 @@ int drm_release(struct inode *inode, struct file *filp) DRM_DEBUG("pid = %d, device = 0x%x, open_count = %d\n", current->pid, dev->device, dev->open_count); - if (_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) + if (dev->lock.hw_lock + && _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) && dev->lock.pid == current->pid) { DRM_ERROR("Process %d dead, freeing lock for context %d\n", current->pid, @@ -222,8 +223,15 @@ int drm_write_string(drm_device_t *dev, const char *s) KILLFASYNCHASTHREEPARAMETERS if three parameters are found. */ if (dev->buf_async) kill_fasync(dev->buf_async, SIGIO); #else - /* Parameter added in 2.3.21 */ + + /* Parameter added in 2.3.21. */ +#if LINUX_VERSION_CODE < 0x020400 if (dev->buf_async) kill_fasync(dev->buf_async, SIGIO, POLL_IN); +#else + /* Type of first parameter changed in + Linux 2.4.0-test2... */ + if (dev->buf_async) kill_fasync(&dev->buf_async, SIGIO, POLL_IN); +#endif #endif DRM_DEBUG("waking\n"); wake_up_interruptible(&dev->buf_readers); |