Module Name: src
Committed By: riastradh
Date: Sat Nov 11 17:26:51 UTC 2017
Modified Files:
src/sys/arch/x86/x86: intr.c
Log Message:
Pass xname through Xen intr_establish_xname to event_set_handler.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 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.108 src/sys/arch/x86/x86/intr.c:1.109
--- src/sys/arch/x86/x86/intr.c:1.108 Sat Nov 11 07:52:41 2017
+++ src/sys/arch/x86/x86/intr.c Sat Nov 11 17:26:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.108 2017/11/11 07:52:41 riastradh Exp $ */
+/* $NetBSD: intr.c,v 1.109 2017/11/11 17:26:51 riastradh 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.108 2017/11/11 07:52:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.109 2017/11/11 17:26:51 riastradh Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -1209,24 +1209,24 @@ intr_num_handlers(struct intrsource *isp
#else /* XEN */
void *
-intr_establish_xname(int legacy_irq, struct pic *pic, int pin,
+intr_establish(int legacy_irq, struct pic *pic, int pin,
int type, int level, int (*handler)(void *) , void *arg,
- bool known_mpsafe, const char *xname)
+ bool known_mpsafe)
{
- /* XXX xname registration not supported */
- return intr_establish(legacy_irq, pic, pin, type, level, handler, arg,
- known_mpsafe);
+
+ return intr_establish_xname(legacy_irq, pic, pin, type, level,
+ handler, arg, known_mpsafe, "XEN");
}
void *
-intr_establish(int legacy_irq, struct pic *pic, int pin,
+intr_establish_xname(int legacy_irq, struct pic *pic, int pin,
int type, int level, int (*handler)(void *) , void *arg,
- bool known_mpsafe)
+ bool known_mpsafe, const char *xname)
{
if (pic->pic_type == PIC_XEN) {
struct intrhand *rih;
- event_set_handler(pin, handler,
- arg, level, "XEN");
+
+ event_set_handler(pin, handler, arg, level, xname);
rih = kmem_zalloc(sizeof(struct intrhand),
cold ? KM_NOSLEEP : KM_SLEEP);
