From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 21 May 2006 21:51:13 +0000 (+0100)
Subject: Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
X-Git-Tag: v2.6.18-rc1~1103^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c23d62abb820e19c54012520f08a198c2233a85;p=linux-2.6

Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/include/asm-x86_64/mtrr.h b/include/asm-x86_64/mtrr.h
index 4a0610c185..d6135b2549 100644
--- a/include/asm-x86_64/mtrr.h
+++ b/include/asm-x86_64/mtrr.h
@@ -24,7 +24,6 @@
 #define _LINUX_MTRR_H
 
 #include <linux/ioctl.h>
-#include <linux/compat.h>
 
 #define	MTRR_IOCTL_BASE	'M'
 
@@ -101,11 +100,10 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base,
     return -ENODEV;
 }
 
-#  endif
-
-#endif
+#endif /* CONFIG_MTRR */
 
 #ifdef CONFIG_COMPAT
+#include <linux/compat.h>
 
 struct mtrr_sentry32
 {
@@ -137,4 +135,6 @@ struct mtrr_gentry32
 
 #endif /* CONFIG_COMPAT */
 
+#endif /* __KERNEL__ */
+
 #endif  /*  _LINUX_MTRR_H  */