diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 00:54:14 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 00:54:14 -0400 |
| commit | ac6a0cf6716bb46813d0161024c66c2af66e53d1 (patch) | |
| tree | c7f53b1a04c590032c022549f3186fb9b04f8358 /arch/sh/kernel/entry-common.S | |
| parent | e76a0136a3cf1859fbc07f122e42293d22229558 (diff) | |
| parent | ce3f7cb96e67d6518c7fc7b361a76409c3817d64 (diff) | |
Merge branch 'master' into sh/smp
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'arch/sh/kernel/entry-common.S')
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 700477601c6f..68d9223b145e 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
| @@ -98,8 +98,9 @@ need_resched: | |||
| 98 | 98 | ||
| 99 | mov #OFF_SR, r0 | 99 | mov #OFF_SR, r0 |
| 100 | mov.l @(r0,r15), r0 ! get status register | 100 | mov.l @(r0,r15), r0 ! get status register |
| 101 | and #0xf0, r0 ! interrupts off (exception path)? | 101 | shlr r0 |
| 102 | cmp/eq #0xf0, r0 | 102 | and #(0xf0>>1), r0 ! interrupts off (exception path)? |
| 103 | cmp/eq #(0xf0>>1), r0 | ||
| 103 | bt noresched | 104 | bt noresched |
| 104 | mov.l 3f, r0 | 105 | mov.l 3f, r0 |
| 105 | jsr @r0 ! call preempt_schedule_irq | 106 | jsr @r0 ! call preempt_schedule_irq |