Module Name: src
Committed By: ad
Date: Mon Jun 15 18:57:39 UTC 2020
Modified Files:
src/sys/arch/arm/acpi: acpi_pci_graviton.c acpi_pci_layerscape_gen4.c
acpi_pci_machdep.c acpi_pci_n1sdp.c acpipchb.c
src/sys/arch/arm/imx: imxgpio.c
Log Message:
Use sys/cpu.h so that curcpu defined in terms of curlwp->l_cpu works too.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/acpi/acpi_pci_graviton.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c \
src/sys/arch/arm/acpi/acpi_pci_n1sdp.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/acpi/acpi_pci_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/acpi/acpipchb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imxgpio.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/acpi/acpi_pci_graviton.c
diff -u src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.1 src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.2
--- src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.1 Fri Jan 17 17:06:33 2020
+++ src/sys/arch/arm/acpi/acpi_pci_graviton.c Mon Jun 15 18:57:39 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_pci_gra
#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>
Index: src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c
diff -u src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c:1.2 src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c:1.3
--- src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c:1.2 Sun Feb 2 16:44:25 2020
+++ src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c Mon Jun 15 18:57:39 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_pci_lay
#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>
Index: src/sys/arch/arm/acpi/acpi_pci_n1sdp.c
diff -u src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.2 src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.3
--- src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.2 Thu Feb 13 00:02:40 2020
+++ src/sys/arch/arm/acpi/acpi_pci_n1sdp.c Mon Jun 15 18:57:39 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_pci_n1s
#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>
Index: src/sys/arch/arm/acpi/acpi_pci_machdep.c
diff -u src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.16 src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.17
--- src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.16 Thu Feb 13 00:02:21 2020
+++ src/sys/arch/arm/acpi/acpi_pci_machdep.c Mon Jun 15 18:57:39 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_pci_mac
#include <sys/queue.h>
#include <sys/mutex.h>
#include <sys/kmem.h>
-
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/acpi/acpipchb.c
diff -u src/sys/arch/arm/acpi/acpipchb.c:1.18 src/sys/arch/arm/acpi/acpipchb.c:1.19
--- src/sys/arch/arm/acpi/acpipchb.c:1.18 Fri May 8 14:44:23 2020
+++ src/sys/arch/arm/acpi/acpipchb.c Mon Jun 15 18:57:39 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v
#include <sys/queue.h>
#include <sys/mutex.h>
#include <sys/kmem.h>
-
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/imx/imxgpio.c
diff -u src/sys/arch/arm/imx/imxgpio.c:1.8 src/sys/arch/arm/imx/imxgpio.c:1.9
--- src/sys/arch/arm/imx/imxgpio.c:1.8 Wed Jan 15 01:09:56 2020
+++ src/sys/arch/arm/imx/imxgpio.c Mon Jun 15 18:57:39 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v
#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>
