diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 10:22:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 10:22:34 -0700 |
commit | 29567292c0b5b2fb484125c280a2175141fe2205 (patch) | |
tree | e697016baeed05d266367b2959e81a3b5b8561fa /arch/x86/xen/time.c | |
parent | ecaba7185894778c24895356d117a7f92e3c92de (diff) | |
parent | dd14be92fbf5bc1ef7343f34968440e44e21b46a (diff) | |
download | op-kernel-dev-29567292c0b5b2fb484125c280a2175141fe2205.zip op-kernel-dev-29567292c0b5b2fb484125c280a2175141fe2205.tar.gz |
Merge tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen bug fixes from David Vrabel.
* tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: use same main loop for counting and remapping pages
xen/events: Don't move disabled irqs
xen/x86: actually allocate legacy interrupts on PV guests
Xen: don't warn about 2-byte wchar_t in efi
xen/gntdev: reduce copy batch size to 16
xen/x86: don't lose event interrupts
Diffstat (limited to 'arch/x86/xen/time.c')
-rw-r--r-- | arch/x86/xen/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index a0a4e55..6deba5b 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -290,11 +290,11 @@ static int xen_vcpuop_set_next_event(unsigned long delta, WARN_ON(!clockevent_state_oneshot(evt)); single.timeout_abs_ns = get_abs_timeout(delta); - single.flags = VCPU_SSHOTTMR_future; + /* Get an event anyway, even if the timeout is already expired */ + single.flags = 0; ret = HYPERVISOR_vcpu_op(VCPUOP_set_singleshot_timer, cpu, &single); - - BUG_ON(ret != 0 && ret != -ETIME); + BUG_ON(ret != 0); return ret; } |