diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-01-31 20:59:25 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-01-31 20:59:25 +0100 |
| commit | d77225eb8bcf908d21b4d6b2a731d5701c4fc7a8 (patch) | |
| tree | e110d378f34f909ab5871bf1fc7ccc3ea899f677 | |
| parent | 422ab47d25576587600d093297512d8b6cbec890 (diff) | |
| download | gnumach-d77225eb8bcf908d21b4d6b2a731d5701c4fc7a8.tar.gz gnumach-d77225eb8bcf908d21b4d6b2a731d5701c4fc7a8.tar.bz2 gnumach-d77225eb8bcf908d21b4d6b2a731d5701c4fc7a8.zip | |
Fix other confusions between KERNEL_STACK_SIZE and INTSTACK_SIZE
| -rw-r--r-- | i386/i386at/model_dep.c | 4 | ||||
| -rw-r--r-- | i386/i386at/model_dep.h | 2 | ||||
| -rw-r--r-- | x86_64/locore.S | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index 7a679ba4..fe11bffc 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -135,7 +135,7 @@ extern char version[]; boolean_t rebootflag = FALSE; /* exported to kdintr */ /* Interrupt stack. */ -static char int_stack[KERNEL_STACK_SIZE] __aligned(KERNEL_STACK_SIZE); +static char int_stack[INTSTACK_SIZE] __aligned(INTSTACK_SIZE); #if NCPUS <= 1 vm_offset_t int_stack_top[1], int_stack_base[1]; #endif @@ -553,7 +553,7 @@ i386at_init(void) #endif /* MACH_XEN */ int_stack_base[0] = (vm_offset_t)&int_stack; - int_stack_top[0] = int_stack_base[0] + KERNEL_STACK_SIZE - 4; + int_stack_top[0] = int_stack_base[0] + INTSTACK_SIZE - 4; } /* diff --git a/i386/i386at/model_dep.h b/i386/i386at/model_dep.h index a972695f..df327ca2 100644 --- a/i386/i386at/model_dep.h +++ b/i386/i386at/model_dep.h @@ -28,7 +28,7 @@ extern vm_offset_t int_stack_top[NCPUS], int_stack_base[NCPUS]; /* Check whether P points to the interrupt stack. */ -#define ON_INT_STACK(P) (((P) & ~(KERNEL_STACK_SIZE-1)) == int_stack_base[0]) +#define ON_INT_STACK(P) (((P) & ~(INTSTACK_SIZE-1)) == int_stack_base[0]) extern vm_offset_t timemmap(dev_t dev, vm_offset_t off, vm_prot_t prot); diff --git a/x86_64/locore.S b/x86_64/locore.S index 21a3e373..5b9c8ef4 100644 --- a/x86_64/locore.S +++ b/x86_64/locore.S @@ -556,7 +556,7 @@ trap_from_kernel: movq %rsp,%rbx /* save current stack */ movq %rsp,%rdx /* on an interrupt stack? */ - and $(~(KERNEL_STACK_SIZE-1)),%rdx + and $(~(INTSTACK_SIZE-1)),%rdx cmpq EXT(int_stack_base),%rdx je 1f /* OK if so */ @@ -683,7 +683,7 @@ ENTRY(all_intrs) cld /* clear direction flag */ movq %rsp,%rdx /* on an interrupt stack? */ - and $(~(KERNEL_STACK_SIZE-1)),%rdx + and $(~(INTSTACK_SIZE-1)),%rdx cmpq %ss:EXT(int_stack_base),%rdx je int_from_intstack /* if not: */ |