diff options
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/dev/cpu.c | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/locore.S | 8 |
2 files changed, 4 insertions, 14 deletions
diff --git a/sys/arch/hppa/dev/cpu.c b/sys/arch/hppa/dev/cpu.c index 777bbd44587..35801a4b8c2 100644 --- a/sys/arch/hppa/dev/cpu.c +++ b/sys/arch/hppa/dev/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.46 2023/08/29 16:19:34 claudio Exp $ */ +/* $OpenBSD: cpu.c,v 1.47 2023/10/24 13:20:09 claudio Exp $ */ /* * Copyright (c) 1998-2003 Michael Shalayeff @@ -243,7 +243,6 @@ void cpu_hatch(void) { struct cpu_info *ci = curcpu(); - int s; /* Initialise IPIs. */ hppa_ipi_init(ci); @@ -263,12 +262,7 @@ cpu_hatch(void) while (!start_secondary_cpu) ; - s = splhigh(); - nanouptime(&ci->ci_schedstate.spc_runtime); - splx(s); - - SCHED_LOCK(s); - cpu_switchto(NULL, sched_chooseproc()); + sched_toidle(); } void diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S index a9963b380ee..068440760e1 100644 --- a/sys/arch/hppa/hppa/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.204 2022/10/25 15:15:38 guenther Exp $ */ +/* $OpenBSD: locore.S,v 1.205 2023/10/24 13:20:10 claudio Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -2697,16 +2697,12 @@ EXIT(cpu_idle_leave) ENTRY(proc_trampoline,0) copy r0, r3 -#ifdef MULTIPROCESSOR copy t4, r5 copy arg0, r4 - bl proc_trampoline_mp, rp + bl proc_trampoline_mi, rp nop copy r4, arg0 copy r5, t4 -#endif - mfctl cr29, t1 - stw r0, CI_CPL(t1) .call blr r0, rp bv,n r0(t4) |