Module Name: src
Committed By: bouyer
Date: Sat Jan 13 20:36:06 UTC 2018
Modified Files:
src/sys/arch/x86/x86: intr.c
Log Message:
Also set ih_realfun/ih_realarg in Xen's intr_establish_xname() as
intr_disestablish() use them.
Should fix the panic at device detach time (esp. at shutdown time).
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/x86/x86/intr.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/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.118 src/sys/arch/x86/x86/intr.c:1.119
--- src/sys/arch/x86/x86/intr.c:1.118 Fri Jan 12 06:24:43 2018
+++ src/sys/arch/x86/x86/intr.c Sat Jan 13 20:36:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.118 2018/01/12 06:24:43 maxv Exp $ */
+/* $NetBSD: intr.c,v 1.119 2018/01/13 20:36:06 bouyer Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.118 2018/01/12 06:24:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.119 2018/01/13 20:36:06 bouyer Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -1248,8 +1248,8 @@ intr_establish_xname(int legacy_irq, str
* et. al. and unify with x86/intr.c
*/
rih->ih_pin = pin; /* port */
- rih->ih_fun = handler;
- rih->ih_arg = arg;
+ rih->ih_fun = rih->ih_realfun = handler;
+ rih->ih_arg = rih->ih_realarg = arg;
rih->pic_type = pic->pic_type;
return rih;
} /* Else we assume pintr */
