diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2022-11-08 11:40:48 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2022-11-08 11:40:48 +0000 |
| commit | 5abad3f68def18f86eb643ccc9bda4c35fdd3838 (patch) | |
| tree | 214acc20866a2cb852ce0cd80e043f992cd981d7 /sys/arch/arm64 | |
| parent | 533e8b67de77107630186f0c9c34cb1718894695 (diff) | |
Sprinkle some #ifdef MULTIPROCESSOR to make non-MP kernels build again.
Diffstat (limited to 'sys/arch/arm64')
| -rw-r--r-- | sys/arch/arm64/dev/aplintc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/arch/arm64/dev/aplintc.c b/sys/arch/arm64/dev/aplintc.c index 3c60feaa38b..d8c508b7e9d 100644 --- a/sys/arch/arm64/dev/aplintc.c +++ b/sys/arch/arm64/dev/aplintc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aplintc.c,v 1.14 2022/11/07 18:56:20 kettenis Exp $ */ +/* $OpenBSD: aplintc.c,v 1.15 2022/11/08 11:40:47 kettenis Exp $ */ /* * Copyright (c) 2021 Mark Kettenis * @@ -246,7 +246,9 @@ aplintc_attach(struct device *parent, struct device *self, void *aux) sc->sc_ic.ic_barrier = aplintc_intr_barrier; arm_intr_register_fdt(&sc->sc_ic); +#ifdef MULTIPROCESSOR intr_send_ipi_func = aplintc_send_ipi; +#endif if (sc->sc_version == 2) HSET4(sc, AIC2_CONFIG, AIC2_CONFIG_ENABLE); @@ -402,12 +404,14 @@ aplintc_fiq_handler(void *frame) uint64_t reg; int s; +#ifdef MULTIPROCESSOR /* Handle IPIs. */ reg = READ_SPECIALREG(APL_IPI_SR_EL1); if (reg & APL_IPI_SR_EL1_PENDING) { WRITE_SPECIALREG(APL_IPI_SR_EL1, APL_IPI_SR_EL1_PENDING); aplintc_handle_ipi(sc); } +#endif /* Handle timer interrupts. */ reg = READ_SPECIALREG(cntv_ctl_el0); @@ -599,6 +603,8 @@ aplintc_intr_disestablish(void *cookie) free(ih, M_DEVBUF, sizeof(*ih)); } +#ifdef MULTIPROCESSOR + void aplintc_send_ipi(struct cpu_info *ci, int reason) { @@ -642,3 +648,5 @@ aplintc_handle_ipi(struct aplintc_softc *sc) sc->sc_ipi_count.ec_count++; } + +#endif |