diff options
author | David Howells <dhowells@redhat.com> | 2012-12-14 17:37:13 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-12-14 17:37:13 -0500 |
commit | af170c5061dd78512c469e6e2d211980cdb2c193 (patch) | |
tree | a3bb86ee66b69f832b6783124cc0482ce8058cd8 /arch/x86/include/asm/msr.h | |
parent | d42b3a2906a10b732ea7d7f849d49be79d242ef0 (diff) |
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/msr.h')
-rw-r--r-- | arch/x86/include/asm/msr.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 813ed103f45..9264802e282 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h | |||
@@ -1,18 +1,10 @@ | |||
1 | #ifndef _ASM_X86_MSR_H | 1 | #ifndef _ASM_X86_MSR_H |
2 | #define _ASM_X86_MSR_H | 2 | #define _ASM_X86_MSR_H |
3 | 3 | ||
4 | #include <asm/msr-index.h> | 4 | #include <uapi/asm/msr.h> |
5 | 5 | ||
6 | #ifndef __ASSEMBLY__ | 6 | #ifndef __ASSEMBLY__ |
7 | 7 | ||
8 | #include <linux/types.h> | ||
9 | #include <linux/ioctl.h> | ||
10 | |||
11 | #define X86_IOC_RDMSR_REGS _IOWR('c', 0xA0, __u32[8]) | ||
12 | #define X86_IOC_WRMSR_REGS _IOWR('c', 0xA1, __u32[8]) | ||
13 | |||
14 | #ifdef __KERNEL__ | ||
15 | |||
16 | #include <asm/asm.h> | 8 | #include <asm/asm.h> |
17 | #include <asm/errno.h> | 9 | #include <asm/errno.h> |
18 | #include <asm/cpumask.h> | 10 | #include <asm/cpumask.h> |
@@ -271,6 +263,5 @@ static inline int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]) | |||
271 | return wrmsr_safe_regs(regs); | 263 | return wrmsr_safe_regs(regs); |
272 | } | 264 | } |
273 | #endif /* CONFIG_SMP */ | 265 | #endif /* CONFIG_SMP */ |
274 | #endif /* __KERNEL__ */ | ||
275 | #endif /* __ASSEMBLY__ */ | 266 | #endif /* __ASSEMBLY__ */ |
276 | #endif /* _ASM_X86_MSR_H */ | 267 | #endif /* _ASM_X86_MSR_H */ |