diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
| commit | 0ed368c71aa65cba8d349432bd4dab4a9a2eb39c (patch) | |
| tree | 7746534bafd57f6764bda8f26efc3929a4acf914 /include/linux/kvm_host.h | |
| parent | 7aaaec38fcd9ef3172e69f8c19f20113830a8498 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/kconfig
Diffstat (limited to 'include/linux/kvm_host.h')
| -rw-r--r-- | include/linux/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 092b1b25291d..de9d1df4bba2 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #define KVM_REQ_REPORT_TPR_ACCESS 2 | 33 | #define KVM_REQ_REPORT_TPR_ACCESS 2 |
| 34 | #define KVM_REQ_MMU_RELOAD 3 | 34 | #define KVM_REQ_MMU_RELOAD 3 |
| 35 | #define KVM_REQ_TRIPLE_FAULT 4 | 35 | #define KVM_REQ_TRIPLE_FAULT 4 |
| 36 | #define KVM_REQ_PENDING_TIMER 5 | ||
| 36 | 37 | ||
| 37 | struct kvm_vcpu; | 38 | struct kvm_vcpu; |
| 38 | extern struct kmem_cache *kvm_vcpu_cache; | 39 | extern struct kmem_cache *kvm_vcpu_cache; |