aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drmP.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-08-07 01:19:58 -0400
committerDave Airlie <airlied@linux.ie>2005-08-07 01:19:58 -0400
commitd27c9b548ad79c14830c57355dbe3a35f970532a (patch)
treee274cd6193597b3860cbf9768241528067905912 /drivers/char/drm/drmP.h
parentaa0ca6b4bb818406d4769edb9ff115500c8e4090 (diff)
drm: remove version.h and any version checks..
This patch removes all the drm kernel conditionals from the kernel DRM tree. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r--drivers/char/drm/drmP.h34
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 0a4358996970..6f98701dfe15 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -53,7 +53,6 @@
53#include <linux/init.h> 53#include <linux/init.h>
54#include <linux/file.h> 54#include <linux/file.h>
55#include <linux/pci.h> 55#include <linux/pci.h>
56#include <linux/version.h>
57#include <linux/jiffies.h> 56#include <linux/jiffies.h>
58#include <linux/smp_lock.h> /* For (un)lock_kernel */ 57#include <linux/smp_lock.h> /* For (un)lock_kernel */
59#include <linux/mm.h> 58#include <linux/mm.h>
@@ -161,36 +160,7 @@
161#define pte_unmap(pte) 160#define pte_unmap(pte)
162#endif 161#endif
163 162
164#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
165static inline struct page * vmalloc_to_page(void * vmalloc_addr)
166{
167 unsigned long addr = (unsigned long) vmalloc_addr;
168 struct page *page = NULL;
169 pgd_t *pgd = pgd_offset_k(addr);
170 pmd_t *pmd;
171 pte_t *ptep, pte;
172
173 if (!pgd_none(*pgd)) {
174 pmd = pmd_offset(pgd, addr);
175 if (!pmd_none(*pmd)) {
176 preempt_disable();
177 ptep = pte_offset_map(pmd, addr);
178 pte = *ptep;
179 if (pte_present(pte))
180 page = pte_page(pte);
181 pte_unmap(ptep);
182 preempt_enable();
183 }
184 }
185 return page;
186}
187#endif
188
189#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
190#define DRM_RPR_ARG(vma)
191#else
192#define DRM_RPR_ARG(vma) vma, 163#define DRM_RPR_ARG(vma) vma,
193#endif
194 164
195#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT) 165#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
196 166
@@ -746,12 +716,8 @@ typedef struct drm_device {
746 int pci_slot; /**< PCI slot number */ 716 int pci_slot; /**< PCI slot number */
747 int pci_func; /**< PCI function number */ 717 int pci_func; /**< PCI function number */
748#ifdef __alpha__ 718#ifdef __alpha__
749#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3)
750 struct pci_controler *hose;
751#else
752 struct pci_controller *hose; 719 struct pci_controller *hose;
753#endif 720#endif
754#endif
755 drm_sg_mem_t *sg; /**< Scatter gather memory */ 721 drm_sg_mem_t *sg; /**< Scatter gather memory */
756 unsigned long *ctx_bitmap; /**< context bitmap */ 722 unsigned long *ctx_bitmap; /**< context bitmap */
757 void *dev_private; /**< device private data */ 723 void *dev_private; /**< device private data */