---

yaml
---
r: 309007
b: refs/heads/master
c: 21c1176
h: refs/heads/master
i:
  309005: c86df37
  309003: f6a7a76
  308999: 7c986b6
  308991: 0cc79fc
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9be5ea6f9b6a51535ccdd9881ffb3be2dbd48e9
+refs/heads/master: 21c1176a72bd019d513b26e05d491a31b50b18d2

trunk/arch/arm/kernel/entry-common.S

@@ -56,7 +56,10 @@ work_pending:
 	/*
 	 * TIF_SIGPENDING or TIF_NOTIFY_RESUME must've been set if we got here
 	 */
+	ldr	r2, [sp, #S_PSR]
 	mov	r0, sp				@ 'regs'
+	tst	r2, #15				@ are we returning to user mode?
+	bne	no_work_pending			@ no?  just leave, then...
 	mov	r2, why				@ 'syscall'
 	tst	r1, #_TIF_SIGPENDING		@ delivering a signal?
 	movne	why, #0				@ prevent further restarts

trunk/arch/arm/kernel/signal.c

@@ -608,15 +608,6 @@ static void do_signal(struct pt_regs *regs, int syscall)
 	siginfo_t info;
 	int signr;
 
-	/*
-	 * We want the common case to go fast, which
-	 * is why we may in certain cases get here from
-	 * kernel mode. Just return without doing anything
-	 * if so.
-	 */
-	if (!user_mode(regs))
-		return;
-
 	/*
 	 * If we were from a system call, check for system call restarting...
 	 */