Skip to content

Commit

Permalink
arm64: Enable interrupts before calling do_notify_resume()
Browse files Browse the repository at this point in the history
task_work_run() implementation had the side effect of enabling
interrupts. With commit ac3d0da (task_work: Make task_work_add()
lockless), interrupts are no longer enabled revealing the bug in the
arch code. This patch enables the interrupt explicitly before calling
do_notify_resume().

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
Catalin Marinas committed Oct 8, 2012
1 parent e048d00 commit 6916fd0
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm64/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ work_pending:
mov x0, sp // 'regs'
tst x2, #PSR_MODE_MASK // user mode regs?
b.ne no_work_pending // returning to kernel
enable_irq // enable interrupts for do_notify_resume()
bl do_notify_resume
b ret_to_user
work_resched:
Expand Down

0 comments on commit 6916fd0

Please sign in to comment.