From e1adc2881bb00edc3ddae9ac6a7ab4f41acc849a Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Tue, 8 Jan 2008 06:30:22 +0000
Subject: [PATCH] Add IPL_SOFT* defined at IPL_NONE. Change _ARM32_INTR_H to
 _ACORN32_INTR_H

---
 sys/arch/acorn32/include/intr.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/sys/arch/acorn32/include/intr.h b/sys/arch/acorn32/include/intr.h
index da4ec7e443fb..ce000b723565 100644
--- a/sys/arch/acorn32/include/intr.h
+++ b/sys/arch/acorn32/include/intr.h
@@ -1,4 +1,4 @@
-/* 	$NetBSD: intr.h,v 1.6 2007/12/03 15:33:02 ad Exp $	*/
+/* 	$NetBSD: intr.h,v 1.7 2008/01/08 06:30:22 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ARM32_INTR_H_
-#define _ARM32_INTR_H_
+#ifndef _ACORN32_INTR_H_
+#define _ACORN32_INTR_H_
 
 /* Define the various Interrupt Priority Levels */
 
@@ -44,7 +44,10 @@
 #define IPL_HIGH	1
 #define	IPL_SCHED	1
 #define	IPL_NONE	2
-
+#define	IPL_SOFTSERIAL	IPL_NONE
+#define	IPL_SOFTNET	IPL_NONE
+#define	IPL_SOFTBIO	IPL_NONE
+#define	IPL_SOFTCLOCK	IPL_NONE
 #define IPL_LEVELS	3
 
 #define	IST_UNUSABLE	-1	/* interrupt cannot be used */
@@ -53,6 +56,7 @@
 #define	IST_EDGE	2	/* edge-triggered */
 #define	IST_LEVEL	3	/* level-triggered */
 
+#ifdef __HAVE_FAST_SOFTINTRS
 /* Software interrupt priority levels */
 
 #define SOFTIRQ_CLOCK	0
@@ -61,8 +65,9 @@
 #define SOFTIRQ_SERIAL	3
 
 #define SOFTIRQ_BIT(x)	(1 << x)
+#endif
 
 #include <machine/irqhandler.h>
 #include <arm/arm32/psl.h>
 
-#endif	/* _ARM32_INTR_H */
+#endif	/* _ACORN32_INTR_H */