Module Name: src
Committed By: matt
Date: Wed Feb 26 01:54:10 UTC 2014
Modified Files:
src/sys/arch/arm/include: cpu_counter.h
Log Message:
ci_cpu_id -> ci_arm_cpuid
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/include/cpu_counter.h
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/include/cpu_counter.h
diff -u src/sys/arch/arm/include/cpu_counter.h:1.2 src/sys/arch/arm/include/cpu_counter.h:1.3
--- src/sys/arch/arm/include/cpu_counter.h:1.2 Wed Aug 29 18:45:40 2012
+++ src/sys/arch/arm/include/cpu_counter.h Wed Feb 26 01:54:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_counter.h,v 1.2 2012/08/29 18:45:40 matt Exp $ */
+/* $NetBSD: cpu_counter.h,v 1.3 2014/02/26 01:54:10 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@ static __inline uint32_t
cpu_counter32(void)
{
#if defined(CPU_CORTEX) && defined(CPU_ARM11)
- const bool cortex_p = CPU_ID_CORTEX_P(curcpu()->ci_cpu_id);
+ const bool cortex_p = CPU_ID_CORTEX_P(curcpu()->ci_arm_cpuid);
#elif defined(CPU_CORTEX)
const bool cortex_p = true;
#elif defined(CPU_ARM11)
