[src/trunk]: src/sys/arch/arm Use sys/cpu.h so that curcpu defined in terms o...

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/18b46b39d980
branches:  trunk
changeset: 1011047:18b46b39d980
user:      ad <ad%NetBSD.org@localhost>
date:      Mon Jun 15 18:57:39 2020 +0000

description:
Use sys/cpu.h so that curcpu defined in terms of curlwp->l_cpu works too.

diffstat:

 sys/arch/arm/acpi/acpi_pci_graviton.c        |   9 ++++-----
 sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c |   7 +++----
 sys/arch/arm/acpi/acpi_pci_machdep.c         |   9 ++++-----
 sys/arch/arm/acpi/acpi_pci_n1sdp.c           |   7 +++----
 sys/arch/arm/acpi/acpipchb.c                 |   7 +++----
 sys/arch/arm/imx/imxgpio.c                   |  10 +++++-----
 6 files changed, 22 insertions(+), 27 deletions(-)

diffs (181 lines):

diff -r 0d8d78860e8f -r 18b46b39d980 sys/arch/arm/acpi/acpi_pci_graviton.c
--- a/sys/arch/arm/acpi/acpi_pci_graviton.c     Mon Jun 15 18:44:10 2020 +0000
+++ b/sys/arch/arm/acpi/acpi_pci_graviton.c     Mon Jun 15 18:57:39 2020 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: acpi_pci_graviton.c,v 1.1 2020/01/17 17:06:33 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_graviton.c,v 1.2 2020/06/15 18:57:39 ad Exp $ */
 
 /*-
- * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_graviton.c,v 1.1 2020/01/17 17:06:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_graviton.c,v 1.2 2020/06/15 18:57:39 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -40,8 +40,7 @@
 #include <sys/kernel.h>
 #include <sys/extent.h>
 #include <sys/kmem.h>
-
-#include <machine/cpu.h>
+#include <sys/cpu.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff -r 0d8d78860e8f -r 18b46b39d980 sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c
--- a/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c      Mon Jun 15 18:44:10 2020 +0000
+++ b/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c      Mon Jun 15 18:57:39 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_layerscape_gen4.c,v 1.2 2020/02/02 16:44:25 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_layerscape_gen4.c,v 1.3 2020/06/15 18:57:39 ad Exp $ */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_layerscape_gen4.c,v 1.2 2020/02/02 16:44:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_layerscape_gen4.c,v 1.3 2020/06/15 18:57:39 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -45,8 +45,7 @@
 #include <sys/extent.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
-
-#include <machine/cpu.h>
+#include <sys/cpu.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff -r 0d8d78860e8f -r 18b46b39d980 sys/arch/arm/acpi/acpi_pci_machdep.c
--- a/sys/arch/arm/acpi/acpi_pci_machdep.c      Mon Jun 15 18:44:10 2020 +0000
+++ b/sys/arch/arm/acpi/acpi_pci_machdep.c      Mon Jun 15 18:57:39 2020 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: acpi_pci_machdep.c,v 1.16 2020/02/13 00:02:21 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_machdep.c,v 1.17 2020/06/15 18:57:39 ad Exp $ */
 
 /*-
- * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -32,7 +32,7 @@
 #define        _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_machdep.c,v 1.16 2020/02/13 00:02:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_machdep.c,v 1.17 2020/06/15 18:57:39 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -44,8 +44,7 @@
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
-
-#include <machine/cpu.h>
+#include <sys/cpu.h>
 
 #include <arm/cpufunc.h>
 
diff -r 0d8d78860e8f -r 18b46b39d980 sys/arch/arm/acpi/acpi_pci_n1sdp.c
--- a/sys/arch/arm/acpi/acpi_pci_n1sdp.c        Mon Jun 15 18:44:10 2020 +0000
+++ b/sys/arch/arm/acpi/acpi_pci_n1sdp.c        Mon Jun 15 18:57:39 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_n1sdp.c,v 1.2 2020/02/13 00:02:40 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_n1sdp.c,v 1.3 2020/06/15 18:57:39 ad Exp $ */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_n1sdp.c,v 1.2 2020/02/13 00:02:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_n1sdp.c,v 1.3 2020/06/15 18:57:39 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -40,8 +40,7 @@
 #include <sys/kernel.h>
 #include <sys/extent.h>
 #include <sys/kmem.h>
-
-#include <machine/cpu.h>
+#include <sys/cpu.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff -r 0d8d78860e8f -r 18b46b39d980 sys/arch/arm/acpi/acpipchb.c
--- a/sys/arch/arm/acpi/acpipchb.c      Mon Jun 15 18:44:10 2020 +0000
+++ b/sys/arch/arm/acpi/acpipchb.c      Mon Jun 15 18:57:39 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpipchb.c,v 1.18 2020/05/08 14:44:23 jmcneill Exp $ */
+/* $NetBSD: acpipchb.c,v 1.19 2020/06/15 18:57:39 ad Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.18 2020/05/08 14:44:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.19 2020/06/15 18:57:39 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -42,8 +42,7 @@
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
-
-#include <machine/cpu.h>
+#include <sys/cpu.h>
 
 #include <arm/cpufunc.h>
 
diff -r 0d8d78860e8f -r 18b46b39d980 sys/arch/arm/imx/imxgpio.c
--- a/sys/arch/arm/imx/imxgpio.c        Mon Jun 15 18:44:10 2020 +0000
+++ b/sys/arch/arm/imx/imxgpio.c        Mon Jun 15 18:57:39 2020 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: imxgpio.c,v 1.8 2020/01/15 01:09:56 jmcneill Exp $ */
+/*     $NetBSD: imxgpio.c,v 1.9 2020/06/15 18:57:39 ad Exp $ */
 
 /*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * Copyright (c) 2007, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v 1.8 2020/01/15 01:09:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v 1.9 2020/06/15 18:57:39 ad Exp $");
 
 #define        _INTR_PRIVATE
 
@@ -40,8 +40,8 @@
 #include <sys/evcnt.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
-
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
 
 #include <arm/cpu.h>
 #include <arm/armreg.h>