summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlmuHS <liberamenso10000@gmail.com>2018-07-09 20:06:26 +0200
committerAlmuHS <liberamenso10000@gmail.com>2018-07-09 20:06:26 +0200
commit06b332080f20ce711cc4d784856bf975d6e5ea39 (patch)
tree71debff2912e98f6aaed4d16594ece98b9d51590
parent9391ebda4f1ece885fe9fe66ada6c4fdecc94e84 (diff)
try to fix conflict
-rw-r--r--i386/i386/mp_desc.c3
1 files changed, 3 insertions, 0 deletions
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.
*/