Module Name: src
Committed By: skrll
Date: Thu Oct 20 07:13:45 UTC 2022
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Move the fdt_memory_remove_reserved call out of fdt_build_bootconfig
NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/fdt/fdt_machdep.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.95 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.96
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.95 Fri Sep 30 06:39:54 2022
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Thu Oct 20 07:13:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.95 2022/09/30 06:39:54 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.96 2022/10/20 07:13:45 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.95 2022/09/30 06:39:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.96 2022/10/20 07:13:45 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_bootconfig.h"
@@ -240,8 +240,6 @@ fdt_build_bootconfig(uint64_t mem_start,
uint64_t addr, size;
int index;
- fdt_memory_remove_reserved(mem_start, mem_end);
-
const uint64_t initrd_size =
round_page(initrd_end) - trunc_page(initrd_start);
if (initrd_size > 0)
@@ -611,6 +609,8 @@ initarm(void *arg)
fdt_probe_rndseed(&rndseed_start, &rndseed_end);
fdt_probe_efirng(&efirng_start, &efirng_end);
+ fdt_memory_remove_reserved(mem_start, mem_end);
+
/*
* Populate bootconfig structure for the benefit of dodumpsys
*/
