diff options
| author | Gleb Natapov <gleb@redhat.com> | 2012-12-20 08:47:52 -0500 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2012-12-20 08:47:52 -0500 |
| commit | 18eb54cf4a9cd4b74f926209be208366415edfa8 (patch) | |
| tree | 6ac75a00ce629d8c2cae3070700d95853408f9b0 /arch | |
| parent | 9b132fbe5419d789f1ef396bed5eb66a365dd1e9 (diff) | |
| parent | 1509ae56cdc19a12f76000e31602e4119fffc571 (diff) | |
Merge branch 'kvm-ppc-3.8' of https://github.com/agraf/linux-2.6 into master
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/uapi/asm/kvm_para.h | 2 |
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 ed0e0254b47f..e3af3286a068 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 { | |||
| 78 | 78 | ||
| 79 | #define KVM_HCALL_TOKEN(num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num) | 79 | #define KVM_HCALL_TOKEN(num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num) |
| 80 | 80 | ||
| 81 | #include <uapi/asm/epapr_hcalls.h> | 81 | #include <asm/epapr_hcalls.h> |
| 82 | 82 | ||
| 83 | #define KVM_FEATURE_MAGIC_PAGE 1 | 83 | #define KVM_FEATURE_MAGIC_PAGE 1 |
| 84 | 84 | ||