Module Name: src
Committed By: cegger
Date: Tue Jun 9 16:08:00 UTC 2009
Modified Files:
src/sys/arch/xen/xen: xencons.c
Log Message:
Fix crash on Dom0 resume.
A xencons interrupt may occur before xencons device has been resumed.
Fix tested in jym-xensuspend branch.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/xen/xen/xencons.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/arch/xen/xen/xencons.c
diff -u src/sys/arch/xen/xen/xencons.c:1.31 src/sys/arch/xen/xen/xencons.c:1.32
--- src/sys/arch/xen/xen/xencons.c:1.31 Fri Jan 16 20:16:47 2009
+++ src/sys/arch/xen/xen/xencons.c Tue Jun 9 16:08:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xencons.c,v 1.31 2009/01/16 20:16:47 jym Exp $ */
+/* $NetBSD: xencons.c,v 1.32 2009/06/09 16:08:00 cegger Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.31 2009/01/16 20:16:47 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.32 2009/06/09 16:08:00 cegger Exp $");
#include "opt_xen.h"
@@ -559,6 +559,10 @@
int len;
struct xencons_softc *sc = p;
+ if (sc == NULL)
+ /* Interrupt may happen during resume */
+ return 1;
+
if (sc->polling)
return 1;
