3 files changed, 0 insertions, 88 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
-
diff --git a/debian/patches/fix-xen0002-Fix-type-of-program-counter-argument.patch b/debian/patches/fix-xen0002-Fix-type-of-program-counter-argument.patch
deleted file mode 100644
index a681b75..0000000
--- a/debian/patches/fix-xen0002-Fix-type-of-program-counter-argument.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cd7e689dae440befd8d663d15fff755464709625 Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@gnupg.org>
-Date: Wed, 20 Apr 2016 16:12:26 +0200
-Subject: [PATCH gnumach 2/2] Fix type of program counter argument
-
-* i386/i386/hardclock.c (hardclock): Use '0' instead of 'NULL'.
-* vm/vm_fault (vm_fault_cleanup): Likewise.
----
- i386/i386/hardclock.c | 2 +-
- vm/vm_fault.c         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/i386/i386/hardclock.c b/i386/i386/hardclock.c
-index 0ce6f38..82761ec 100644
---- a/i386/i386/hardclock.c
-+++ b/i386/i386/hardclock.c
-@@ -74,7 +74,7 @@ hardclock(iunit,        old_ipl, irq, ret_addr, regs)
- 	    clock_interrupt(tick,			/* usec per tick */
- 			    FALSE,			/* kernel mode */
- 			    FALSE,			/* not SPL0 */
--			    NULL);			/* interrupted eip */
-+			    0);				/* interrupted eip */
- 
- #ifdef LINUX_DEV
- 	linux_timer_intr();
-diff --git a/vm/vm_fault.c b/vm/vm_fault.c
-index e61a223..68afc59 100644
---- a/vm/vm_fault.c
-+++ b/vm/vm_fault.c
-@@ -154,7 +154,7 @@ vm_fault_cleanup(
-       thread_t _thread_ = current_thread(); \
-  \
-       if (_thread_ != THREAD_NULL) \
--	  take_pc_sample_macro(_thread_, (flavor), 1, NULL); \
-+	  take_pc_sample_macro(_thread_, (flavor), 1, 0); \
-     MACRO_END
- 
- #else
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 6114587..cfe9db5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,3 @@ sysenter0001-yyy-sysenter-prototype.patch
 
 700001-70_new_dde.patch.patch
 700002-Port-Samuels-fix.patch
-fix-xen0001-xen-fix-build.patch
-fix-xen0002-Fix-type-of-program-counter-argument.patch