summaryrefslogtreecommitdiff
path: root/debian/patches/fix-xen0001-xen-fix-build.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/fix-xen0001-xen-fix-build.patch')
-rw-r--r--debian/patches/fix-xen0001-xen-fix-build.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/debian/patches/fix-xen0001-xen-fix-build.patch b/debian/patches/fix-xen0001-xen-fix-build.patch
deleted file mode 100644
index 360b09b..0000000
--- a/debian/patches/fix-xen0001-xen-fix-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8f2a4990d1bcd91f399cb519bb800afe136f102f Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@gnupg.org>
-Date: Wed, 20 Apr 2016 15:58:10 +0200
-Subject: [PATCH gnumach 1/2] xen: fix build
-
-* i386/xen/xen.c (hypclock_machine_intr): Fix 'clock_interrupt' call.
-* xen/time.c (clkstart): Likewise.
----
- i386/xen/xen.c | 5 +++--
- xen/time.c | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/i386/xen/xen.c b/i386/xen/xen.c
-index 44d37e6..8b015c4 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 1e9afc8..d483405 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 */
---
-2.1.4
-