git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
mips
/
kernel
/
entry.S
diff --git
a/arch/mips/kernel/entry.S
b/arch/mips/kernel/entry.S
index
c1f8422
..
5eb4291
100644
(file)
--- a/
arch/mips/kernel/entry.S
+++ b/
arch/mips/kernel/entry.S
@@
-16,6
+16,7
@@
#include <asm/stackframe.h>
#include <asm/isadep.h>
#include <asm/thread_info.h>
#include <asm/stackframe.h>
#include <asm/isadep.h>
#include <asm/thread_info.h>
+#include <asm/war.h>
#ifdef CONFIG_PREEMPT
.macro preempt_stop reg=t0
#ifdef CONFIG_PREEMPT
.macro preempt_stop reg=t0
@@
-139,7
+140,11
@@
LEAF(spurious_interrupt)
1: ll t0, %lo(irq_err_count)(t1)
addiu t0, 1
sc t0, %lo(irq_err_count)(t1)
1: ll t0, %lo(irq_err_count)(t1)
addiu t0, 1
sc t0, %lo(irq_err_count)(t1)
+#if R10000_LLSC_WAR
+ beqzl t0, 1b
+#else
beqz t0, 1b
beqz t0, 1b
+#endif
#else
lui t1, %hi(irq_err_count)
lw t0, %lo(irq_err_count)(t1)
#else
lui t1, %hi(irq_err_count)
lw t0, %lo(irq_err_count)(t1)