diff options
| author |   James Morris <james.l.morris@oracle.com> | 2015-11-23 22:46:28 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-11-23 22:46:28 +1100 |
| commit | ebd68df3f24b318d391d15c458d6f43f340ba36a (patch) | |
| tree | f0277bc4b853abe5db1d30fa4e10b05bba7f2ac5 /include/kvm/arm_arch_timer.h | |
| parent | security/capability.h: cap_issubset/isclear can be boolean (diff) | |
| parent | Linux 4.4-rc2 (diff) | |
| download | linux-dev-ebd68df3f24b318d391d15c458d6f43f340ba36a.tar.xz linux-dev-ebd68df3f24b318d391d15c458d6f43f340ba36a.zip | |
Sync to Linus v4.4-rc2 for LSM developers.
Diffstat (limited to 'include/kvm/arm_arch_timer.h')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index e1e4d7c38dda..1800227af9d6 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -51,7 +51,7 @@ struct arch_timer_cpu { bool armed; /* Timer IRQ */ - const struct kvm_irq_level *irq; + struct kvm_irq_level irq; /* VGIC mapping */ struct irq_phys_map *map; @@ -71,5 +71,7 @@ u64 kvm_arm_timer_get_reg(struct kvm_vcpu *, u64 regid); int kvm_arm_timer_set_reg(struct kvm_vcpu *, u64 regid, u64 value); bool kvm_timer_should_fire(struct kvm_vcpu *vcpu); +void kvm_timer_schedule(struct kvm_vcpu *vcpu); +void kvm_timer_unschedule(struct kvm_vcpu *vcpu); #endif |