diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-01 15:43:43 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-01 15:43:43 -0700 |
| commit | f2857a34e3fe8d47f33b6e97e3335a7c5dfdcd20 (patch) | |
| tree | 74538ca6dd90333157b6c4922f3924874b8b6351 | |
| parent | f211fb0e2cd9fc18fc1619ca0273e53b2415424f (diff) | |
| parent | 845f2e4781d2182e82a9235b7a744e888716ea80 (diff) | |
Merge branch 'v3.14/topic/nohz' into linux-linaro-lsk-v3.14lsk-v3.14-15.08
* v3.14/topic/nohz:
arm64: el0_dbg does not set link reg for return to user path, breaks debug
| -rw-r--r-- | arch/arm64/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 3e6f4dc5e61e..f95b6e8afdce 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -537,6 +537,7 @@ el0_dbg: disable_step x1 mov x1, x25 mov x2, sp + adr lr, ret_from_exception b do_debug_exception el0_inv: ct_user_exit |