Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/x86 Also set ih_realfun/ih_realarg in Xen's int...



details:   https://anonhg.NetBSD.org/src/rev/9c78e550eec0
branches:  trunk
changeset: 828994:9c78e550eec0
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Jan 13 20:36:06 2018 +0000

description:
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).

diffstat:

 sys/arch/x86/x86/intr.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r f048db51ba8f -r 9c78e550eec0 sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Sat Jan 13 19:57:35 2018 +0000
+++ b/sys/arch/x86/x86/intr.c   Sat Jan 13 20:36:06 2018 +0000
@@ -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 @@
                 * 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 */



Home | Main Index | Thread Index | Old Index