aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-22 09:32:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-22 09:32:21 -0700
commitfae3f6f2eed147092e4612177972d46e542cab71 (patch)
tree8e889a7f236e1a7933f4a6245117d680af6479b9 /include
parentd93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff)
parentb6cf8788a3382c2000743a0e393bcc8aeb0601cb (diff)
downloadlinux-linaro-fae3f6f2eed147092e4612177972d46e542cab71.tar.gz
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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 2c366b52f50..aace6b8691a 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -553,6 +553,7 @@ struct kvm_ppc_pvinfo {
#define KVM_CAP_SPAPR_TCE 63
#define KVM_CAP_PPC_SMT 64
#define KVM_CAP_PPC_RMA 65
+#define KVM_CAP_S390_GMAP 71
#ifdef KVM_CAP_IRQ_ROUTING