summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/signal.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-02-22 16:48:32 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-02-22 16:48:53 +1100
commit18b246fa60dd4bfc71c78d669e2ffaa5df454d6a (patch)
treeea9d8fecb9f83b4223032ffd9eb15a2d5bdbf335 /arch/powerpc/kernel/signal.h
parentaa491ad3d4bf3c7994a419b3bb1c91b9b4fd2a8a (diff)
downloadlwn-18b246fa60dd4bfc71c78d669e2ffaa5df454d6a.tar.gz
lwn-18b246fa60dd4bfc71c78d669e2ffaa5df454d6a.zip
powerpc: Fix various issues with return to userspace
We have a few problems when returning to userspace. This is a quick set of fixes for 3.3, I'll look into a more comprehensive rework for 3.4. This fixes: - We kept interrupts soft-disabled when schedule'ing or calling do_signal when returning to userspace as a result of a hardware interrupt. - Rename do_signal to do_notify_resume like all other archs (and do_signal_pending back to do_signal, which it was before Roland changed it). - Add the missing call to key_replace_session_keyring() to do_notify_resume(). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> ---
Diffstat (limited to 'arch/powerpc/kernel/signal.h')
-rw-r--r--arch/powerpc/kernel/signal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
index 6c0ddfc0603e..8dde973aaaf5 100644
--- a/arch/powerpc/kernel/signal.h
+++ b/arch/powerpc/kernel/signal.h
@@ -12,7 +12,7 @@
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);
+extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags);
extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
size_t frame_size, int is_32);