summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-01-15 16:44:38 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-15 16:44:38 +0100
commitd43a3312c77eb6bbf71fbadefb1683f6d197bf91 (patch)
tree104b6f0c1bead32be79c9e7b3c2f0f5f9873e25e /include
parentx86: fix boot crash on HIGHMEM4G && SPARSEMEM (diff)
downloadlinux-d43a3312c77eb6bbf71fbadefb1683f6d197bf91.tar.xz
linux-d43a3312c77eb6bbf71fbadefb1683f6d197bf91.zip
x86: asm-x86/msr.h: pull in linux/types.h
Since the msr.h header uses types like __u32, it should pull in linux/types.h. [ mingo@elte.hu: affects user-space that includes this header. We dont actually like user-space including raw kernel headers but it's a longstanding practice and it's easy for the kernel to be nice about this. ] Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/msr.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h
index 664a2fa7adc9..80b027081b3c 100644
--- a/include/asm-x86/msr.h
+++ b/include/asm-x86/msr.h
@@ -3,6 +3,10 @@
#include <asm/msr-index.h>
+#ifndef __ASSEMBLY__
+# include <linux/types.h>
+#endif
+
#ifdef __i386__
#ifdef __KERNEL__