summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2016-06-07 06:37:34 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2016-06-07 06:37:34 +0000
commitfc1bec0012e30b11a9be1ae1aef1ff600687a83b (patch)
tree8af32103e4dd09f57bce4a731f9e0d88ebca6eb2
parent1dd226a08b4d876846585f80b2a92a01bf92b8c0 (diff)
remove splsoftfd and splausoft
theyre unused. ok kettenis@
-rw-r--r--sys/arch/sparc64/dev/fd.c3
-rw-r--r--sys/arch/sparc64/include/psl.h12
2 files changed, 2 insertions, 13 deletions
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index 159bc75aea0..f79ec2a59e5 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.45 2014/07/12 18:44:43 tedu Exp $ */
+/* $OpenBSD: fd.c,v 1.46 2016/06/07 06:37:33 dlg Exp $ */
/* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */
/*-
@@ -542,7 +542,6 @@ fdcattach(fdc, pri)
return (-1);
}
- printf(" softpri %d", PIL_FDSOFT);
if (fdc->sc_flags & FDC_NOEJECT)
printf(": manual eject");
printf("\n");
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index 87c9fab80dc..b2397081583 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.29 2016/03/07 13:21:51 naddy Exp $ */
+/* $OpenBSD: psl.h,v 1.30 2016/06/07 06:37:33 dlg Exp $ */
/* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
/*
@@ -46,8 +46,6 @@
/* Interesting spl()s */
#define PIL_SCSI 3
-#define PIL_FDSOFT 4
-#define PIL_AUSOFT 4
#define PIL_BIO 5
#define PIL_VIDEO 5
#define PIL_TTY 6
@@ -402,12 +400,6 @@ SPLHOLD(splsoftint, 1)
#define splsoftclock splsoftint
#define splsoftnet splsoftint
-/* audio software interrupts are at software level 4 */
-SPLHOLD(splausoft, PIL_AUSOFT)
-
-/* floppy software interrupts are at software level 4 too */
-SPLHOLD(splfdsoft, PIL_FDSOFT)
-
/* Block devices */
SPLHOLD(splbio, PIL_BIO)
@@ -447,8 +439,6 @@ SPLHOLD(splhigh, PIL_HIGH)
#define spl0() spl0X(__FILE__, __LINE__)
#define splsoftint() splsoftintX(__FILE__, __LINE__)
-#define splausoft() splausoftX(__FILE__, __LINE__)
-#define splfdsoft() splfdsoftX(__FILE__, __LINE__)
#define splbio() splbioX(__FILE__, __LINE__)
#define splnet() splnetX(__FILE__, __LINE__)
#define spltty() splttyX(__FILE__, __LINE__)