2 files changed, 5 insertions, 24 deletions

diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index c5e4ec0598d2..efe4e854b3cd 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -30,8 +30,6 @@
 
 #define DEBUG_SIG  0
 
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
 extern struct task_struct *coproc_owners[];
 
 struct rt_sigframe
@@ -261,7 +259,6 @@ asmlinkage long xtensa_rt_sigreturn(long a0, long a1, long a2, long a3,
         if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
                 goto badframe;
 
-        sigdelsetmask(&set, ~_BLOCKABLE);
         set_current_blocked(&set);
 
         if (restore_sigcontext(regs, frame))
@@ -452,15 +449,6 @@ static void do_signal(struct pt_regs *regs)
         siginfo_t info;
         int signr;
         struct k_sigaction ka;
-        sigset_t oldset;
-
-        if (try_to_freeze())
-                goto no_signal;
-
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                oldset = &current->saved_sigmask;
-        else
-                oldset = &current->blocked;
 
         task_pt_regs(current)->icountlevel = 0;
 
@@ -501,19 +489,17 @@ static void do_signal(struct pt_regs *regs)
 
                 /* Whee!  Actually deliver the signal.  */
                 /* Set up the stack frame */
-                ret = setup_frame(signr, &ka, &info, oldset, regs);
+                ret = setup_frame(signr, &ka, &info, sigmask_to_save(), regs);
                 if (ret)
                         return;
 
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
-                block_sigmask(&ka, signr);
+                signal_delivered(signr, &info, &ka, regs, 0);
                 if (current->ptrace & PT_SINGLESTEP)
                         task_pt_regs(current)->icountlevel = 1;
 
                 return;
         }
 
-no_signal:
         /* Did we come from a system call? */
         if ((signed) regs->syscall >= 0) {
                 /* Restart the system call - no handlers present */
@@ -532,8 +518,7 @@ no_signal:
         }
 
         /* If there's no signal to deliver, we just restore the saved mask.  */
-        if (test_and_clear_thread_flag(TIF_RESTORE_SIGMASK))
-                set_current_blocked(&current->saved_sigmask);
+        restore_saved_sigmask();
 
         if (current->ptrace & PT_SINGLESTEP)
                 task_pt_regs(current)->icountlevel = 1;
@@ -548,9 +533,6 @@ void do_notify_resume(struct pt_regs *regs)
         if (test_thread_flag(TIF_SIGPENDING))
                 do_signal(regs);
 
-        if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
+        if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
                 tracehook_notify_resume(regs);
-                if (current->replacement_session_keyring)
-                        key_replace_session_keyring();
-        }
 }
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index 88ecea3facb4..ee2e2089483d 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -83,7 +83,6 @@ SECTIONS
 
   _text = .;
   _stext = .;
-  _ftext = .;
 
   .text :
   {
@@ -112,7 +111,7 @@ SECTIONS
   EXCEPTION_TABLE(16)
   /* Data section */
 
-  _fdata = .;
+  _sdata = .;
   RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
   _edata = .;