diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2005-05-25 15:32:49 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 20:31:17 +0200 |
| commit | 10f650db1bcc193ea07d4f8c2f07315da38ea0c4 (patch) | |
| tree | a6fdabdaa8493efd8d5f14ada3cdbc67f62bfe46 /arch/mips/kernel | |
| parent | Fix build for CONFIG_BUG=n. Yes, bugs are now a compile time option ;-) (diff) | |
| download | linux-10f650db1bcc193ea07d4f8c2f07315da38ea0c4.tar.xz linux-10f650db1bcc193ea07d4f8c2f07315da38ea0c4.zip | |
64-bit fixes for Alchemy code ;)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index cde88285a52f..552d2b6c191e 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -53,14 +53,13 @@ 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 = 0; /* using the wait instruction makes CP0 counter unusable */ - __asm__("la %0,au1k_wait\n\t" - ".set mips3\n\t" - "cache 0x14,0(%0)\n\t" - "cache 0x14,32(%0)\n\t" + __asm__(".set mips3\n\t" + "cache 0x14, 0(%0)\n\t" + "cache 0x14, 32(%0)\n\t" "sync\n\t" "nop\n\t" "wait\n\t" @@ -69,7 +68,7 @@ static void au1k_wait(void) "nop\n\t" "nop\n\t" ".set mips0\n\t" - : : "r" (addr)); + : : "r" (au1k_wait)); } static inline void check_wait(void) |