From 06b332080f20ce711cc4d784856bf975d6e5ea39 Mon Sep 17 00:00:00 2001
From: AlmuHS <liberamenso10000@gmail.com>
Date: Mon, 9 Jul 2018 20:06:26 +0200
Subject: try to fix conflict

---
 i386/i386/mp_desc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/i386/i386/mp_desc.c b/i386/i386/mp_desc.c
index 497cb304..78e29fcc 100644
--- a/i386/i386/mp_desc.c
+++ b/i386/i386/mp_desc.c
@@ -53,6 +53,9 @@
  * than any thread`s kernel stack.
  */
 
+#undef interrupt_stack
+#undef int_stack_top
+
 /*
  * Addresses of bottom and top of interrupt stacks.
  */
-- 
cgit v1.2.3