summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/uapi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-10 09:05:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-10 09:05:18 -0800
commitccae663cd4f62890d862c660e5ed762eb9821c14 (patch)
tree7c9f110db7992aad60fcc01718a827affc4f33df /arch/powerpc/include/uapi
parent4ffd4ebf9d19c07285ea8a26d30a17ff28767132 (diff)
parent013f6a5d3dd9e4ebf4b49ca427b9c1f2e2a1b767 (diff)
downloadop-kernel-dev-ccae663cd4f62890d862c660e5ed762eb9821c14.zip
op-kernel-dev-ccae663cd4f62890d862c660e5ed762eb9821c14.tar.gz
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM bugfixes from Marcelo Tosatti. * git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: use dynamic percpu allocations for shared msrs area KVM: PPC: Book3S HV: Fix compilation without CONFIG_PPC_POWERNV powerpc: Corrected include header path in kvm_para.h Add rcu user eqs exception hooks for async page fault
Diffstat (limited to 'arch/powerpc/include/uapi')
-rw-r--r--arch/powerpc/include/uapi/asm/kvm_para.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/uapi/asm/kvm_para.h b/arch/powerpc/include/uapi/asm/kvm_para.h
index ed0e025..e3af328 100644
--- a/arch/powerpc/include/uapi/asm/kvm_para.h
+++ b/arch/powerpc/include/uapi/asm/kvm_para.h
@@ -78,7 +78,7 @@ struct kvm_vcpu_arch_shared {
#define KVM_HCALL_TOKEN(num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num)
-#include <uapi/asm/epapr_hcalls.h>
+#include <asm/epapr_hcalls.h>
#define KVM_FEATURE_MAGIC_PAGE 1
OpenPOWER on IntegriCloud