diff options
| author | James Morris <jmorris@namei.org> | 2009-09-10 18:04:49 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-10 18:04:49 -0400 |
| commit | a3c8b97396ef42edfb845788ba6f53b2a93ce980 (patch) | |
| tree | 530c5bdbc534618311dab3e0af245835af56db0f /arch/avr32/kernel/entry-avr32b.S | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
| parent | 9f0ab4a3f0fdb1ff404d150618ace2fa069bb2e1 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/avr32/kernel/entry-avr32b.S')
| -rw-r--r-- | arch/avr32/kernel/entry-avr32b.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/kernel/entry-avr32b.S b/arch/avr32/kernel/entry-avr32b.S index 009a80155d67..169268c40ae2 100644 --- a/arch/avr32/kernel/entry-avr32b.S +++ b/arch/avr32/kernel/entry-avr32b.S | |||
| @@ -281,7 +281,7 @@ syscall_exit_work: | |||
| 281 | ld.w r1, r0[TI_flags] | 281 | ld.w r1, r0[TI_flags] |
| 282 | rjmp 1b | 282 | rjmp 1b |
| 283 | 283 | ||
| 284 | 2: mov r2, _TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | 284 | 2: mov r2, _TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NOTIFY_RESUME |
| 285 | tst r1, r2 | 285 | tst r1, r2 |
| 286 | breq 3f | 286 | breq 3f |
| 287 | unmask_interrupts | 287 | unmask_interrupts |