4 files changed, 15 insertions, 3 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index b7fc56ef..4733ba33 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -181,6 +181,18 @@ static inline void radeon_delete_i2c_busses(struct drm_device *dev)
 
 #define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
+static inline int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t pgprot)
+{
+  return remap_page_range(DRM_RPR_ARG(vma) from, 
+			  pfn << PAGE_SHIFT,
+			  size,
+			  pgprot);
+}
+#endif
+
+extern const drm_agp_t drm_agp_entry;
+
 /* old architectures */
 #ifdef __AMD64__
 #define __x86_64__
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index 66bfec17..9b49efdc 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -645,7 +645,7 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
 					vma->vm_end - vma->vm_start,
 					vma->vm_page_prot, 0))
 #else
-		if (remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start,
+		if (remap_pfn_range(vma, vma->vm_start,
 				     (VM_OFFSET(vma) + offset) >> PAGE_SHIFT,
 				     vma->vm_end - vma->vm_start,
 				     vma->vm_page_prot))
diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c
index 0f28a864..81551be8 100644
--- a/linux-core/i810_dma.c
+++ b/linux-core/i810_dma.c
@@ -130,7 +130,7 @@ int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
 	buf_priv->currently_mapped = I810_BUF_MAPPED;
 	unlock_kernel();
 
-	if (remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start,
+	if (remap_pfn_range(vma, vma->vm_start,
 			    VM_OFFSET(vma) >> PAGE_SHIFT,
 			    vma->vm_end - vma->vm_start,
 			    vma->vm_page_prot))
diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c
index c89331f7..a753ffd8 100644
--- a/linux-core/i830_dma.c
+++ b/linux-core/i830_dma.c
@@ -131,7 +131,7 @@ int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
 	buf_priv->currently_mapped = I830_BUF_MAPPED;
 	unlock_kernel();
 
-	if (remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start,
+	if (remap_pfn_range(vma, vma->vm_start,
 			    VM_OFFSET(vma) >> PAGE_SHIFT,
 			    vma->vm_end - vma->vm_start,
 			    vma->vm_page_prot))