From 12531e89f4ce2bb0c64a63b23bf8963df8d46623 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Tue, 17 Feb 2009 21:04:02 +0000 Subject: Pass a cpu_info * to setsoftipi() so it does not need to curcpu(), which synchronizes the pipeline on 88110. --- sys/arch/m88k/include/cpu.h | 12 ++++++------ sys/arch/mvme88k/mvme88k/m197_machdep.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h index 78fcd755598..c724487f22e 100644 --- a/sys/arch/m88k/include/cpu.h +++ b/sys/arch/m88k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.41 2009/02/16 23:03:31 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.42 2009/02/17 21:03:59 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -244,12 +244,12 @@ struct clockframe { #define SIR_CLOCK 0x02 #define SIR_IPI 0x04 -#define setsoftint(x) atomic_setbits_int(&curcpu()->ci_softintr, x) -#define setsoftnet() setsoftint(SIR_NET) -#define setsoftclock() setsoftint(SIR_CLOCK) -#define setsoftipi() setsoftint(SIR_IPI) +#define setsoftint(ci,x) atomic_setbits_int(&ci->ci_softintr, x) +#define setsoftnet() setsoftint(curcpu(), SIR_NET) +#define setsoftclock() setsoftint(curcpu(), SIR_CLOCK) +#define setsoftipi(ci) setsoftint(ci, SIR_IPI) -#define aston(p) ((p)->p_md.md_astpending = 1) +#define aston(p) ((p)->p_md.md_astpending = 1) /* * This is used during profiling to integrate system time. diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c index 450065ce4ab..4a002ef9d04 100644 --- a/sys/arch/mvme88k/mvme88k/m197_machdep.c +++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m197_machdep.c,v 1.33 2009/02/16 23:03:33 miod Exp $ */ +/* $OpenBSD: m197_machdep.c,v 1.34 2009/02/17 21:04:01 miod Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. @@ -531,7 +531,7 @@ m197_ipi_handler(struct trapframe *eframe) ci->ci_s_sxip = eframe->tf_sxip; ci->ci_s_epsr = eframe->tf_epsr; } - setsoftipi(); + setsoftipi(ci); } /* -- cgit v1.2.3