summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlmuHS <liberamenso10000@gmail.com>2018-07-09 20:48:31 +0200
committerAlmuHS <liberamenso10000@gmail.com>2018-07-09 20:48:31 +0200
commit03345510f21173053b4ecc5a7b17c5085c0ae463 (patch)
treee260c2703270e840e81696440f6744f5cf8d7fae
parent06b332080f20ce711cc4d784856bf975d6e5ea39 (diff)
try to fix conflict0.0.1-10.0.1
-rw-r--r--i386/i386/mp_desc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/i386/i386/mp_desc.c b/i386/i386/mp_desc.c
index 78e29fcc..0cbba655 100644
--- a/i386/i386/mp_desc.c
+++ b/i386/i386/mp_desc.c
@@ -53,14 +53,11 @@
* than any thread`s kernel stack.
*/
-#undef interrupt_stack
-#undef int_stack_top
-
/*
* Addresses of bottom and top of interrupt stacks.
*/
vm_offset_t interrupt_stack[NCPUS];
-vm_offset_t int_stack_top[NCPUS];
+vm_offset_t _int_stack_top[NCPUS];
/*
* Barrier address.
@@ -282,11 +279,11 @@ interrupt_stack_alloc(void)
for (i = 0; i < NCPUS; i++) {
if (i == master_cpu) {
interrupt_stack[i] = (vm_offset_t) intstack;
- int_stack_top[i] = (vm_offset_t) eintstack;
+ _int_stack_top[i] = (vm_offset_t) eintstack;
}
else if (machine_slot[i].is_cpu) {
interrupt_stack[i] = stack_start;
- int_stack_top[i] = stack_start + INTSTACK_SIZE;
+ _int_stack_top[i] = stack_start + INTSTACK_SIZE;
stack_start += INTSTACK_SIZE;
}