Module Name: src
Committed By: cherry
Date: Wed Oct 10 02:34:08 UTC 2018
Modified Files:
src/sys/arch/xen/include: intr.h
src/sys/arch/xen/x86: pintr.c
Log Message:
Do not export the 'irq<->vector' abstraction outside of pintr.c
anymore. We now think of them as a unified thing called 'gsi',
which is generated by mpacpi/mpbios
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/xen/include/intr.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/x86/pintr.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/include/intr.h
diff -u src/sys/arch/xen/include/intr.h:1.48 src/sys/arch/xen/include/intr.h:1.49
--- src/sys/arch/xen/include/intr.h:1.48 Sun Oct 7 05:23:01 2018
+++ src/sys/arch/xen/include/intr.h Wed Oct 10 02:34:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.48 2018/10/07 05:23:01 cherry Exp $ */
+/* $NetBSD: intr.h,v 1.49 2018/10/10 02:34:08 cherry Exp $ */
/* NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp */
/*-
@@ -62,8 +62,6 @@ struct evtsource {
};
extern struct intrstub xenev_stubs[];
-extern int irq2vect[256];
-extern int vect2irq[256];
extern int irq2port[NR_EVENT_CHANNELS]; /* actually port + 1, so that 0 is invaid */
#ifdef MULTIPROCESSOR
Index: src/sys/arch/xen/x86/pintr.c
diff -u src/sys/arch/xen/x86/pintr.c:1.8 src/sys/arch/xen/x86/pintr.c:1.9
--- src/sys/arch/xen/x86/pintr.c:1.8 Wed Oct 10 02:16:34 2018
+++ src/sys/arch/xen/x86/pintr.c Wed Oct 10 02:34:08 2018
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.8 2018/10/10 02:16:34 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.9 2018/10/10 02:34:08 cherry Exp $");
#include "opt_multiprocessor.h"
#include "opt_xen.h"
@@ -143,8 +143,8 @@ struct intrstub x2apic_edge_stubs[MAX_IN
struct intrstub x2apic_level_stubs[MAX_INTR_SOURCES] = {{0,0}};
#include <machine/i82093var.h>
int irq2port[NR_EVENT_CHANNELS] = {0}; /* actually port + 1, so that 0 is invaid */
-int irq2vect[256] = {0};
-int vect2irq[256] = {0};
+static int irq2vect[256] = {0};
+static int vect2irq[256] = {0};
#endif /* NIOAPIC */
#if NACPICA > 0
#include <machine/mpconfig.h>
