diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-16 23:53:07 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-16 23:53:07 +0400 |
| commit | 3f169e1854aa8b7b555391b661f13349920cfbbb (patch) | |
| tree | 7a9da9b82839e09d1f49b0116c422585a56ebff2 | |
| parent | 6a8ec449204ca9cf070c8028b3eb419dfb060688 (diff) | |
| parent | 041fa155e0a7a49d4084be684f855e2a32c17324 (diff) | |
Automatically merging tracking-ll-misc-fixes into merge-linux-linaroll-20140416.0linux-linaro-3.14-2014.04ll_20140416.0
Conflicting files:
arch/arm/mach-exynos/headsmp.S
| -rw-r--r-- | arch/arm/mach-exynos/headsmp.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S index 08d3d3f53283..11684f628bd1 100644 --- a/arch/arm/mach-exynos/headsmp.S +++ b/arch/arm/mach-exynos/headsmp.S @@ -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) |