Commit 3f169e18 authored by Andrey Konovalov's avatar Andrey Konovalov

Automatically merging tracking-ll-misc-fixes into merge-linux-linaro

Conflicting files:
arch/arm/mach-exynos/headsmp.S
parents 6a8ec449 041fa155
......@@ -39,11 +39,14 @@ mon_vectors:
W(b) . /* fiq */
/* Return directly back to the caller without leaving Hyp mode: */
1: mrs lr, elr_hyp
1:
ARM_BE8(setend be)
mrs lr, elr_hyp
mov pc, lr
/* In monitor mode, set up HVBAR and SCR then return to caller in NS-SVC. */
2:
ARM_BE8(setend be)
mrc p15, 0, r1, c1, c1, 0 @ SCR
/*
* Set SCR.NS=1(needed for setting HVBAR and also returning to NS state)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment