aboutsummaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorPete Popov <ppopov@embeddedalley.com>2005-04-08 08:34:43 +0000
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:31:02 +0100
commitfe359bf58414478a0ddbd65923e2f1aceedf330f (patch)
treef40b1bffd5a974242dd3ee19872daaa9056ba900 /arch/mips
parent494900af689a22479eb405ff1323cad673bd9208 (diff)
Fixed buglet with previous patch that broke non au1x builds.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/au1000/common/time.c2
-rw-r--r--arch/mips/kernel/cpu-probe.c16
2 files changed, 8 insertions, 10 deletions
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index 2bc33824807..2f81a0c0044 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -57,7 +57,7 @@ unsigned long missed_heart_beats = 0;
static unsigned long r4k_offset; /* Amount to increment compare reg each time */
static unsigned long r4k_cur; /* What counter should be at next timer irq */
int no_au1xxx_32khz;
-int allow_au1k_wait = 0; /* default off for CP0 Counter */
+extern int allow_au1k_wait; /* default off for CP0 Counter */
/* Cycle counter value at the previous timer interrupt.. */
static unsigned int timerhi = 0, timerlo = 0;
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index b7c8346df3c..69e5fff00ed 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -53,9 +53,10 @@ static void r4k_wait(void)
/* The Au1xxx wait is available only if using 32khz counter or
* external timer source, but specifically not CP0 Counter. */
+int allow_au1k_wait;
static void au1k_wait(void)
{
- unsigned long addr;
+ unsigned long addr = 0;
/* using the wait instruction makes CP0 counter unusable */
__asm__("la %0,au1k_wait\n\t"
".set mips3\n\t"
@@ -113,14 +114,11 @@ static inline void check_wait(void)
case CPU_AU1500:
case CPU_AU1550:
case CPU_AU1200:
- {
- extern int allow_au1k_wait; /* au1000/common/time.c */
- if (allow_au1k_wait) {
- cpu_wait = au1k_wait;
- printk(" available.\n");
- } else
- printk(" unavailable.\n");
- }
+ if (allow_au1k_wait) {
+ cpu_wait = au1k_wait;
+ printk(" available.\n");
+ } else
+ printk(" unavailable.\n");
break;
default:
printk(" unavailable.\n");