diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-21 11:55:06 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-21 11:55:06 +0200 |
| commit | 8afd74c2961a7544b0d73fad2d92f2cb65502e99 (patch) | |
| tree | 784dbe0dfe96dd0a3f0e10153ca42b11d9e961b6 /arch/x86/include/uapi | |
| parent | fe0e80befd4d3a62d40f24b98b17483ea00ef2dd (diff) | |
| parent | f3e4559781bf0c393364baa6b772233088a711db (diff) | |
| download | linux-8afd74c2961a7544b0d73fad2d92f2cb65502e99.tar.bz2 | |
Merge branch 'x86/process' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into HEAD
Required for KVM support of the CPUID faulting feature.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/include/uapi')
| -rw-r--r-- | arch/x86/include/uapi/asm/prctl.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h index 835aa51c7f6e..c45765517092 100644 --- a/arch/x86/include/uapi/asm/prctl.h +++ b/arch/x86/include/uapi/asm/prctl.h @@ -1,10 +1,13 @@ #ifndef _ASM_X86_PRCTL_H #define _ASM_X86_PRCTL_H -#define ARCH_SET_GS 0x1001 -#define ARCH_SET_FS 0x1002 -#define ARCH_GET_FS 0x1003 -#define ARCH_GET_GS 0x1004 +#define ARCH_SET_GS 0x1001 +#define ARCH_SET_FS 0x1002 +#define ARCH_GET_FS 0x1003 +#define ARCH_GET_GS 0x1004 + +#define ARCH_GET_CPUID 0x1011 +#define ARCH_SET_CPUID 0x1012 #define ARCH_MAP_VDSO_X32 0x2001 #define ARCH_MAP_VDSO_32 0x2002 |