diff options
author | AlmuHS <liberamenso10000@gmail.com> | 2018-07-09 20:06:26 +0200 |
---|---|---|
committer | AlmuHS <liberamenso10000@gmail.com> | 2018-07-09 20:06:26 +0200 |
commit | 06b332080f20ce711cc4d784856bf975d6e5ea39 (patch) | |
tree | 71debff2912e98f6aaed4d16594ece98b9d51590 /i386/i386/mp_desc.c | |
parent | 9391ebda4f1ece885fe9fe66ada6c4fdecc94e84 (diff) |
try to fix conflict
Diffstat (limited to 'i386/i386/mp_desc.c')
-rw-r--r-- | i386/i386/mp_desc.c | 3 |
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. */ |