summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-21 22:51:13 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-21 22:51:13 +0100
commit2c23d62abb820e19c54012520f08a198c2233a85 (patch)
tree1b7646fe81694041f7e364d2a15644ad56b7063b /include
parent3ac6c7b44560fdf2ea8865536bd52d4ff038107e (diff)
downloadblackbird-op-linux-2c23d62abb820e19c54012520f08a198c2233a85.tar.gz
blackbird-op-linux-2c23d62abb820e19c54012520f08a198c2233a85.zip
Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86_64/mtrr.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86_64/mtrr.h b/include/asm-x86_64/mtrr.h
index 4a0610c185eb..d6135b2549bf 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 */
OpenPOWER on IntegriCloud