Module Name: src
Committed By: skrll
Date: Sat Mar 12 09:16:05 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c
src/sys/arch/arm/arm32: arm32_machdep.c
Log Message:
No need to call arm_fdt_platform twice.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/aarch64/aarch64/aarch64_machdep.c
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/arm/arm32/arm32_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/aarch64/aarch64/aarch64_machdep.c
diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.64 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.65
--- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.64 Mon Jan 31 09:16:09 2022
+++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c Sat Mar 12 09:16:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.64 2022/01/31 09:16:09 ryo Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.65 2022/03/12 09:16:05 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.64 2022/01/31 09:16:09 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.65 2022/03/12 09:16:05 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_cpuoptions.h"
@@ -674,8 +674,9 @@ cpu_startup(void)
consinit();
#ifdef FDT
- if (arm_fdt_platform()->ap_startup != NULL)
- arm_fdt_platform()->ap_startup();
+ const struct arm_platform * const plat = arm_fdt_platform();
+ if (plat->ap_startup != NULL)
+ plat->ap_startup();
#endif
/*
Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.142 src/sys/arch/arm/arm32/arm32_machdep.c:1.143
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.142 Sat Nov 13 00:13:17 2021
+++ src/sys/arch/arm/arm32/arm32_machdep.c Sat Mar 12 09:16:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.142 2021/11/13 00:13:17 jmcneill Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.143 2022/03/12 09:16:05 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.142 2021/11/13 00:13:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.143 2022/03/12 09:16:05 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_arm_start.h"
@@ -301,8 +301,9 @@ cpu_startup(void)
pmap_postinit();
#ifdef FDT
- if (arm_fdt_platform()->ap_startup != NULL)
- arm_fdt_platform()->ap_startup();
+ const struct arm_platform * const plat = arm_fdt_platform();
+ if (plat->ap_startup != NULL)
+ plat->ap_startup();
#endif
/*
