Module Name: src
Committed By: skrll
Date: Tue Jan 7 10:20:07 UTC 2020
Modified Files:
src/sys/arch/arm/fdt: pcihost_fdt.c
src/sys/arch/arm/nvidia: tegra_pcie.c
src/sys/arch/arm/sunxi: sunxi_intc.c sunxi_nmi.c
Log Message:
Fix arm __HAVE_PREEMPTION build
__HAVE_PREEMPTION requires TPIDRPRW_IS_CURLWP and curcpu is defined as
#define curcpu() lwp_getcpu(_curlwp())
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/fdt/pcihost_fdt.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/nvidia/tegra_pcie.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_intc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sunxi_nmi.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/fdt/pcihost_fdt.c
diff -u src/sys/arch/arm/fdt/pcihost_fdt.c:1.14 src/sys/arch/arm/fdt/pcihost_fdt.c:1.15
--- src/sys/arch/arm/fdt/pcihost_fdt.c:1.14 Tue Jan 7 10:01:09 2020
+++ src/sys/arch/arm/fdt/pcihost_fdt.c Tue Jan 7 10:20:07 2020
@@ -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 <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__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 <sys/param.h>
@@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.
#include <sys/intr.h>
#include <sys/kernel.h>
#include <sys/kmem.h>
+#include <sys/lwp.h>
#include <sys/mutex.h>
#include <sys/queue.h>
#include <sys/systm.h>
Index: src/sys/arch/arm/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.28 src/sys/arch/arm/nvidia/tegra_pcie.c:1.29
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.28 Tue Jan 7 09:57:11 2020
+++ src/sys/arch/arm/nvidia/tegra_pcie.c Tue Jan 7 10:20:07 2020
@@ -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 <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__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 <sys/param.h>
@@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c
#include <sys/intr.h>
#include <sys/kmem.h>
#include <sys/kernel.h>
+#include <sys/lwp.h>
#include <sys/mutex.h>
#include <sys/queue.h>
#include <sys/systm.h>
Index: src/sys/arch/arm/sunxi/sunxi_intc.c
diff -u src/sys/arch/arm/sunxi/sunxi_intc.c:1.4 src/sys/arch/arm/sunxi/sunxi_intc.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_intc.c:1.4 Tue Jan 7 09:57:11 2020
+++ src/sys/arch/arm/sunxi/sunxi_intc.c Tue Jan 7 10:20:07 2020
@@ -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 <[email protected]>
@@ -29,13 +29,14 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/bus.h>
#include <sys/device.h>
#include <sys/intr.h>
#include <sys/kernel.h>
+#include <sys/lwp.h>
#include <sys/systm.h>
#include <dev/fdt/fdtvar.h>
Index: src/sys/arch/arm/sunxi/sunxi_nmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_nmi.c:1.3 src/sys/arch/arm/sunxi/sunxi_nmi.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_nmi.c:1.3 Tue Jan 7 09:57:11 2020
+++ src/sys/arch/arm/sunxi/sunxi_nmi.c Tue Jan 7 10:20:07 2020
@@ -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 <[email protected]>
@@ -29,7 +29,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/bus.h>
@@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,
#include <sys/intr.h>
#include <sys/kernel.h>
#include <sys/systm.h>
+#include <sys/lwp.h>
#include <dev/fdt/fdtvar.h>
