Module Name: src
Committed By: jmcneill
Date: Sat May 30 17:50:39 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
Log Message:
sctlr_el1 and ctr_el0 are 64-bit registers
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/aarch64/aarch64/cpu.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/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.45 src/sys/arch/aarch64/aarch64/cpu.c:1.46
--- src/sys/arch/aarch64/aarch64/cpu.c:1.45 Mon May 11 14:44:16 2020
+++ src/sys/arch/aarch64/aarch64/cpu.c Sat May 30 17:50:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.45 2020/05/11 14:44:16 riastradh Exp $ */
+/* $NetBSD: cpu.c,v 1.46 2020/05/30 17:50:39 jmcneill Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.45 2020/05/11 14:44:16 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.46 2020/05/30 17:50:39 jmcneill Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -232,7 +232,7 @@ cpu_identify(device_t self, struct cpu_i
static void
cpu_identify1(device_t self, struct cpu_info *ci)
{
- uint32_t ctr, sctlr; /* for cache */
+ uint64_t ctr, sctlr; /* for cache */
/* SCTLR - System Control Register */
sctlr = reg_sctlr_el1_read();
