Module Name: src
Committed By: skrll
Date: Thu Jan 3 15:33:06 UTC 2019
Modified Files:
src/sys/arch/arm/arm32: arm32_boot.c
Log Message:
Simplify
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/arm32/arm32_boot.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/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.29 src/sys/arch/arm/arm32/arm32_boot.c:1.30
--- src/sys/arch/arm/arm32/arm32_boot.c:1.29 Thu Jan 3 15:12:00 2019
+++ src/sys/arch/arm/arm32/arm32_boot.c Thu Jan 3 15:33:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.29 2019/01/03 15:12:00 jmcneill Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.30 2019/01/03 15:33:06 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.29 2019/01/03 15:12:00 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.30 2019/01/03 15:33:06 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -350,7 +350,7 @@ cpu_hatch(struct cpu_info *ci, u_int cpu
VPRINTF("%s(%s): ", __func__, cpu_name(ci));
ci->ci_ctrl = armreg_sctlr_read();
uint32_t mpidr = armreg_mpidr_read();
- ci->ci_mpidr = armreg_mpidr_read();
+ ci->ci_mpidr = mpidr;
if (mpidr & MPIDR_MT) {
ci->ci_smt_id = mpidr & MPIDR_AFF0;
ci->ci_core_id = mpidr & MPIDR_AFF1;
