From f1cce6d5a3a51f68bd051cc2cdca0a2475a57849 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 13 Sep 2012 21:44:30 +0000 Subject: [PATCH] --- yaml --- r: 343487 b: refs/heads/master c: ed7a8d7a3c5dd4adedb271112b6faba45c7037f9 h: refs/heads/master i: 343485: 717e0ca3db8c63a49231fb925946be90ce436efc 343483: bc7ed5461a53233a0d6fee8d0dc06824bc2ede42 343479: 2712454061d375f381fc80d09587d952534d4916 343471: 31f9aaf8e5ab90b4fa00f5cefe763f128b8009a9 343455: f68960be316cc0b3511b61cd98ba6ca4ec73756c 343423: 2d9d1eefec5e3001c6f8782facf842f5ef9ed47e v: v3 --- [refs] | 2 +- trunk/include/linux/kvm.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 521632aab3ee..2c56d3f822a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfe49dbd1fc7310a4e0e2f83ae737cd7d34fa0cd +refs/heads/master: ed7a8d7a3c5dd4adedb271112b6faba45c7037f9 diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index 1649d4b57e1f..65ad5c624c70 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -852,6 +852,9 @@ struct kvm_s390_ucas_mapping { #define KVM_PPC_GET_SMMU_INFO _IOR(KVMIO, 0xa6, struct kvm_ppc_smmu_info) /* Available with KVM_CAP_PPC_ALLOC_HTAB */ #define KVM_PPC_ALLOCATE_HTAB _IOWR(KVMIO, 0xa7, __u32) +#define KVM_CREATE_SPAPR_TCE _IOW(KVMIO, 0xa8, struct kvm_create_spapr_tce) +/* Available with KVM_CAP_RMA */ +#define KVM_ALLOCATE_RMA _IOR(KVMIO, 0xa9, struct kvm_allocate_rma) /* * ioctls for vcpu fds @@ -915,9 +918,6 @@ struct kvm_s390_ucas_mapping { /* Available with KVM_CAP_XCRS */ #define KVM_GET_XCRS _IOR(KVMIO, 0xa6, struct kvm_xcrs) #define KVM_SET_XCRS _IOW(KVMIO, 0xa7, struct kvm_xcrs) -#define KVM_CREATE_SPAPR_TCE _IOW(KVMIO, 0xa8, struct kvm_create_spapr_tce) -/* Available with KVM_CAP_RMA */ -#define KVM_ALLOCATE_RMA _IOR(KVMIO, 0xa9, struct kvm_allocate_rma) /* Available with KVM_CAP_SW_TLB */ #define KVM_DIRTY_TLB _IOW(KVMIO, 0xaa, struct kvm_dirty_tlb) /* Available with KVM_CAP_ONE_REG */