diff options
author | Richard Kuo <rkuo@codeaurora.org> | 2012-10-23 18:26:01 -0500 |
---|---|---|
committer | Richard Kuo <rkuo@codeaurora.org> | 2013-03-27 22:14:02 -0500 |
commit | 7aa385ff919215de801d4e27672641b89828286a (patch) | |
tree | a33d3aff5cd04abf881dcc3165a48fd79a78b001 | |
parent | 6bc98e58dd4db0390a1e87e2d10d9b1101c0a359 (diff) | |
download | linux-hexagon-kernel-7aa385ff919215de801d4e27672641b89828286a.tar.gz |
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 9add73ab57d873..34470911d4a709 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; } |