diff options
| author | Alexander Graf <agraf@suse.de> | 2011-11-17 09:26:35 -0500 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-11-17 09:30:25 -0500 |
| commit | bb75c627fb0dfb8c0ab75d3033709ff928896e16 (patch) | |
| tree | a012b220304a44a949b2be98ac2b07e50e52fe01 /include/linux | |
| parent | e7fc6f93b4242b2b566f0070709e27257d6da8a2 (diff) | |
Revert "KVM: PPC: Add support for explicit HIOR setting"
This reverts commit a15bd354f083f20f257db450488db52ac27df439.
It exceeded the padding on the SREGS struct, rendering the ABI
backwards-incompatible.
Conflicts:
arch/powerpc/kvm/powerpc.c
include/linux/kvm.h
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kvm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index f47fcd30273d..c3892fc1d538 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
| @@ -555,7 +555,6 @@ struct kvm_ppc_pvinfo { | |||
| 555 | #define KVM_CAP_PPC_SMT 64 | 555 | #define KVM_CAP_PPC_SMT 64 |
| 556 | #define KVM_CAP_PPC_RMA 65 | 556 | #define KVM_CAP_PPC_RMA 65 |
| 557 | #define KVM_CAP_MAX_VCPUS 66 /* returns max vcpus per vm */ | 557 | #define KVM_CAP_MAX_VCPUS 66 /* returns max vcpus per vm */ |
| 558 | #define KVM_CAP_PPC_HIOR 67 | ||
| 559 | #define KVM_CAP_PPC_PAPR 68 | 558 | #define KVM_CAP_PPC_PAPR 68 |
| 560 | #define KVM_CAP_S390_GMAP 71 | 559 | #define KVM_CAP_S390_GMAP 71 |
| 561 | 560 | ||