Page MenuHomeFreeBSD

D35646.id108189.diff
No OneTemporary

D35646.id108189.diff

diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -1491,20 +1491,8 @@
case PI_REALTIME:
db_printf("CLK ");
break;
- case PI_AV:
- db_printf("AV ");
- break;
- case PI_TTY:
- db_printf("TTY ");
- break;
- case PI_NET:
- db_printf("NET ");
- break;
- case PI_DISK:
- db_printf("DISK");
- break;
- case PI_DULL:
- db_printf("DULL");
+ case PI_INTR:
+ db_printf("INTR");
break;
default:
if (ih->ih_pri >= PI_SOFT)
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -138,8 +138,8 @@
#define SWI_DELAY 0x2
/*
- * Software interrupt numbers in priority order. The priority determines
- * the priority of the corresponding interrupt thread.
+ * Software interrupt numbers. Historically this was used to determine
+ * the relative priority of SWI ithreads.
*/
#define SWI_TTY 0
#define SWI_NET 1
diff --git a/sys/sys/priority.h b/sys/sys/priority.h
--- a/sys/sys/priority.h
+++ b/sys/sys/priority.h
@@ -85,15 +85,20 @@
#define PRI_MIN_ITHD (PRI_MIN)
#define PRI_MAX_ITHD (PRI_MIN_REALTIME - 1)
+/*
+ * Most hardware interrupt threads run at the same priority, but can
+ * decay to lower priorities if they run for full time slices.
+ */
#define PI_REALTIME (PRI_MIN_ITHD + 0)
-#define PI_AV (PRI_MIN_ITHD + 4)
-#define PI_SOFTCLOCK PI_AV
-#define PI_NET (PRI_MIN_ITHD + 8)
-#define PI_DISK (PRI_MIN_ITHD + 12)
-#define PI_TTY (PRI_MIN_ITHD + 16)
-#define PI_DULL (PRI_MIN_ITHD + 20)
-#define PI_SOFT (PRI_MIN_ITHD + 24)
-#define PI_SWI(x) (PI_SOFT + (x) * RQ_PPQ)
+#define PI_INTR (PRI_MIN_ITHD + 4)
+#define PI_AV PI_INTR
+#define PI_NET PI_INTR
+#define PI_DISK PI_INTR
+#define PI_TTY PI_INTR
+#define PI_DULL PI_INTR
+#define PI_SOFT (PRI_MIN_ITHD + 8)
+#define PI_SOFTCLOCK PI_SOFT
+#define PI_SWI(x) PI_SOFT
#define PRI_MIN_REALTIME (48)
#define PRI_MAX_REALTIME (PRI_MIN_KERN - 1)

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 1:00 AM (17 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32422685
Default Alt Text
D35646.id108189.diff (1 KB)

Event Timeline