diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-05 11:07:28 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-05 11:07:28 (GMT) |
| commit | 598bcc6ea6ec4032d2ace8b1b43d11b4708af072 (patch) | |
| tree | 675a2b01617549b539a4dcb1aec7141798e1f324 /arch/arm/kernel/entry-v7m.S | |
| parent | 0bed4b7aa02c06e05121875dc443295d55b9d91d (diff) | |
| parent | e679660dbb8347f275fe5d83a5dd59c1fb6c8e63 (diff) | |
| download | linux-598bcc6ea6ec4032d2ace8b1b43d11b4708af072.tar.xz | |
Merge branches 'misc' and 'misc-rc6' into for-linus
Diffstat (limited to 'arch/arm/kernel/entry-v7m.S')
| -rw-r--r-- | arch/arm/kernel/entry-v7m.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S index b6c8bb9..907534f 100644 --- a/arch/arm/kernel/entry-v7m.S +++ b/arch/arm/kernel/entry-v7m.S @@ -88,7 +88,7 @@ __pendsv_entry: @ execute the pending work, including reschedule get_thread_info tsk mov why, #0 - b ret_to_user + b ret_to_user_from_irq ENDPROC(__pendsv_entry) /* |