Check return coming out of check_work_pending, and if copy_thread
passed us a function in r24, call it.  Based on feedback from Al
Viro.

Signed-off-by: Richard Kuo <r...@codeaurora.org>
---
 arch/hexagon/kernel/vm_entry.S |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/arch/hexagon/kernel/vm_entry.S b/arch/hexagon/kernel/vm_entry.S
index 053551e..0de8638 100644
--- a/arch/hexagon/kernel/vm_entry.S
+++ b/arch/hexagon/kernel/vm_entry.S
@@ -371,11 +371,20 @@ _K_enter_machcheck:
        .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;
        }
-- 
1.7.9.5

--

Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to