Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / asm-x86_64 / mtrr.h

diff --git a/include/asm-x86_64/mtrr.h b/include/asm-x86_64/mtrr.h
index d6135b2..66ac1c0 100644 (file)
--- a/include/asm-x86_64/mtrr.h
+++ b/include/asm-x86_64/mtrr.h
@@ -23,7 +23,9 @@
 #ifndef _LINUX_MTRR_H
 #define _LINUX_MTRR_H
 
 #ifndef _LINUX_MTRR_H
 #define _LINUX_MTRR_H
 

+#include <linux/config.h>

 #include <linux/ioctl.h>
 #include <linux/ioctl.h>

+#include <linux/compat.h>

 
 #define        MTRR_IOCTL_BASE 'M'
 
 
 #define        MTRR_IOCTL_BASE 'M'
 


@@ -100,10 +102,11 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base,
     return -ENODEV;
 }
 
     return -ENODEV;
 }
 

-#endif /* CONFIG_MTRR */
+#  endif
+
+#endif

 
 #ifdef CONFIG_COMPAT
 
 #ifdef CONFIG_COMPAT

-#include <linux/compat.h>

 
 struct mtrr_sentry32
 {
 
 struct mtrr_sentry32
 {


@@ -135,6 +138,4 @@ struct mtrr_gentry32
 
 #endif /* CONFIG_COMPAT */
 
 
 #endif /* CONFIG_COMPAT */
 

-#endif /* __KERNEL__ */
-

 #endif  /*  _LINUX_MTRR_H  */
 #endif  /*  _LINUX_MTRR_H  */