Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm Fix arm __HAVE_PREEMPTION build



details:   https://anonhg.NetBSD.org/src/rev/1fa6114f63c6
branches:  trunk
changeset: 968224:1fa6114f63c6
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Jan 07 10:20:07 2020 +0000

description:
Fix arm __HAVE_PREEMPTION build

__HAVE_PREEMPTION requires TPIDRPRW_IS_CURLWP and curcpu is defined as

#define curcpu()        lwp_getcpu(_curlwp())

diffstat:

 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(-)

diffs (103 lines):

diff -r c0640eddcdbf -r 1fa6114f63c6 sys/arch/arm/fdt/pcihost_fdt.c
--- a/sys/arch/arm/fdt/pcihost_fdt.c    Tue Jan 07 10:01:09 2020 +0000
+++ b/sys/arch/arm/fdt/pcihost_fdt.c    Tue Jan 07 10:20:07 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 #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>
diff -r c0640eddcdbf -r 1fa6114f63c6 sys/arch/arm/nvidia/tegra_pcie.c
--- a/sys/arch/arm/nvidia/tegra_pcie.c  Tue Jan 07 10:01:09 2020 +0000
+++ b/sys/arch/arm/nvidia/tegra_pcie.c  Tue Jan 07 10:20:07 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 #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>
diff -r c0640eddcdbf -r 1fa6114f63c6 sys/arch/arm/sunxi/sunxi_intc.c
--- a/sys/arch/arm/sunxi/sunxi_intc.c   Tue Jan 07 10:01:09 2020 +0000
+++ b/sys/arch/arm/sunxi/sunxi_intc.c   Tue Jan 07 10:20:07 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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>
diff -r c0640eddcdbf -r 1fa6114f63c6 sys/arch/arm/sunxi/sunxi_nmi.c
--- a/sys/arch/arm/sunxi/sunxi_nmi.c    Tue Jan 07 10:01:09 2020 +0000
+++ b/sys/arch/arm/sunxi/sunxi_nmi.c    Tue Jan 07 10:20:07 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/lwp.h>
 
 #include <dev/fdt/fdtvar.h>
 



Home | Main Index | Thread Index | Old Index