diff options
| -rw-r--r-- | sys/arch/octeon/dev/octeon_intr.c | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/xbow/xheart.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/octeon/dev/octeon_intr.c b/sys/arch/octeon/dev/octeon_intr.c index fecaa63d45b..2bcb2047b4f 100644 --- a/sys/arch/octeon/dev/octeon_intr.c +++ b/sys/arch/octeon/dev/octeon_intr.c @@ -151,8 +151,8 @@ octeon_splx(int newipl) ci->ci_ipl = newipl; mips_sync(); __asm__ (".set reorder\n"); - if (CPU_IS_PRIMARY(ci)) - octeon_setintrmask(newipl); + octeon_setintrmask(newipl); + /* If we still have softints pending trigger processing. */ if (ci->ci_softpending != 0 && newipl < IPL_SOFTINT) setsoftintr0(); diff --git a/sys/arch/sgi/xbow/xheart.c b/sys/arch/sgi/xbow/xheart.c index b8aa0bf2378..18c4c485736 100644 --- a/sys/arch/sgi/xbow/xheart.c +++ b/sys/arch/sgi/xbow/xheart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xheart.c,v 1.28 2015/09/08 10:21:50 deraadt Exp $ */ +/* $OpenBSD: xheart.c,v 1.29 2015/09/26 04:37:18 visa Exp $ */ /* * Copyright (c) 2008 Miodrag Vallat. @@ -401,9 +401,7 @@ xheart_splx(int newipl) ci->ci_ipl = newipl; mips_sync(); __asm__ (".set reorder\n"); - - if (CPU_IS_PRIMARY(ci)) - xheart_setintrmask(newipl); + xheart_setintrmask(newipl); /* If we still have softints pending trigger processing. */ if (ci->ci_softpending != 0 && newipl < IPL_SOFTINT) |