diff options
| author | Rik Faith <faith@alephnull.com> | 2000-08-17 20:20:33 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-08-17 20:20:33 +0000 |
| commit | 761ffd63f3b8c9789afe026e75d384a6d450165a (patch) | |
| tree | 4bf114a7c87d44e081c6418f9a7f54604421dac2 | |
| parent | 3e42514360d15f63c250875e3aa4eb6ddd748763 (diff) | |
Bug #112197 Made sis driver compile under 2.4.0-test7/pre4
| -rw-r--r-- | linux-core/sis_drv.c | 11 | ||||
| -rw-r--r-- | linux/sis_drv.c | 11 | ||||
| -rw-r--r-- | linux/sis_mm.c | 7 |
3 files changed, 3 insertions, 26 deletions
diff --git a/linux-core/sis_drv.c b/linux-core/sis_drv.c index 1e8abb7fb..c04561ee1 100644 --- a/linux-core/sis_drv.c +++ b/linux-core/sis_drv.c @@ -28,7 +28,6 @@ * Daryll Strauss <daryll@precisioninsight.com> * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c,v 1.2 2000/08/04 03:51:47 tsi Exp $ */ #include <linux/config.h> #include "drmP.h" @@ -643,11 +642,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd, } } - if (lock.context != sis_res_ctx.handle) { - current->counter = 5; - current->priority = DEF_PRIORITY/4; - } - DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock"); #if DRM_DMA_HISTOGRAM @@ -688,11 +682,6 @@ int sis_unlock(struct inode *inode, struct file *filp, unsigned int cmd, } } - if (lock.context != sis_res_ctx.handle) { - current->counter = 5; - current->priority = DEF_PRIORITY; - } - return 0; } diff --git a/linux/sis_drv.c b/linux/sis_drv.c index 1e8abb7fb..c04561ee1 100644 --- a/linux/sis_drv.c +++ b/linux/sis_drv.c @@ -28,7 +28,6 @@ * Daryll Strauss <daryll@precisioninsight.com> * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c,v 1.2 2000/08/04 03:51:47 tsi Exp $ */ #include <linux/config.h> #include "drmP.h" @@ -643,11 +642,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd, } } - if (lock.context != sis_res_ctx.handle) { - current->counter = 5; - current->priority = DEF_PRIORITY/4; - } - DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock"); #if DRM_DMA_HISTOGRAM @@ -688,11 +682,6 @@ int sis_unlock(struct inode *inode, struct file *filp, unsigned int cmd, } } - if (lock.context != sis_res_ctx.handle) { - current->counter = 5; - current->priority = DEF_PRIORITY; - } - return 0; } diff --git a/linux/sis_mm.c b/linux/sis_mm.c index e722b8bd3..1d6a27486 100644 --- a/linux/sis_mm.c +++ b/linux/sis_mm.c @@ -1,14 +1,13 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_mm.c,v 1.2 2000/08/04 03:51:48 tsi Exp $ */ #define __NO_VERSION__ -#include <linux/fb.h> -#include <linux/sisfb.h> -#include <linux/interrupt.h> - #include "drmP.h" #include "sis_drm_public.h" #include "sis_ds.h" #include "sis_drv.h" +#include <linux/fb.h> +#include <linux/sisfb.h> +#include <linux/interrupt.h> #define MAX_CONTEXT 100 #define VIDEO_TYPE 0 |