diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-09 06:31:32 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-09 06:31:32 (GMT) |
| commit | 7547ed9d3c6eb3e645f16951864973e342a8994a (patch) | |
| tree | 0bbcbf5628f377f775a61336db0af3b9348137dc /arch/arm64 | |
| parent | a38b2dd146c0bba28633fe857f0c4626e0c691cc (diff) | |
| parent | f37eb7b586f1dd24a86c50278c65322fc6787722 (diff) | |
| download | linux-7547ed9d3c6eb3e645f16951864973e342a8994a.tar.xz | |
Merge remote-tracking branch 'lts/linux-4.9.y' into linux-linaro-lsk-v4.9
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/head.S | 1 | ||||
| -rw-r--r-- | arch/arm64/mm/fault.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 7ee6d74..c186586 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -487,6 +487,7 @@ ENTRY(kimage_vaddr) * booted in EL1 or EL2 respectively. */ ENTRY(el2_setup) + msr SPsel, #1 // We want to use SP_EL{1,2} mrs x0, CurrentEL cmp x0, #CurrentEL_EL2 b.ne 1f diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 523b9d3..cf4e3f5 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -515,7 +515,7 @@ static const struct fault_info fault_info[] = { { do_translation_fault, SIGSEGV, SEGV_MAPERR, "level 0 translation fault" }, { do_translation_fault, SIGSEGV, SEGV_MAPERR, "level 1 translation fault" }, { do_translation_fault, SIGSEGV, SEGV_MAPERR, "level 2 translation fault" }, - { do_page_fault, SIGSEGV, SEGV_MAPERR, "level 3 translation fault" }, + { do_translation_fault, SIGSEGV, SEGV_MAPERR, "level 3 translation fault" }, { do_bad, SIGBUS, 0, "unknown 8" }, { do_page_fault, SIGSEGV, SEGV_ACCERR, "level 1 access flag fault" }, { do_page_fault, SIGSEGV, SEGV_ACCERR, "level 2 access flag fault" }, |