diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-22 12:32:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-22 12:32:21 -0400 |
| commit | fae3f6f2eed147092e4612177972d46e542cab71 (patch) | |
| tree | 8e889a7f236e1a7933f4a6245117d680af6479b9 /include | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
| parent | b6cf8788a3382c2000743a0e393bcc8aeb0601cb (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] kvm: extension capability for new address space layout
[S390] kvm: fix address mode switching
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 2c366b52f505..aace6b8691a2 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
| @@ -553,6 +553,7 @@ struct kvm_ppc_pvinfo { | |||
| 553 | #define KVM_CAP_SPAPR_TCE 63 | 553 | #define KVM_CAP_SPAPR_TCE 63 |
| 554 | #define KVM_CAP_PPC_SMT 64 | 554 | #define KVM_CAP_PPC_SMT 64 |
| 555 | #define KVM_CAP_PPC_RMA 65 | 555 | #define KVM_CAP_PPC_RMA 65 |
| 556 | #define KVM_CAP_S390_GMAP 71 | ||
| 556 | 557 | ||
| 557 | #ifdef KVM_CAP_IRQ_ROUTING | 558 | #ifdef KVM_CAP_IRQ_ROUTING |
| 558 | 559 | ||