diff options
author | Pete Popov <ppopov@embeddedalley.com> | 2005-04-08 04:34:43 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:31:02 -0400 |
commit | fe359bf58414478a0ddbd65923e2f1aceedf330f (patch) | |
tree | f40b1bffd5a974242dd3ee19872daaa9056ba900 /arch/mips/kernel/cpu-probe.c | |
parent | 494900af689a22479eb405ff1323cad673bd9208 (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/kernel/cpu-probe.c')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index b7c8346df3ca..69e5fff00edc 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -53,9 +53,10 @@ static void r4k_wait(void) | |||
53 | 53 | ||
54 | /* The Au1xxx wait is available only if using 32khz counter or | 54 | /* The Au1xxx wait is available only if using 32khz counter or |
55 | * external timer source, but specifically not CP0 Counter. */ | 55 | * external timer source, but specifically not CP0 Counter. */ |
56 | int allow_au1k_wait; | ||
56 | static void au1k_wait(void) | 57 | static void au1k_wait(void) |
57 | { | 58 | { |
58 | unsigned long addr; | 59 | unsigned long addr = 0; |
59 | /* using the wait instruction makes CP0 counter unusable */ | 60 | /* using the wait instruction makes CP0 counter unusable */ |
60 | __asm__("la %0,au1k_wait\n\t" | 61 | __asm__("la %0,au1k_wait\n\t" |
61 | ".set mips3\n\t" | 62 | ".set mips3\n\t" |
@@ -113,14 +114,11 @@ static inline void check_wait(void) | |||
113 | case CPU_AU1500: | 114 | case CPU_AU1500: |
114 | case CPU_AU1550: | 115 | case CPU_AU1550: |
115 | case CPU_AU1200: | 116 | case CPU_AU1200: |
116 | { | 117 | if (allow_au1k_wait) { |
117 | extern int allow_au1k_wait; /* au1000/common/time.c */ | 118 | cpu_wait = au1k_wait; |
118 | if (allow_au1k_wait) { | 119 | printk(" available.\n"); |
119 | cpu_wait = au1k_wait; | 120 | } else |
120 | printk(" available.\n"); | 121 | printk(" unavailable.\n"); |
121 | } else | ||
122 | printk(" unavailable.\n"); | ||
123 | } | ||
124 | break; | 122 | break; |
125 | default: | 123 | default: |
126 | printk(" unavailable.\n"); | 124 | printk(" unavailable.\n"); |