diff options
| author | Richard Kuo <rkuo@codeaurora.org> | 2012-10-23 18:26:01 -0500 |
|---|---|---|
| committer | Richard Kuo <rkuo@codeaurora.org> | 2013-04-30 19:40:26 -0500 |
| commit | 3981c4728bcec97f352f8518f05a0015c7df6a3c (patch) | |
| tree | d5bc669bb171dd2ef71e4d5021d026572d5ba0f0 | |
| parent | 1ce81f4f8727f42c052fe814f3df20bc92fdb168 (diff) | |
| download | linux-3981c4728bcec97f352f8518f05a0015c7df6a3c.tar.bz2 | |
Hexagon: fix up int enable/disable at ret_from_fork
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 <rkuo@codeaurora.org>
| -rw-r--r-- | arch/hexagon/kernel/vm_entry.S | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/hexagon/kernel/vm_entry.S b/arch/hexagon/kernel/vm_entry.S index 9add73ab57d8..34470911d4a7 100644 --- a/arch/hexagon/kernel/vm_entry.S +++ b/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; } |