diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/asm-x86_64/mtrr.h linux-2.5/include/asm-x86_64/mtrr.h
--- bk-linus/include/asm-x86_64/mtrr.h	2002-11-21 02:23:41.000000000 +0000
+++ linux-2.5/include/asm-x86_64/mtrr.h	2002-11-21 18:04:35.000000000 +0000
@@ -30,15 +30,15 @@
 
 struct mtrr_sentry
 {
-    __u64 base;    /*  Base address     */
-    __u32 size;    /*  Size of region   */
+    unsigned long base;    /*  Base address     */
+    unsigned int size;    /*  Size of region   */
     unsigned int type;     /*  Type of region   */
 };
 
 struct mtrr_gentry
 {
-    __u64 base;    /*  Base address     */
-    __u32 size;    /*  Size of region   */
+    unsigned long base;    /*  Base address     */
+    unsigned int size;    /*  Size of region   */
     unsigned int regnum;   /*  Register number  */
     unsigned int type;     /*  Type of region   */
 };
@@ -79,6 +79,7 @@ static char *mtrr_strings[MTRR_NUM_TYPES
 #endif
 
 #ifdef __KERNEL__
+#include <linux/types.h>
 
 /*  The following functions are for use by other drivers  */
 #ifdef CONFIG_MTRR