Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[linux-2.6-omap-h63xx.git] / include / asm-x86 / ist.h

diff --git a/include/asm-x86/ist.h b/include/asm-x86/ist.h
index ef2003ebc6f9b3e588495125972db716bbe16af2..6ec6ceed95a718ec9d3c91f6004a459781dee74b 100644 (file)
--- a/include/asm-x86/ist.h
+++ b/include/asm-x86/ist.h
@@ -17,17 +17,17 @@
  */
 
 
-#ifdef __KERNEL__
-
 #include <linux/types.h>
 
 struct ist_info {
-       u32 signature;
-       u32 command;
-       u32 event;
-       u32 perf_level;
+       __u32 signature;
+       __u32 command;
+       __u32 event;
+       __u32 perf_level;
 };
 
+#ifdef __KERNEL__
+
 extern struct ist_info ist_info;
 
 #endif /* __KERNEL__ */