Module Name: src
Committed By: skrll
Date: Sun Mar 8 08:26:54 UTC 2020
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/dev/fdt: fdt_subr.c
Log Message:
Fix LOCKDEBUG by calling fdtbus_intr_init as part of cpu_startup_hook, i.e.
later.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/fdt/fdt_subr.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/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.67 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.68
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.67 Sun Feb 16 14:56:52 2020
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Mar 8 08:26:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.67 2020/02/16 14:56:52 thorpej Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.68 2020/03/08 08:26:54 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.67 2020/02/16 14:56:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.68 2020/03/08 08:26:54 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -89,6 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
#include <evbarm/fdt/fdt_memory.h>
#include <arm/fdt/arm_fdtvar.h>
+#include <dev/fdt/fdt_private.h>
#ifdef EFI_RUNTIME
#include <arm/arm/efi_runtime.h>
@@ -695,6 +696,8 @@ void
cpu_startup_hook(void)
{
+ fdtbus_intr_init();
+
fdt_setup_rndseed();
}
Index: src/sys/dev/fdt/fdt_subr.c
diff -u src/sys/dev/fdt/fdt_subr.c:1.35 src/sys/dev/fdt/fdt_subr.c:1.36
--- src/sys/dev/fdt/fdt_subr.c:1.35 Mon Feb 24 12:38:57 2020
+++ src/sys/dev/fdt/fdt_subr.c Sun Mar 8 08:26:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.35 2020/02/24 12:38:57 rin Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.36 2020/03/08 08:26:54 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.35 2020/02/24 12:38:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.36 2020/03/08 08:26:54 skrll Exp $");
#include "opt_fdt.h"
@@ -52,9 +52,6 @@ fdtbus_init(const void *data)
}
fdt_data = data;
- /* Now that we have a FDT blob, initialize other bits that need it. */
- fdtbus_intr_init();
-
return true;
}
