| From 1328f02005bbbaed15b9d5b7f3ab5ec9d4d5268a Mon Sep 17 00:00:00 2001 |
| From: Fabio Estevam <festevam@gmail.com> |
| Date: Mon, 22 Jan 2018 12:20:26 +0100 |
| Subject: ARM: 8746/1: vfp: Go back to clearing vfp_current_hw_state[] |
| |
| From: Fabio Estevam <festevam@gmail.com> |
| |
| commit 1328f02005bbbaed15b9d5b7f3ab5ec9d4d5268a upstream. |
| |
| Commit 384b38b66947 ("ARM: 7873/1: vfp: clear vfp_current_hw_state |
| for dying cpu") fixed the cpu dying notifier by clearing |
| vfp_current_hw_state[]. However commit e5b61bafe704 ("arm: Convert VFP |
| hotplug notifiers to state machine") incorrectly used the original |
| vfp_force_reload() function in the cpu dying notifier. |
| |
| Fix it by going back to clearing vfp_current_hw_state[]. |
| |
| Fixes: e5b61bafe704 ("arm: Convert VFP hotplug notifiers to state machine") |
| Cc: linux-stable <stable@vger.kernel.org> |
| Reported-by: Kohji Okuno <okuno.kohji@jp.panasonic.com> |
| Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/vfp/vfpmodule.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/arm/vfp/vfpmodule.c |
| +++ b/arch/arm/vfp/vfpmodule.c |
| @@ -648,7 +648,7 @@ int vfp_restore_user_hwstate(struct user |
| */ |
| static int vfp_dying_cpu(unsigned int cpu) |
| { |
| - vfp_force_reload(cpu, current_thread_info()); |
| + vfp_current_hw_state[cpu] = NULL; |
| return 0; |
| } |
| |
