[src/trunk]: src/sys/arch/xen Do not export the 'irq<->vector' abstraction ou...

[cherry <cherry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b122f005c63c
branches:  trunk
changeset: 993920:b122f005c63c
user:      cherry <cherry%NetBSD.org@localhost>
date:      Wed Oct 10 02:34:08 2018 +0000

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

diffstat:

 sys/arch/xen/include/intr.h |  4 +---
 sys/arch/xen/x86/pintr.c    |  6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r 843a329f545b -r b122f005c63c sys/arch/xen/include/intr.h
--- a/sys/arch/xen/include/intr.h       Wed Oct 10 02:16:34 2018 +0000
+++ b/sys/arch/xen/include/intr.h       Wed Oct 10 02:34:08 2018 +0000
@@ -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 @@
 };
 
 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
diff -r 843a329f545b -r b122f005c63c sys/arch/xen/x86/pintr.c
--- a/sys/arch/xen/x86/pintr.c  Wed Oct 10 02:16:34 2018 +0000
+++ b/sys/arch/xen/x86/pintr.c  Wed Oct 10 02:34:08 2018 +0000
@@ -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_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>