diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
| commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
| tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/mips/kernel/traps.c | |
| parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
| parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/mips/kernel/traps.c')
| -rw-r--r-- | arch/mips/kernel/traps.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 08f1edf355e8..0a18b4c62afb 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -466,9 +466,8 @@ asmlinkage void do_be(struct pt_regs *regs) | |||
| 466 | * The ll_bit is cleared by r*_switch.S | 466 | * The ll_bit is cleared by r*_switch.S |
| 467 | */ | 467 | */ |
| 468 | 468 | ||
| 469 | unsigned long ll_bit; | 469 | unsigned int ll_bit; |
| 470 | 470 | struct task_struct *ll_task; | |
| 471 | static struct task_struct *ll_task = NULL; | ||
| 472 | 471 | ||
| 473 | static inline int simulate_ll(struct pt_regs *regs, unsigned int opcode) | 472 | static inline int simulate_ll(struct pt_regs *regs, unsigned int opcode) |
| 474 | { | 473 | { |