From 58bc939070c85789fc5784c924a602507d8980ff Mon Sep 17 00:00:00 2001 From: skrll Date: Tue, 7 Jan 2020 10:20:07 +0000 Subject: [PATCH] Fix arm __HAVE_PREEMPTION build __HAVE_PREEMPTION requires TPIDRPRW_IS_CURLWP and curcpu is defined as #define curcpu() lwp_getcpu(_curlwp()) --- sys/arch/arm/fdt/pcihost_fdt.c | 5 +++-- sys/arch/arm/nvidia/tegra_pcie.c | 5 +++-- sys/arch/arm/sunxi/sunxi_intc.c | 5 +++-- sys/arch/arm/sunxi/sunxi_nmi.c | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/arch/arm/fdt/pcihost_fdt.c b/sys/arch/arm/fdt/pcihost_fdt.c index 8af84955373d..e9c87222c629 100644 --- a/sys/arch/arm/fdt/pcihost_fdt.c +++ b/sys/arch/arm/fdt/pcihost_fdt.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcihost_fdt.c,v 1.14 2020/01/07 10:01:09 skrll Exp $ */ +/* $NetBSD: pcihost_fdt.c,v 1.15 2020/01/07 10:20:07 skrll Exp $ */ /*- * Copyright (c) 2018 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.14 2020/01/07 10:01:09 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.15 2020/01/07 10:20:07 skrll Exp $"); #include @@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.14 2020/01/07 10:01:09 skrll Exp $ #include #include #include +#include #include #include #include diff --git a/sys/arch/arm/nvidia/tegra_pcie.c b/sys/arch/arm/nvidia/tegra_pcie.c index 1d15d259cbb9..b31ee7ff0733 100644 --- a/sys/arch/arm/nvidia/tegra_pcie.c +++ b/sys/arch/arm/nvidia/tegra_pcie.c @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_pcie.c,v 1.28 2020/01/07 09:57:11 skrll Exp $ */ +/* $NetBSD: tegra_pcie.c,v 1.29 2020/01/07 10:20:07 skrll Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.28 2020/01/07 09:57:11 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.29 2020/01/07 10:20:07 skrll Exp $"); #include @@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.28 2020/01/07 09:57:11 skrll Exp $" #include #include #include +#include #include #include #include diff --git a/sys/arch/arm/sunxi/sunxi_intc.c b/sys/arch/arm/sunxi/sunxi_intc.c index c7ab808bd850..a311c01fb99c 100644 --- a/sys/arch/arm/sunxi/sunxi_intc.c +++ b/sys/arch/arm/sunxi/sunxi_intc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_intc.c,v 1.4 2020/01/07 09:57:11 skrll Exp $ */ +/* $NetBSD: sunxi_intc.c,v 1.5 2020/01/07 10:20:07 skrll Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -29,13 +29,14 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: sunxi_intc.c,v 1.4 2020/01/07 09:57:11 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_intc.c,v 1.5 2020/01/07 10:20:07 skrll Exp $"); #include #include #include #include #include +#include #include #include diff --git a/sys/arch/arm/sunxi/sunxi_nmi.c b/sys/arch/arm/sunxi/sunxi_nmi.c index dff0c6da2411..d5648e009481 100644 --- a/sys/arch/arm/sunxi/sunxi_nmi.c +++ b/sys/arch/arm/sunxi/sunxi_nmi.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_nmi.c,v 1.3 2020/01/07 09:57:11 skrll Exp $ */ +/* $NetBSD: sunxi_nmi.c,v 1.4 2020/01/07 10:20:07 skrll Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -29,7 +29,7 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.3 2020/01/07 09:57:11 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.4 2020/01/07 10:20:07 skrll Exp $"); #include #include @@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.3 2020/01/07 09:57:11 skrll Exp $"); #include #include #include +#include #include