diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-19 14:03:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-19 14:03:55 -0400 |
| commit | 077fee003624c06a1349895d8c0f89cc625cc39e (patch) | |
| tree | 87b2f096f3d23afcfcd1da9ce7a8df6ce247c383 /arch/sh/kernel/entry-common.S | |
| parent | cf42d543e54143fbbaaa9972c5e69bc21a0b77dd (diff) | |
| parent | 5e071e2b4b82599f07cce5e1d2d272feb462950c (diff) | |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fixes from Paul Mundt.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: Fix up TIF_NOTIFY_RESUME sans TIF_SIGPENDING handling.
sh: pfc: Release spinlock in sh_pfc_gpio_request_enable() error path
sh: intc: Fix up multi-evt irq association.
Diffstat (limited to 'arch/sh/kernel/entry-common.S')
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index f67601cb3f1f..b96489d8b27d 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
| @@ -139,7 +139,7 @@ work_pending: | |||
| 139 | ! r8: current_thread_info | 139 | ! r8: current_thread_info |
| 140 | ! t: result of "tst #_TIF_NEED_RESCHED, r0" | 140 | ! t: result of "tst #_TIF_NEED_RESCHED, r0" |
| 141 | bf/s work_resched | 141 | bf/s work_resched |
| 142 | tst #_TIF_SIGPENDING, r0 | 142 | tst #(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME), r0 |
| 143 | work_notifysig: | 143 | work_notifysig: |
| 144 | bt/s __restore_all | 144 | bt/s __restore_all |
| 145 | mov r15, r4 | 145 | mov r15, r4 |