diff options
author | Rik Faith <faith@alephnull.com> | 2000-08-28 19:50:52 +0000 |
---|---|---|
committer | Rik Faith <faith@alephnull.com> | 2000-08-28 19:50:52 +0000 |
commit | 32cebaf750b82639822f5f50d0aa8a4417595ada (patch) | |
tree | 302cadb8dea2bb37491713bbc4b6ceac21f22021 /linux-core/r128_drv.c | |
parent | 6f07e1ff6bec8f306e8aa1d59b8bcaa93ffa776e (diff) |
Add compatibility header file to make Linux 2.4.0 kernel patches cleaner.
Diffstat (limited to 'linux-core/r128_drv.c')
-rw-r--r-- | linux-core/r128_drv.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c index c4eb634d..bb24b13e 100644 --- a/linux-core/r128_drv.c +++ b/linux-core/r128_drv.c @@ -656,7 +656,6 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd, #endif if (!ret) { -#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */ sigemptyset(&dev->sigmask); sigaddset(&dev->sigmask, SIGSTOP); sigaddset(&dev->sigmask, SIGTSTP); @@ -665,7 +664,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd, dev->sigdata.context = lock.context; dev->sigdata.lock = dev->lock.hw_lock; block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); -#endif + if (lock.flags & _DRM_LOCK_READY) { /* Wait for space in DMA/FIFO */ } @@ -730,8 +729,6 @@ int r128_unlock(struct inode *inode, struct file *filp, unsigned int cmd, } #endif -#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */ unblock_all_signals(); -#endif return 0; } |