diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-21 12:40:30 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-21 12:40:30 -0700 |
commit | e59e14b6602a106c5f88b70264f814a987b2d7a4 (patch) | |
tree | 494848d1504162438e00fcc682baec9bdb6d4785 /arch/mips/kernel/cpu-probe.c | |
parent | 5c0a95c73f80c034914e219eee8075acdf56b527 (diff) | |
parent | 6b3766a263a62fc82ca0457faa73dc34b98ceb87 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] vmlinux.lds.S: handle .text.*
[MIPS] Fix potential latency problem due to non-atomic cpu_wait.
[MIPS] SMTC: Clear TIF_FPUBOUND on clone / fork.
[MIPS] Fix 64-bit IP checksum code
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 335a6ae3d59..11c92dc5379 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -45,18 +45,7 @@ static void r39xx_wait(void) local_irq_enable(); } -/* - * There is a race when WAIT instruction executed with interrupt - * enabled. - * But it is implementation-dependent wheter the pipelie restarts when - * a non-enabled interrupt is requested. - */ -static void r4k_wait(void) -{ - __asm__(" .set mips3 \n" - " wait \n" - " .set mips0 \n"); -} +extern void r4k_wait(void); /* * This variant is preferable as it allows testing need_resched and going to @@ -128,7 +117,7 @@ static int __init wait_disable(char *s) __setup("nowait", wait_disable); -static inline void check_wait(void) +void __init check_wait(void) { struct cpuinfo_mips *c = ¤t_cpu_data; @@ -242,7 +231,6 @@ static inline void check_errata(void) void __init check_bugs32(void) { - check_wait(); check_errata(); } |