[src/trunk]: src/sys/arch/x86 x86: No ioapic_softc.sc_apicid is used anymore....

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

details:   https://anonhg.NetBSD.org/src/rev/7501953ae0fd
branches:  trunk
changeset: 824089:7501953ae0fd
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Tue May 23 03:18:40 2017 +0000

description:
x86: No ioapic_softc.sc_apicid is used anymore. Use ioapic_softc.sc_pic.pic_apicid.

diffstat:

 sys/arch/x86/include/i82093var.h |  3 +--
 sys/arch/x86/x86/mpbios.c        |  6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r ff4eff0b94a3 -r 7501953ae0fd sys/arch/x86/include/i82093var.h
--- a/sys/arch/x86/include/i82093var.h  Tue May 23 03:13:52 2017 +0000
+++ b/sys/arch/x86/include/i82093var.h  Tue May 23 03:18:40 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i82093var.h,v 1.14 2015/04/27 07:03:58 knakahara Exp $ */
+/* $NetBSD: i82093var.h,v 1.15 2017/05/23 03:18:40 nonaka Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
        device_t                sc_dev;
        struct pic              sc_pic;
        struct ioapic_softc     *sc_next;
-       int                     sc_apicid;
        int                     sc_apic_vers;
        int                     sc_apic_vecbase; /* global int base if ACPI */
        int                     sc_apic_sz;     /* apic size*/
diff -r ff4eff0b94a3 -r 7501953ae0fd sys/arch/x86/x86/mpbios.c
--- a/sys/arch/x86/x86/mpbios.c Tue May 23 03:13:52 2017 +0000
+++ b/sys/arch/x86/x86/mpbios.c Tue May 23 03:18:40 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpbios.c,v 1.65 2015/07/17 06:41:18 msaitoh Exp $      */
+/*     $NetBSD: mpbios.c,v 1.66 2017/05/23 03:18:40 nonaka Exp $       */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.65 2015/07/17 06:41:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.66 2017/05/23 03:18:40 nonaka Exp $");
 
 #include "acpica.h"
 #include "lapic.h"
@@ -752,7 +752,7 @@
                                        struct ioapic_softc *sc;
                                        for (sc = ioapics ; sc != NULL;
                                             sc = sc->sc_next) {
-                                               ie.dst_apic_id = sc->sc_apicid;
+                                               ie.dst_apic_id = sc->sc_pic.pic_apicid;
                                                mpbios_int((char *)&ie, type,
                                                    &mp_intrs[cur_intr++]);
                                        }