Module Name: src
Committed By: martin
Date: Sun Sep 23 17:51:09 UTC 2018
Modified Files:
src/sys/arch/pmax/pmax [netbsd-8]: dec_3min.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.22.1 src/sys/arch/pmax/pmax/dec_3min.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/pmax/pmax/dec_3min.c
diff -u src/sys/arch/pmax/pmax/dec_3min.c:1.73 src/sys/arch/pmax/pmax/dec_3min.c:1.73.22.1
--- src/sys/arch/pmax/pmax/dec_3min.c:1.73 Mon Mar 24 19:31:40 2014
+++ src/sys/arch/pmax/pmax/dec_3min.c Sun Sep 23 17:51:09 2018
@@ -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 @@ dec_3min_intr_establish(device_t dev, vo
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 */
