diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-11-06 21:42:57 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-11-06 21:42:57 +0000 |
| commit | ba416710b9c76049b048214a4d74b14973c2e019 (patch) | |
| tree | 511ee5c2aa536bc5e4527d2c399f3f2594b06b69 /sys/arch/luna88k | |
| parent | 21f8fd673c0b6267dd6bcfd06e73e7cff03acf5d (diff) | |
Remove the now unused idle_u, and call the secondary processors startup
stack a startup stack.
Diffstat (limited to 'sys/arch/luna88k')
| -rw-r--r-- | sys/arch/luna88k/luna88k/locore.S | 19 | ||||
| -rw-r--r-- | sys/arch/luna88k/luna88k/machdep.c | 10 |
2 files changed, 10 insertions, 19 deletions
diff --git a/sys/arch/luna88k/luna88k/locore.S b/sys/arch/luna88k/luna88k/locore.S index 9f8e0ec9a2e..cf53da516a9 100644 --- a/sys/arch/luna88k/luna88k/locore.S +++ b/sys/arch/luna88k/luna88k/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.14 2007/10/10 15:53:52 art Exp $ */ +/* $OpenBSD: locore.S,v 1.15 2007/11/06 21:42:56 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -283,12 +283,9 @@ ASLOCAL(secondary_init) or r31, r31, lo16(_ASM_LABEL(slavestack_end)) ldcr r2, CPU -1: - ld r3, r2, CI_CURPCB - bcnd eq0, r3, 1b - - br.n _C_LABEL(secondary_main) - add r31, r3, USIZE /* switch to idle stack */ + ld r3, r2, CI_INIT_STACK + bsr.n _C_LABEL(secondary_main) + addu r31, r3, USIZE /* switch to startup stack */ #else @@ -338,14 +335,6 @@ ASLOCAL(slavestack_end) #endif /* - * Main processor's idle pcb and stack. - * Should be page aligned. - */ - .align PAGE_SIZE -GLOBAL(idle_u) - space USIZE - -/* * Process 0's u. * Should be page aligned. */ diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c index 5dabd40ea8b..42a7fa8895f 100644 --- a/sys/arch/luna88k/luna88k/machdep.c +++ b/sys/arch/luna88k/luna88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.46 2007/10/13 12:55:21 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.47 2007/11/06 21:42:56 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -791,9 +791,11 @@ secondary_pre_main() /* * Allocate UPAGES contiguous pages for the idle PCB and stack. */ - ci->ci_idle_pcb = (struct pcb *)uvm_km_zalloc(kernel_map, USPACE); - if (ci->ci_idle_pcb == NULL) { - printf("cpu%d: unable to allocate idle stack\n", ci->ci_cpuid); + ci->ci_init_stack = uvm_km_zalloc(kernel_map, USPACE); + if (ci->ci_init_stack == (vaddr_t)NULL) { + printf("cpu%d: unable to allocate startup stack\n", + ci->ci_cpuid); + for (;;) ; } } |