diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:05 +0200 |
| commit | 773dc8eacaedb2e8c8d0defb5de2c66ea7dc4a08 (patch) | |
| tree | 1bfa945dcfbcc4a60e31714f768ef38155c621d3 /include/linux/kvm_host.h | |
| parent | sched: add new API sched_setscheduler_nocheck: add a flag to control access checks (diff) | |
| parent | Linux 2.6.26-rc8 (diff) | |
Merge branch 'linus' into sched/new-API-sched_setscheduler
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 @@ #define KVM_REQ_REPORT_TPR_ACCESS 2 #define KVM_REQ_MMU_RELOAD 3 #define KVM_REQ_TRIPLE_FAULT 4 +#define KVM_REQ_PENDING_TIMER 5 struct kvm_vcpu; extern struct kmem_cache *kvm_vcpu_cache; |