diff options
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 1abe9905c9c1..6e4807a19c00 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -91,16 +91,13 @@ static void rm7k_wait_irqoff(void) | |||
91 | local_irq_enable(); | 91 | local_irq_enable(); |
92 | } | 92 | } |
93 | 93 | ||
94 | /* The Au1xxx wait is available only if using 32khz counter or | 94 | /* |
95 | * external timer source, but specifically not CP0 Counter. */ | 95 | * The Au1xxx wait is available only if using 32khz counter or |
96 | int allow_au1k_wait; | 96 | * external timer source, but specifically not CP0 Counter. |
97 | 97 | * alchemy/common/time.c may override cpu_wait! | |
98 | */ | ||
98 | static void au1k_wait(void) | 99 | static void au1k_wait(void) |
99 | { | 100 | { |
100 | if (!allow_au1k_wait) | ||
101 | return; | ||
102 | |||
103 | /* using the wait instruction makes CP0 counter unusable */ | ||
104 | __asm__(" .set mips3 \n" | 101 | __asm__(" .set mips3 \n" |
105 | " cache 0x14, 0(%0) \n" | 102 | " cache 0x14, 0(%0) \n" |
106 | " cache 0x14, 32(%0) \n" | 103 | " cache 0x14, 32(%0) \n" |