summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChiaHao <andy.jhshiu@gmail.com>2014-06-12 15:32:33 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-09 11:18:27 -0700
commit04f19c5801b5e45ba34a559779e284bfbcee62b9 (patch)
tree7cf68c97f5a752328388cb4806d9301977ebbb30
parentea49087c4616caa9bceb8ce488c242bb2487bd76 (diff)
arm64: Bug fix in stack alignment exception
commit 3906c2b53cd23c2ae03e6ce41432c8e7f0a3cbbb upstream. The value of ESR has been stored into x1, and should be directly pass to do_sp_pc_abort function, "MOV x1, x25" is an extra operation and do_sp_pc_abort will get the wrong value of ESR. Signed-off-by: ChiaHao <andy.jhshiu@gmail.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Cc: <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm64/kernel/entry.S1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 39ac630d83de..a8e4bdbbb4b8 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -275,7 +275,6 @@ el1_sp_pc:
* Stack or PC alignment exception handling
*/
mrs x0, far_el1
- mov x1, x25
mov x2, sp
b do_sp_pc_abort
el1_undef: