diff options
| author | Richard Kuo <rkuo@codeaurora.org> | 2013-05-03 17:04:46 -0500 |
|---|---|---|
| committer | Richard Kuo <rkuo@codeaurora.org> | 2013-05-07 11:37:53 -0500 |
| commit | 13a95c48136aaa4cd30a35be2210869fa7e6119f (patch) | |
| tree | e4b6ffe03fbf66ebb5752f25983e179f04c27d7b /arch/hexagon | |
| parent | 426d29ccb2a8d44c18d3167327ee82b38287e7bf (diff) | |
| download | op-kernel-dev-13a95c48136aaa4cd30a35be2210869fa7e6119f.zip op-kernel-dev-13a95c48136aaa4cd30a35be2210869fa7e6119f.tar.gz | |
Hexagon: fix register used to call do_work_pending
ABI v2 callee saves start at R24.
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Diffstat (limited to 'arch/hexagon')
| -rw-r--r-- | arch/hexagon/kernel/vm_entry.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/hexagon/kernel/vm_entry.S b/arch/hexagon/kernel/vm_entry.S index e308618..67c6ccc 100644 --- a/arch/hexagon/kernel/vm_entry.S +++ b/arch/hexagon/kernel/vm_entry.S @@ -291,12 +291,12 @@ event_dispatch: /* "Nested control path" -- if the previous mode was kernel */ { R0 = memw(R29 + #_PT_ER_VMEST); - R16.L = #LO(do_work_pending); + R26.L = #LO(do_work_pending); } { P0 = tstbit(R0, #HVM_VMEST_UM_SFT); if (!P0.new) jump:nt restore_all; - R16.H = #HI(do_work_pending); + R26.H = #HI(do_work_pending); R0 = #VM_INT_DISABLE; } @@ -304,7 +304,7 @@ event_dispatch: * Check also the return from fork/system call, normally coming back from * user mode * - * R16 needs to have do_work_pending, and R0 should have VM_INT_DISABLE + * R26 needs to have do_work_pending, and R0 should have VM_INT_DISABLE */ check_work_pending: @@ -313,7 +313,7 @@ check_work_pending: { R0 = R29; /* regs should still be at top of stack */ R1 = memw(THREADINFO_REG + #_THREAD_INFO_FLAGS); - callr R16; + callr R26; } { @@ -375,11 +375,11 @@ _K_enter_debug: ret_from_fork: { call schedule_tail - R16.H = #HI(do_work_pending); + R26.H = #HI(do_work_pending); } { P0 = cmp.eq(R24, #0); - R16.L = #LO(do_work_pending); + R26.L = #LO(do_work_pending); R0 = #VM_INT_DISABLE; } if P0 jump check_work_pending |
