Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/apple fix non-MULTIPROCESSOR build



details:   https://anonhg.NetBSD.org/src/rev/dab1a37502fa
branches:  trunk
changeset: 365897:dab1a37502fa
user:      ryo <ryo%NetBSD.org@localhost>
date:      Mon May 02 04:39:29 2022 +0000

description:
fix non-MULTIPROCESSOR build

diffstat:

 sys/arch/arm/apple/apple_intc.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r dbcd7af5d7d7 -r dab1a37502fa sys/arch/arm/apple/apple_intc.c
--- a/sys/arch/arm/apple/apple_intc.c   Sun May 01 23:24:34 2022 +0000
+++ b/sys/arch/arm/apple/apple_intc.c   Mon May 02 04:39:29 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: apple_intc.c,v 1.7 2022/03/28 19:59:26 riastradh Exp $ */
+/* $NetBSD: apple_intc.c,v 1.8 2022/05/02 04:39:29 ryo Exp $ */
 
 /*-
  * Copyright (c) 2021 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -32,7 +32,7 @@
 #define        _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apple_intc.c,v 1.7 2022/03/28 19:59:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_intc.c,v 1.8 2022/05/02 04:39:29 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -503,16 +503,20 @@
                pc->pc_sc = sc;
                pc->pc_cpuid = cpuno;
 
+#ifdef MULTIPROCESSOR
                pic->pic_cpus = ci->ci_kcpuset;
+#endif
                pic->pic_ops = &apple_intc_localpicops;
                pic->pic_maxsources = 2;
                snprintf(pic->pic_name, sizeof(pic->pic_name), "AIC/%lu", cpuno);
 
                pic_add(pic, PIC_IRQBASE_ALLOC);
 
+#ifdef MULTIPROCESSOR
                intr_establish_xname(pic->pic_irqbase + LOCALPIC_SOURCE_IPI,
                    IPL_HIGH, IST_LEVEL | IST_MPSAFE, apple_intc_ipi_handler,
                    pc, "ipi");
+#endif
        }
 
        apple_intc_cpu_init(&sc->sc_pic, curcpu());



Home | Main Index | Thread Index | Old Index