diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2004-04-08 23:19:15 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2004-04-08 23:19:15 +0000 |
| commit | ce601f364723ad361706be59fb7e09d9f6ca444a (patch) | |
| tree | a2b70ae823ac58373a5ad7a5cb6a33f2b304fe55 | |
| parent | c47597b484866deb7698eb5575348ecd83088314 (diff) | |
disable PCI DMA ioctls as they are not used currently until SAVAGE_CMD_DMA
is made to work.
| -rw-r--r-- | linux-core/savage_drv.c | 8 | ||||
| -rw-r--r-- | linux/savage_drv.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/linux-core/savage_drv.c b/linux-core/savage_drv.c index 8062aebd..331bbc9e 100644 --- a/linux-core/savage_drv.c +++ b/linux-core/savage_drv.c @@ -42,7 +42,7 @@ /* mark off by Jiayo Hsu, Oct. 23, 2001*/ -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) +#if SAVAGE_CMD_DMA /* Check the 3D driver, and we need to fix this anyway */ #define DRIVER_IOCTLS \ [DRM_IOCTL_NR(DRM_IOCTL_SAVAGE_ALLOC_CONTINUOUS_MEM)] \ @@ -167,7 +167,7 @@ int savage_get_physics_address(struct inode *inode, struct file *filp, pgd=pgd_offset(mm,buf); pmd=pmd_offset(pgd,buf); - pte=pte_offset(pmd,buf); + pte=pte_offset_map(pmd,buf); if (!pte_present(*pte)) return -EFAULT; @@ -229,9 +229,9 @@ int savage_free_cont_mem(struct inode *inode, struct file *filp, return 1; } -#else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) */ +#else /* SAVAGE_CMD_DMA */ #define DRIVER_IOCTLS -#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) */ +#endif /* SAVAGE_CMD_DMA */ #if 0 diff --git a/linux/savage_drv.c b/linux/savage_drv.c index 8062aebd..331bbc9e 100644 --- a/linux/savage_drv.c +++ b/linux/savage_drv.c @@ -42,7 +42,7 @@ /* mark off by Jiayo Hsu, Oct. 23, 2001*/ -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) +#if SAVAGE_CMD_DMA /* Check the 3D driver, and we need to fix this anyway */ #define DRIVER_IOCTLS \ [DRM_IOCTL_NR(DRM_IOCTL_SAVAGE_ALLOC_CONTINUOUS_MEM)] \ @@ -167,7 +167,7 @@ int savage_get_physics_address(struct inode *inode, struct file *filp, pgd=pgd_offset(mm,buf); pmd=pmd_offset(pgd,buf); - pte=pte_offset(pmd,buf); + pte=pte_offset_map(pmd,buf); if (!pte_present(*pte)) return -EFAULT; @@ -229,9 +229,9 @@ int savage_free_cont_mem(struct inode *inode, struct file *filp, return 1; } -#else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) */ +#else /* SAVAGE_CMD_DMA */ #define DRIVER_IOCTLS -#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) */ +#endif /* SAVAGE_CMD_DMA */ #if 0 |