commit b8a420952336ed81ef5c9bf8bad90d3deaee5521
author Al Viro <viro@zeniv.linux.org.uk> Wed May 23 00:25:15 2012 -0400
committer Richard Weinberger <richard@nod.at> Thu Aug 02 00:25:44 2012 +0200
tree 91134cb8f8a69b9243ac98fe08e8f92eadc3954a
parent 1bfa2317b21750f739b59ab6df2c8efb12875045

um: pull interrupt_end() into userspace()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>

arch/um/kernel/process.c

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index f19ca61..57fc702 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -151,12 +151,10 @@
 	 * 0 if it just exits
 	 */
 	n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
-	if (n == 1) {
-		/* Handle any immediate reschedules or signals */
-		interrupt_end();
+	if (n == 1)
 		userspace(&current->thread.regs.regs);
-	}
-	else do_exit(0);
+	else
+		do_exit(0);
 }
 
 /* Called magically, see new_thread_handler above */
@@ -175,9 +173,6 @@
 
 	current->thread.prev_sched = NULL;
 
-	/* Handle any immediate reschedules or signals */
-	interrupt_end();
-
 	userspace(&current->thread.regs.regs);
 }