summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-11-19 21:48:22 +0000
committerDavid Howells <dhowells@redhat.com>2012-11-19 21:50:58 +0000
commit60606d42483feb118c555f3425bb31fdec6749b3 (patch)
treecc0f6f4570f9e656503c67fc4723e557aebda468 /arch/x86
parentf787d9519fb10411f2948f5b9957a1669879ba84 (diff)
parent6d369a09ccd8104b35646b507112d3ddca4344eb (diff)
downloadtalos-op-linux-60606d42483feb118c555f3425bb31fdec6749b3.tar.gz
talos-op-linux-60606d42483feb118c555f3425bb31fdec6749b3.zip
Merge branch 'x86-pre-uapi' into perf-uapi
David Howells (1): x86: Export asm/{svm.h,vmx.h,perf_regs.h}
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/Kbuild3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index 66e5f0ef0523..79fd8a3418f9 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -12,6 +12,7 @@ header-y += mce.h
header-y += msr-index.h
header-y += msr.h
header-y += mtrr.h
+header-y += perf_regs.h
header-y += posix_types_32.h
header-y += posix_types_64.h
header-y += posix_types_x32.h
@@ -19,8 +20,10 @@ header-y += prctl.h
header-y += processor-flags.h
header-y += ptrace-abi.h
header-y += sigcontext32.h
+header-y += svm.h
header-y += ucontext.h
header-y += vm86.h
+header-y += vmx.h
header-y += vsyscall.h
genhdr-y += unistd_32.h
OpenPOWER on IntegriCloud