1 files changed, 11 insertions, 2 deletions

diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index 35923e8abd82..cd91d010e6d3 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -23,6 +23,7 @@
 #include <linux/tty.h>
 #include <linux/binfmts.h>
 #include <linux/bitops.h>
+#include <linux/context_tracking.h>
 
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
@@ -43,6 +44,7 @@ asmlinkage void sparc64_set_context(struct pt_regs *regs)
 {
         struct ucontext __user *ucp = (struct ucontext __user *)
                 regs->u_regs[UREG_I0];
+        enum ctx_state prev_state = exception_enter();
         mc_gregset_t __user *grp;
         unsigned long pc, npc, tstate;
         unsigned long fp, i7;
@@ -129,16 +131,19 @@ asmlinkage void sparc64_set_context(struct pt_regs *regs)
         }
         if (err)
                 goto do_sigsegv;
-
+out:
+        exception_exit(prev_state);
         return;
 do_sigsegv:
         force_sig(SIGSEGV, current);
+        goto out;
 }
 
 asmlinkage void sparc64_get_context(struct pt_regs *regs)
 {
         struct ucontext __user *ucp = (struct ucontext __user *)
                 regs->u_regs[UREG_I0];
+        enum ctx_state prev_state = exception_enter();
         mc_gregset_t __user *grp;
         mcontext_t __user *mcp;
         unsigned long fp, i7;
@@ -220,10 +225,12 @@ asmlinkage void sparc64_get_context(struct pt_regs *regs)
         }
         if (err)
                 goto do_sigsegv;
-
+out:
+        exception_exit(prev_state);
         return;
 do_sigsegv:
         force_sig(SIGSEGV, current);
+        goto out;
 }
 
 struct rt_signal_frame {
@@ -528,11 +535,13 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
 
 void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long thread_info_flags)
 {
+        user_exit();
         if (thread_info_flags & _TIF_SIGPENDING)
                 do_signal(regs, orig_i0);
         if (thread_info_flags & _TIF_NOTIFY_RESUME) {
                 clear_thread_flag(TIF_NOTIFY_RESUME);
                 tracehook_notify_resume(regs);
         }
+        user_enter();
 }