aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-24 08:26:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-24 08:26:01 -0700
commit60911731fe7fd4ec4d088fc1a48a56c9fb14103f (patch)
treea4343a10d8cb6195dbda3bc2bc2688e42de70fb4 /include
parentd1f53fb90ee631a2cf8f7bdd0e921a338106e4f9 (diff)
parent888d256e9c565cb61505bd218eb37c81fe77a325 (diff)
downloadmrst-s0i3-test-60911731fe7fd4ec4d088fc1a48a56c9fb14103f.tar.gz
mrst-s0i3-test-60911731fe7fd4ec4d088fc1a48a56c9fb14103f.tar.xz
mrst-s0i3-test-60911731fe7fd4ec4d088fc1a48a56c9fb14103f.zip
Merge branch 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Unregister cpufreq notifier on unload KVM: x86: release time_page on vcpu destruction KVM: Fix overlapping check for memory slots KVM: MMU: disable global page optimization KVM: ia64: fix locking order entering guest KVM: MMU: Fix off-by-one calculating large page count
Diffstat (limited to 'include')
-rw-r--r--include/linux/kvm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 311a073afe8..8cc137911b3 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -409,6 +409,8 @@ struct kvm_trace_rec {
#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
#define KVM_CAP_DEVICE_DEASSIGNMENT 27
#endif
+/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */
+#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30
#ifdef KVM_CAP_IRQ_ROUTING