1 files changed, 4 insertions, 2 deletions

diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index d7590dddd084..718eca1850bd 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -337,7 +337,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         struct rt_sigframe *frame;
         int err = 0;
         int signal;
-        unsigned long sp, ra;
+        unsigned long sp, ra, tp;
 
         sp = regs->areg[1];
 
@@ -391,7 +391,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
          * Return context not modified until this point.
          */
 
-        /* Set up registers for signal handler */
+        /* Set up registers for signal handler; preserve the threadptr */
+        tp = regs->threadptr;
         start_thread(regs, (unsigned long) ka->sa.sa_handler,
                      (unsigned long) frame);
 
@@ -402,6 +403,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->areg[6] = (unsigned long) signal;
         regs->areg[7] = (unsigned long) &frame->info;
         regs->areg[8] = (unsigned long) &frame->uc;
+        regs->threadptr = tp;
 
         /* Set access mode to USER_DS.  Nomenclature is outdated, but
          * functionality is used in uaccess.h