Index: include/asm/pgtable.h
===================================================================
RCS file: /var/cvs/comedi/include/asm/pgtable.h,v
retrieving revision 1.1
diff -u -r1.1 pgtable.h
--- include/asm/pgtable.h	4 Aug 2003 01:06:40 -0000	1.1
+++ include/asm/pgtable.h	25 Feb 2005 13:26:52 -0000
@@ -19,15 +19,11 @@
 #ifndef __COMPAT_ASM_PGTABLE_H_
 #define __COMPAT_ASM_PGTABLE_H_
 
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include_next <asm/pgtable.h>
 
+#ifndef pte_offset_kernel
 #define pte_offset_kernel(dir,address) pte_offset(dir,address)
-
 #endif
-
-#include_next <asm/pgtable.h>
 
 #endif /* __COMPAT_ASM_PGTABLE_H_ */
 
Index: include/linux/mm.h
===================================================================
RCS file: /var/cvs/comedi/include/linux/mm.h,v
retrieving revision 1.4
diff -u -r1.4 mm.h
--- include/linux/mm.h	5 Aug 2003 18:28:20 -0000	1.4
+++ include/linux/mm.h	25 Feb 2005 13:26:52 -0000
@@ -14,7 +14,12 @@
 #define VM_OFFSET(a)	((a)->vm_pgoff * PAGE_SIZE)
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,10) \
+			  && LINUX_VERSION_CODE < KERNEL_VERSION(2,5,3)
+#include <asm/tlb.h>	/* look for tlb_vma() macro for "statm" patch */
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,3) && !defined(tlb_vma)
 #define REMAP_PAGE_RANGE(a,b,c,d,e) remap_page_range(b,c,d,e)
 #else
 #define REMAP_PAGE_RANGE(a,b,c,d,e) remap_page_range(a,b,c,d,e)