summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/time.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-12-29 16:35:43 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-12-29 16:35:43 +0000
commitd0ed783f34132a6456fbee80ce5d121faf55fb8c (patch)
treeed7bb65b9ba2d86bafa9ba4631718717cd944d01 /arch/mips/kernel/time.c
parent041d5780d54608a859ac6fd0fac06ec0e670aa5b (diff)
Bunch more patches from MIPS.
Diffstat (limited to 'arch/mips/kernel/time.c')
-rw-r--r--arch/mips/kernel/time.c46
1 files changed, 10 insertions, 36 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 7b953e94f..b6e1f7a6c 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -5,6 +5,14 @@
* This file contains the time handling details for PC-style clocks as
* found in some MIPS systems.
*/
+/**************************************************************************
+ * 9 Nov, 2000.
+ * Changed init_cycle_counter() routine, use the mips_cpu structure.
+ *
+ * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips
+ * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
+ *************************************************************************/
+
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
@@ -449,42 +457,8 @@ char cyclecounter_available;
static inline void init_cycle_counter(void)
{
- switch(mips_cpu.cputype) {
- case CPU_UNKNOWN:
- case CPU_R2000:
- case CPU_R3000:
- case CPU_R3000A:
- case CPU_R3041:
- case CPU_R3051:
- case CPU_R3052:
- case CPU_R3081:
- case CPU_R3081E:
- case CPU_R6000:
- case CPU_R6000A:
- case CPU_R8000: /* Not shure about that one, play safe */
- cyclecounter_available = 0;
- break;
- case CPU_R4000PC:
- case CPU_R4000SC:
- case CPU_R4000MC:
- case CPU_R4200:
- case CPU_R4400PC:
- case CPU_R4400SC:
- case CPU_R4400MC:
- case CPU_R4600:
- case CPU_R10000:
- case CPU_R4300:
- case CPU_R4650:
- case CPU_R4700:
- case CPU_R5000:
- case CPU_R5432:
- case CPU_R5000A:
- case CPU_R4640:
- case CPU_NEVADA:
- case CPU_RM7000:
- cyclecounter_available = 1;
- break;
- }
+ if(mips_cpu.options & MIPS_CPU_COUNTER) cyclecounter_available = 1;
+ else cyclecounter_available = 0;
}
struct irqaction irq0 = { timer_interrupt, SA_INTERRUPT, 0,