Module Name: src
Committed By: matt
Date: Mon Feb 22 20:14:07 UTC 2010
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: cpu_counter.h
Log Message:
Don't include <mips/locore.h>. Rely on the weak alias in locore_mips3.S
To generate a diff of this commit:
cvs rdiff -u -r1.3.90.1 -r1.3.90.2 src/sys/arch/mips/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/mips/include/cpu_counter.h
diff -u src/sys/arch/mips/include/cpu_counter.h:1.3.90.1 src/sys/arch/mips/include/cpu_counter.h:1.3.90.2
--- src/sys/arch/mips/include/cpu_counter.h:1.3.90.1 Wed Jan 20 06:58:35 2010
+++ src/sys/arch/mips/include/cpu_counter.h Mon Feb 22 20:14:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_counter.h,v 1.3.90.1 2010/01/20 06:58:35 matt Exp $ */
+/* $NetBSD: cpu_counter.h,v 1.3.90.2 2010/02/22 20:14:07 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -33,7 +33,6 @@
*/
#include <machine/cpu.h>
-#include <mips/locore.h>
#ifdef _KERNEL
@@ -51,12 +50,7 @@
#define cpu_counter() cpu_counter32()
-static __inline uint32_t
-cpu_counter32(void)
-{
-
- return mips3_cp0_count_read();
-}
+uint32_t cpu_counter32(void); /* weak alias of mips3_cp0_count_read */
static __inline uint64_t
cpu_frequency(struct cpu_info *ci)
