Page MenuHomeFreeBSD
Files F140115990

D35527.id107201.diff
No OneTemporary
Actions

D35527.id107201.diff
View Options

Index: sys/powerpc/powerpc/intr_machdep.c
===================================================================
--- sys/powerpc/powerpc/intr_machdep.c
+++ sys/powerpc/powerpc/intr_machdep.c
@@ -89,8 +89,6 @@
#include "pic_if.h"
-#define MAX_STRAY_LOG 5
-
static MALLOC_DEFINE(M_INTR, "intr", "interrupt handler data");
struct powerpc_intr {
@@ -662,7 +660,7 @@
stray:
stray_count++;
- if (stray_count <= MAX_STRAY_LOG) {
+ if (stray_count <= INTR_STRAY_LOG_MAX) {
printf("stray irq %d\n", i ? i->irq : -1);
if (stray_count >= MAX_STRAY_LOG) {
printf("got %d stray interrupts, not logging anymore\n",
Index: sys/sys/interrupt.h
===================================================================
--- sys/sys/interrupt.h
+++ sys/sys/interrupt.h
@@ -150,6 +150,9 @@
#define SWI_TQ 6
#define SWI_TQ_GIANT 6
+/* Maximum number of stray interrupts to log */
+#define INTR_STRAY_LOG_MAX 5
+
struct proc;
extern struct intr_event *clk_intr_event;
Index: sys/x86/x86/intr_machdep.c
===================================================================
--- sys/x86/x86/intr_machdep.c
+++ sys/x86/x86/intr_machdep.c
@@ -74,8 +74,6 @@
#include <vm/vm.h>
-#define MAX_STRAY_LOG 5
-
typedef void (*mask_fn)(void *);
static int intrcnt_index;
@@ -348,7 +346,7 @@
if (intr_event_handle(ie, frame) != 0) {
isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
(*isrc->is_straycount)++;
- if (*isrc->is_straycount < MAX_STRAY_LOG)
+ if (*isrc->is_straycount < INTR_STRAY_LOG_MAX)
log(LOG_ERR, "stray irq%d\n", vector);
else if (*isrc->is_straycount == MAX_STRAY_LOG)
log(LOG_CRIT,

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 11:03 AM (12 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27111942
Default Alt Text
D35527.id107201.diff (1 KB)

Event Timeline