summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <justus@gnupg.org>2016-04-20 15:58:10 +0200
committerJustus Winter <justus@gnupg.org>2016-04-20 16:14:41 +0200
commit8f2a4990d1bcd91f399cb519bb800afe136f102f (patch)
tree9ab8be54d5671990bf83fa120501dd12bc699eb7
parent675fd4eecd75a7156c83bb814ecfdbbcfbf27ea1 (diff)
xen: fix build
* i386/xen/xen.c (hypclock_machine_intr): Fix 'clock_interrupt' call. * xen/time.c (clkstart): Likewise.
-rw-r--r--i386/xen/xen.c5
-rw-r--r--xen/time.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/i386/xen/xen.c b/i386/xen/xen.c
index 44d37e6f..8b015c42 100644
--- a/i386/xen/xen.c
+++ b/i386/xen/xen.c
@@ -51,9 +51,10 @@ void hypclock_machine_intr(int old_ipl, void *ret_addr, struct i386_interrupt_st
clock_interrupt(delta/1000, /* usec per tick */
(regs->efl & EFL_VM) || /* user mode */
((regs->cs & 0x02) != 0), /* user mode */
- old_ipl == SPL0); /* base priority */
+ old_ipl == SPL0, /* base priority */
+ regs->eip); /* interrupted eip */
} else
- clock_interrupt(delta/1000, FALSE, FALSE);
+ clock_interrupt(delta/1000, FALSE, FALSE, 0);
}
void hyp_p2m_init(void) {
diff --git a/xen/time.c b/xen/time.c
index 1e9afc8e..d483405a 100644
--- a/xen/time.c
+++ b/xen/time.c
@@ -138,7 +138,7 @@ clkstart()
hyp_evt_handler(port, hypclock_intr, 0, SPLHI);
/* first clock tick */
- clock_interrupt(0, 0, 0);
+ clock_interrupt(0, 0, 0, 0);
lastnsec = hyp_get_stime();
/* 10ms tick rest */