From a63fc81055abbcdcb4ef50d56c1405cc92937d8b Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Thu, 22 Oct 2009 20:39:18 +0000 Subject: The recent cleanups make blatantly visible that the pending_int handler does almost exactly what splx() is doing if ipending is zero, and triggers soft interrupts as well. So don't bother checking for ipending in splx, and always invoke pending_int, which gets renamed as splx_handler for consistency. --- sys/arch/sgi/localbus/macebus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/arch/sgi/localbus/macebus.c') diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c index e83e04d7907..7c818d0347c 100644 --- a/sys/arch/sgi/localbus/macebus.c +++ b/sys/arch/sgi/localbus/macebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.c,v 1.47 2009/10/22 20:10:46 miod Exp $ */ +/* $OpenBSD: macebus.c,v 1.48 2009/10/22 20:39:17 miod Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -54,7 +54,7 @@ int macebusprint(void *, const char *); int macebussearch(struct device *, void *, void *); void macebus_intr_makemasks(void); -void macebus_do_pending_int(int); +void macebus_splx(int); uint32_t macebus_iointr(uint32_t, struct trap_frame *); uint32_t macebus_aux(uint32_t, struct trap_frame *); @@ -252,7 +252,7 @@ macebusattach(struct device *parent, struct device *self, void *aux) * handler. Register all except clock. */ set_intr(INTPRI_MACEIO, CR_INT_0, macebus_iointr); - register_pending_int_handler(macebus_do_pending_int); + register_splx_handler(macebus_splx); /* Set up a handler called when clock interrupts go off. */ set_intr(INTPRI_MACEAUX, CR_INT_5, macebus_aux); @@ -592,7 +592,7 @@ macebus_intr_makemasks(void) } void -macebus_do_pending_int(int newcpl) +macebus_splx(int newcpl) { struct cpu_info *ci = curcpu(); -- cgit v1.2.3