diff options
| author | Akira Takeuchi <takeuchi.akr@jp.panasonic.com> | 2008-12-10 12:43:29 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 13:34:33 -0800 |
| commit | 24646bd2269fbca95367bfd3eafbc9f7ade2e980 (patch) | |
| tree | 48c12583f152f688ff9e401cb99d48807c489b85 /arch/mn10300 | |
| parent | a8893fb3e61473349b052794ae157b938e3b2b98 (diff) | |
| download | linux-3.10-24646bd2269fbca95367bfd3eafbc9f7ade2e980.tar.gz linux-3.10-24646bd2269fbca95367bfd3eafbc9f7ade2e980.tar.bz2 linux-3.10-24646bd2269fbca95367bfd3eafbc9f7ade2e980.zip | |
MN10300: Fix the preemption resume_kernel() routine
Fix the preemption resume_kernel() routine by inverting the test to see
whether interrupts are off (IM7 is all enabled, not all disabled).
Furthermore, interrupts should be disabled on entry to resume_kernel() so that
they're correctly set for jumping to restore_all() and doing the need
reschedule test.
Signed-off-by: Akira Takeuchi <takeuchi.akr@jp.panasonic.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/kernel/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index b7cbb1487af..62fba8aa9b6 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S @@ -180,6 +180,7 @@ ENTRY(resume_userspace) #ifdef CONFIG_PREEMPT ENTRY(resume_kernel) + __cli mov (TI_preempt_count,a2),d0 # non-zero preempt_count ? cmp 0,d0 bne restore_all @@ -190,7 +191,7 @@ need_resched: mov (REG_EPSW,fp),d0 and EPSW_IM,d0 cmp EPSW_IM_7,d0 # interrupts off (exception path) ? - beq restore_all + bne restore_all call preempt_schedule_irq[],0 jmp need_resched #endif |