diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-01 14:53:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-01 14:53:44 -0400 |
commit | 86c47b70f62a7072d441ba212aab33c2f82627c2 (patch) | |
tree | d03988bd2226966352bb7f3c2e82ff545353d2c4 /arch/tile/include | |
parent | 1193755ac6328ad240ba987e6ec41d5e8baf0680 (diff) | |
parent | 44fbbb3dc687c9709a6f2236197316e5c79ab1eb (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull third pile of signal handling patches from Al Viro:
"This time it's mostly helpers and conversions to them; there's a lot
of stuff remaining in the tree, but that'll either go in -rc2
(isolated bug fixes, ideally via arch maintainers' trees) or will sit
there until the next cycle."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
x86: get rid of calling do_notify_resume() when returning to kernel mode
blackfin: check __get_user() return value
whack-a-mole with TIF_FREEZE
FRV: Optimise the system call exit path in entry.S [ver #2]
FRV: Shrink TIF_WORK_MASK [ver #2]
FRV: Prevent syscall exit tracing and notify_resume at end of kernel exceptions
new helper: signal_delivered()
powerpc: get rid of restore_sigmask()
most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set
set_restore_sigmask() is never called without SIGPENDING (and never should be)
TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set
don't call try_to_freeze() from do_signal()
pull clearing RESTORE_SIGMASK into block_sigmask()
sh64: failure to build sigframe != signal without handler
openrisc: tracehook_signal_handler() is supposed to be called on success
new helper: sigmask_to_save()
new helper: restore_saved_sigmask()
new helpers: {clear,test,test_and_clear}_restore_sigmask()
HAVE_RESTORE_SIGMASK is defined on all architectures now
Diffstat (limited to 'arch/tile/include')
-rw-r--r-- | arch/tile/include/asm/thread_info.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h index 656c486e64fa..7e1fef36bde6 100644 --- a/arch/tile/include/asm/thread_info.h +++ b/arch/tile/include/asm/thread_info.h | |||
@@ -166,7 +166,23 @@ static inline void set_restore_sigmask(void) | |||
166 | { | 166 | { |
167 | struct thread_info *ti = current_thread_info(); | 167 | struct thread_info *ti = current_thread_info(); |
168 | ti->status |= TS_RESTORE_SIGMASK; | 168 | ti->status |= TS_RESTORE_SIGMASK; |
169 | set_bit(TIF_SIGPENDING, &ti->flags); | 169 | WARN_ON(!test_bit(TIF_SIGPENDING, &ti->flags)); |
170 | } | ||
171 | static inline void clear_restore_sigmask(void) | ||
172 | { | ||
173 | current_thread_info()->status &= ~TS_RESTORE_SIGMASK; | ||
174 | } | ||
175 | static inline bool test_restore_sigmask(void) | ||
176 | { | ||
177 | return current_thread_info()->status & TS_RESTORE_SIGMASK; | ||
178 | } | ||
179 | static inline bool test_and_clear_restore_sigmask(void) | ||
180 | { | ||
181 | struct thread_info *ti = current_thread_info(); | ||
182 | if (!(ti->status & TS_RESTORE_SIGMASK)) | ||
183 | return false; | ||
184 | ti->status &= ~TS_RESTORE_SIGMASK; | ||
185 | return true; | ||
170 | } | 186 | } |
171 | #endif /* !__ASSEMBLY__ */ | 187 | #endif /* !__ASSEMBLY__ */ |
172 | 188 | ||