Module Name: src Committed By: ryo Date: Mon May 2 04:39:29 UTC 2022
Modified Files: src/sys/arch/arm/apple: apple_intc.c Log Message: fix non-MULTIPROCESSOR build To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/apple/apple_intc.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/arm/apple/apple_intc.c diff -u src/sys/arch/arm/apple/apple_intc.c:1.7 src/sys/arch/arm/apple/apple_intc.c:1.8 --- src/sys/arch/arm/apple/apple_intc.c:1.7 Mon Mar 28 19:59:26 2022 +++ src/sys/arch/arm/apple/apple_intc.c Mon May 2 04:39:29 2022 @@ -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 <jmcne...@invisible.ca> @@ -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 @@ apple_intc_attach(device_t parent, devic 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());