summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/ist.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-12-14 23:37:13 +0100
committerDavid Howells <dhowells@redhat.com>2012-12-14 23:37:13 +0100
commitaf170c5061dd78512c469e6e2d211980cdb2c193 (patch)
treea3bb86ee66b69f832b6783124cc0482ce8058cd8 /arch/x86/include/asm/ist.h
parentMerge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-af170c5061dd78512c469e6e2d211980cdb2c193.tar.xz
linux-af170c5061dd78512c469e6e2d211980cdb2c193.zip
UAPI: (Scripted) Disintegrate arch/x86/include/asm
Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/ist.h')
-rw-r--r--arch/x86/include/asm/ist.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/x86/include/asm/ist.h b/arch/x86/include/asm/ist.h
index 7e5dff1de0e9..c9803f1a2033 100644
--- a/arch/x86/include/asm/ist.h
+++ b/arch/x86/include/asm/ist.h
@@ -1,6 +1,3 @@
-#ifndef _ASM_X86_IST_H
-#define _ASM_X86_IST_H
-
/*
* Include file for the interface to IST BIOS
* Copyright 2002 Andy Grover <andrew.grover@intel.com>
@@ -15,20 +12,12 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*/
+#ifndef _ASM_X86_IST_H
+#define _ASM_X86_IST_H
+#include <uapi/asm/ist.h>
-#include <linux/types.h>
-
-struct ist_info {
- __u32 signature;
- __u32 command;
- __u32 event;
- __u32 perf_level;
-};
-
-#ifdef __KERNEL__
extern struct ist_info ist_info;
-#endif /* __KERNEL__ */
#endif /* _ASM_X86_IST_H */