Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm

e2f8b472 · Linus Torvalds <[email protected]> · 2018-11-14 13:40:22 -06:00

Pull ARM fix from Russell King:
 "It was noticed that one of Julien's patches contained an error, this
  fixes that up"

* 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc

Commit: e2f8b472a70827348ce2007e121d67f49047ba62
Parents: ccda4af0 · 5df7a99b

Merge commit. Changes below are compared with the first parent: ccda4af0.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/arm/vfp/vfpmodule.c	modified	+1	−1	View file

arch/arm/vfp/vfpmodule.c

View file

diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index aff6e6e..ee7b079 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -573,7 +573,7 @@ int vfp_preserve_user_clear_hwstate(struct user_vfp *ufp,
 	 */
 	ufp_exc->fpexc = hwstate->fpexc;
 	ufp_exc->fpinst = hwstate->fpinst;
-	ufp_exc->fpinst2 = ufp_exc->fpinst2;
+	ufp_exc->fpinst2 = hwstate->fpinst2;
 
 	/* Ensure that VFP is disabled. */
 	vfp_flush_hwstate(thread);