From 23f249766d315a7b0a06888fdbabc89aa41953d6 Mon Sep 17 00:00:00 2001 From: visa Date: Sun, 18 Jun 2017 11:05:20 +0000 Subject: [PATCH] Drop unnecessary call to octeon_setintrmask(). The function gets called by the splx() handler. --- sys/arch/octeon/include/intr.h | 3 +-- sys/arch/octeon/octeon/machdep.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arch/octeon/include/intr.h b/sys/arch/octeon/include/intr.h index a6129f9f8fa..0956a02def9 100644 --- a/sys/arch/octeon/include/intr.h +++ b/sys/arch/octeon/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.10 2017/06/11 10:01:23 visa Exp $ */ +/* $OpenBSD: intr.h,v 1.11 2017/06/18 11:05:20 visa Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -188,7 +188,6 @@ void dosoftint(void); #define ENABLEIPI() updateimask(~CR_INT_1) /* enable IPI interrupt level */ #endif void octeon_intr_init(void); -void octeon_setintrmask(int); void *octeon_intr_establish(int, int, int (*)(void *), void *, const char *); void octeon_intr_disestablish(void *); diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index 32098dd6411..ac0f680af45 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.90 2017/06/11 03:35:30 visa Exp $ */ +/* $OpenBSD: machdep.c,v 1.91 2017/06/18 11:05:20 visa Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -910,7 +910,6 @@ hw_cpu_hatch(struct cpu_info *ci) cpuset_add(&cpus_running, ci); octeon_intr_init(); mips64_ipi_init(); - octeon_setintrmask(0); spl0(); (void)updateimask(0); -- 2.20.1