Merge branch 'v3.14/topic/nohz' into linux-linaro-lsk-v3.14

* v3.14/topic/nohz:
  arm64: el0_dbg does not set link reg for return to user path, breaks debug
This commit is contained in:
Kevin Hilman
2015-09-01 15:43:43 -07:00

View File

@@ -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