Module Name: src
Committed By: bouyer
Date: Sun Nov 17 18:14:47 UTC 2013
Modified Files:
src/sys/dev/ic [netbsd-6]: esiop.c
Log Message:
Apply patch, requested by gson in ticket #981:
sys/dev/ic/esiop.c 1.57 via patch
Turn the "siop_intr: I shouldn't be there !" panic message in the
esiop driver into a printf followed by a return from the interrupt
handler. The condition is triggered on some KVM virtual hosts,
apparently harmlessly, and not panicing makes it possible to boot a
NetBSD GENERIC kernel on those hosts. Fixes PR kern/48277.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.14.1 src/sys/dev/ic/esiop.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/dev/ic/esiop.c
diff -u src/sys/dev/ic/esiop.c:1.55 src/sys/dev/ic/esiop.c:1.55.14.1
--- src/sys/dev/ic/esiop.c:1.55 Sat Nov 13 13:52:01 2010
+++ src/sys/dev/ic/esiop.c Sun Nov 17 18:14:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: esiop.c,v 1.55 2010/11/13 13:52:01 uebayasi Exp $ */
+/* $NetBSD: esiop.c,v 1.55.14.1 2013/11/17 18:14:47 bouyer Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -28,7 +28,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.55 2010/11/13 13:52:01 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.55.14.1 2013/11/17 18:14:47 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1100,8 +1100,12 @@ scintr:
}
return 1;
}
- /* We just should't get there */
- panic("siop_intr: I shouldn't be there !");
+ /*
+ * We just should't get there, but on some KVM virtual hosts,
+ * we do - see PR 48277.
+ */
+ printf("esiop_intr: I shouldn't be there !\n");
+ return 1;
end:
/*
