CVS commit: src/sys/dev

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sun Sep 15 08:30:01 UTC 2024

Modified Files:
        src/sys/dev/acpi: genet_acpi.c
        src/sys/dev/fdt: genet_fdt.c

Log Message:
genet(4): Remove the non-MP-safe scaffolding...

I forgot two files in the previous commit.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/genet_acpi.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/fdt/genet_fdt.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/dev/acpi/genet_acpi.c
diff -u src/sys/dev/acpi/genet_acpi.c:1.5 src/sys/dev/acpi/genet_acpi.c:1.6
--- src/sys/dev/acpi/genet_acpi.c:1.5	Mon May  3 10:28:26 2021
+++ src/sys/dev/acpi/genet_acpi.c	Sun Sep 15 08:30:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: genet_acpi.c,v 1.5 2021/05/03 10:28:26 rin Exp $ */
+/* $NetBSD: genet_acpi.c,v 1.6 2024/09/15 08:30:01 skrll Exp $ */
 
 /*-
  * Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
@@ -26,10 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_net_mpsafe.h"
-
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genet_acpi.c,v 1.5 2021/05/03 10:28:26 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genet_acpi.c,v 1.6 2024/09/15 08:30:01 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -51,12 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: genet_acpi.c
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_intr.h>
 
-#ifdef NET_MPSAFE
-#define	GENET_INTR_MPSAFE	true
-#else
-#define	GENET_INTR_MPSAFE	false
-#endif
-
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "BCM6E4E" },	/* Broadcom GENET v5 */
 	DEVICE_COMPAT_EOL
@@ -144,7 +136,7 @@ genet_acpi_attach(device_t parent, devic
 		goto done;
 
         ih = acpi_intr_establish(self, (uint64_t)(uintptr_t)handle, IPL_NET,
-	    GENET_INTR_MPSAFE, genet_intr, sc, device_xname(self));
+	    true, genet_intr, sc, device_xname(self));
 	if (ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt\n");
 		goto done;

Index: src/sys/dev/fdt/genet_fdt.c
diff -u src/sys/dev/fdt/genet_fdt.c:1.6 src/sys/dev/fdt/genet_fdt.c:1.7
--- src/sys/dev/fdt/genet_fdt.c:1.6	Mon May  3 10:28:26 2021
+++ src/sys/dev/fdt/genet_fdt.c	Sun Sep 15 08:30:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: genet_fdt.c,v 1.6 2021/05/03 10:28:26 rin Exp $ */
+/* $NetBSD: genet_fdt.c,v 1.7 2024/09/15 08:30:01 skrll Exp $ */
 
 /*-
  * Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
@@ -26,10 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_net_mpsafe.h"
-
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genet_fdt.c,v 1.6 2021/05/03 10:28:26 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genet_fdt.c,v 1.7 2024/09/15 08:30:01 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -51,12 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: genet_fdt.c,
 
 #include <dev/fdt/fdtvar.h>
 
-#ifdef NET_MPSAFE
-#define	FDT_INTR_FLAGS	FDT_INTR_MPSAFE
-#else
-#define	FDT_INTR_FLAGS	0
-#endif
-
 static int	genet_fdt_match(device_t, cfdata_t, void *);
 static void	genet_fdt_attach(device_t, device_t, void *);