Merge branch 'kvm-ppc-3.8' of https://github.com/agraf/linux-2.6 into master

This commit is contained in:
Gleb Natapov 2012-12-20 15:47:52 +02:00
commit 18eb54cf4a
1 changed files with 1 additions and 1 deletions

View File

@ -78,7 +78,7 @@ struct kvm_vcpu_arch_shared {
#define KVM_HCALL_TOKEN(num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num) #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 #define KVM_FEATURE_MAGIC_PAGE 1