[src/netbsd-8]: src/sys/arch/pmax/pmax Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/aa46743fbe7c
branches:  netbsd-8
changeset: 852007:aa46743fbe7c
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 23 17:51:09 2018 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1033):

        sys/arch/pmax/pmax/dec_3min.c: revision 1.74

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

Ok'ed by mrg@.  Should be pulled up to netbsd-7 and netbsd-8.

diffstat:

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

diffs (32 lines):

diff -r b5c227f70271 -r aa46743fbe7c sys/arch/pmax/pmax/dec_3min.c
--- a/sys/arch/pmax/pmax/dec_3min.c     Sun Sep 23 17:49:12 2018 +0000
+++ b/sys/arch/pmax/pmax/dec_3min.c     Sun Sep 23 17:51:09 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.22.1 2018/09/23 17:51:09 martin 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.22.1 2018/09/23 17:51:09 martin 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 */