Commit e2f8b472 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ccda4af0 5df7a99b

arch/arm/vfp/vfpmodule.c

+1 −1
Original line number Diff line number Diff line
@@ -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);