diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-14 13:40:22 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-14 13:40:22 -0600 |
| commit | e2f8b472a70827348ce2007e121d67f49047ba62 (patch) | |
| tree | 8feae62a175cc3d26cf89262c0b82590c53eda1f /arch | |
| parent | ccda4af0f4b92f7b4c308d3acc262f4a7e3affad (diff) | |
| parent | 5df7a99bdd0de4a0480320264c44c04543c29d5a (diff) | |
Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index aff6e6eadc70..ee7b07938dd5 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); |