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