From 1fc12b7334116040bb535dcd4564244a448c65ad Mon Sep 17 00:00:00 2001
From: Richard Kuo <rkuo@codeaurora.org>
Date: Tue, 23 Oct 2012 18:26:01 -0500
Subject: [PATCH] --- yaml --- r: 367954 b: refs/heads/master c:
 3981c4728bcec97f352f8518f05a0015c7df6a3c h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/hexagon/kernel/vm_entry.S | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d80a8164233d..9caafff63d21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ce81f4f8727f42c052fe814f3df20bc92fdb168
+refs/heads/master: 3981c4728bcec97f352f8518f05a0015c7df6a3c
diff --git a/trunk/arch/hexagon/kernel/vm_entry.S b/trunk/arch/hexagon/kernel/vm_entry.S
index 9add73ab57d8..34470911d4a7 100644
--- a/trunk/arch/hexagon/kernel/vm_entry.S
+++ b/trunk/arch/hexagon/kernel/vm_entry.S
@@ -374,11 +374,20 @@ _K_enter_debug:
 	.globl ret_from_fork
 ret_from_fork:
 	{
-		call schedule_tail;
+		call schedule_tail
 		R16.H = #HI(do_work_pending);
 	}
 	{
+		P0 = cmp.eq(R24, #0);
 		R16.L = #LO(do_work_pending);
 		R0 = #VM_INT_DISABLE;
-		jump check_work_pending;
+	}
+	if P0 jump check_work_pending
+	{
+		R0 = R25;
+		callr R24
+	}
+	{
+		jump check_work_pending
+		R0 = #VM_INT_DISABLE;
 	}