[src/netbsd-7]: src/sys/arch/pmax/pmax Pull up the following revisions(s) (re...

[sborrill <sborrill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c81136fe3e40
branches:  netbsd-7
changeset: 445469:c81136fe3e40
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Tue Oct 30 10:17:23 2018 +0000

description:
Pull up the following revisions(s) (requested by tsutsui in ticket #1641):
        sys/arch/pmax/pmax/dec_3min.c:  revision 1.74

Fix hangup after framebuffers are attached on 3MIN.
Addresses PR port-pmax/53611

diffstat:

 sys/arch/pmax/pmax/dec_3min.c |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r e350601d128f -r c81136fe3e40 sys/arch/pmax/pmax/dec_3min.c
--- a/sys/arch/pmax/pmax/dec_3min.c     Tue Oct 30 10:14:55 2018 +0000
+++ b/sys/arch/pmax/pmax/dec_3min.c     Tue Oct 30 10:17:23 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.73 2014/03/24 19:31:40 christos Exp $ */
+/* $NetBSD: dec_3min.c,v 1.73.4.1 2018/10/30 10:17:23 sborrill Exp $ */
 
 /*
  * Copyright (c) 1998 Jonathan Stone.  All rights reserved.
@@ -70,7 +70,7 @@
 #define        __INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.73 2014/03/24 19:31:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.73.4.1 2018/10/30 10:17:23 sborrill Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -292,12 +292,7 @@
        case SYS_DEV_OPT0:
        case SYS_DEV_OPT1:
        case SYS_DEV_OPT2:
-               /* it's an option slot */
-               {
-               int s = splhigh();
-               s |= mask;
-               splx(s);
-               }
+               /* it's an option slot and handled via MIPS_INT_MASK_[012] */
                break;
        default:
                /* it's a baseboard device going via the IOASIC */