2 files changed, 9 insertions, 6 deletions

diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index eee29257a8ae..4bbbde895a53 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -373,6 +373,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
                 err |= __put_user(OR_R0_R0, &frame->retcode[6]);
                 err |= __put_user((__NR_sigreturn), &frame->retcode[7]);
                 regs->pr = (unsigned long) frame->retcode;
+                flush_icache_range(regs->pr, regs->pr + sizeof(frame->retcode));
         }
 
         if (err)
@@ -398,8 +399,6 @@ static int setup_frame(int sig, struct k_sigaction *ka,
         pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
                  current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
 
-        flush_icache_range(regs->pr, regs->pr + sizeof(frame->retcode));
-
         return 0;
 
 give_sigsegv:
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index d1fa27594c6e..0c776fdfbdda 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -37,16 +37,12 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
         int fault;
         siginfo_t info;
 
-        trace_hardirqs_on();
-        local_irq_enable();
-
 #ifdef CONFIG_SH_KGDB
         if (kgdb_nofault && kgdb_bus_err_hook)
                 kgdb_bus_err_hook();
 #endif
 
         tsk = current;
-        mm = tsk->mm;
         si_code = SEGV_MAPERR;
 
         if (unlikely(address >= TASK_SIZE)) {
@@ -88,6 +84,14 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
                 return;
         }
 
+        /* Only enable interrupts if they were on before the fault */
+        if ((regs->sr & SR_IMASK) != SR_IMASK) {
+                trace_hardirqs_on();
+                local_irq_enable();
+        }
+
+        mm = tsk->mm;
+
         /*
          * If we're in an interrupt or have no user
          * context, we must not take the fault..