Greg, On Sat, Jun 28, 2014 at 01:19:51AM +0100, [email protected] wrote: > The patch below does not apply to the 3.15-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <[email protected]>. > > ------------------ original commit in Linus's tree ------------------ > > From 3906c2b53cd23c2ae03e6ce41432c8e7f0a3cbbb Mon Sep 17 00:00:00 2001 > From: ChiaHao <[email protected]> > Date: Thu, 12 Jun 2014 15:32:33 +0100 > Subject: [PATCH] arm64: Bug fix in stack alignment exception > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > 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 <[email protected]> > Signed-off-by: Catalin Marinas <[email protected]> > Cc: <[email protected]> > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index bf017f4ffb4f..9ce04ba6bcb0 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S > @@ -279,7 +279,6 @@ el1_sp_pc: > */ > mrs x0, far_el1 > enable_dbg > - mov x1, x25 > mov x2, sp > b do_sp_pc_abort > el1_undef:
Could you please apply the patch below instead? Thanks. -------------------------------8<------------------------------- >From 00eb7850c3f148afff26376b3f0572b8c15be656 Mon Sep 17 00:00:00 2001 From: ChiaHao <[email protected]> Date: Thu, 12 Jun 2014 15:32:33 +0100 Subject: [PATCH] arm64: Bug fix in stack alignment exception MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 <[email protected]> Signed-off-by: Catalin Marinas <[email protected]> Cc: <[email protected]> --- arch/arm64/kernel/entry.S | 1 - 1 file changed, 1 deletion(-) 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: -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
