Module Name: src
Committed By: nonaka
Date: Tue May 23 03:18:40 UTC 2017
Modified Files:
src/sys/arch/x86/include: i82093var.h
src/sys/arch/x86/x86: mpbios.c
Log Message:
x86: No ioapic_softc.sc_apicid is used anymore. Use
ioapic_softc.sc_pic.pic_apicid.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/include/i82093var.h
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x86/x86/mpbios.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/include/i82093var.h
diff -u src/sys/arch/x86/include/i82093var.h:1.14 src/sys/arch/x86/include/i82093var.h:1.15
--- src/sys/arch/x86/include/i82093var.h:1.14 Mon Apr 27 07:03:58 2015
+++ src/sys/arch/x86/include/i82093var.h Tue May 23 03:18:40 2017
@@ -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 @@ struct ioapic_softc {
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*/
Index: src/sys/arch/x86/x86/mpbios.c
diff -u src/sys/arch/x86/x86/mpbios.c:1.65 src/sys/arch/x86/x86/mpbios.c:1.66
--- src/sys/arch/x86/x86/mpbios.c:1.65 Fri Jul 17 06:41:18 2015
+++ src/sys/arch/x86/x86/mpbios.c Tue May 23 03:18:40 2017
@@ -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 @@ mpbios_scan(device_t self, int *ncpup)
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++]);
}
