Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c5cac63 authored by Imre Deak's avatar Imre Deak Committed by Russell King
Browse files

ARM: 6050/1: VFP: fix the SMP versions of vfp_{sync,flush}_hwstate 



From: Imre Deak <imre.deak@nokia.com>

Recently the UP versions of these functions were refactored and as
a side effect it became possible to call them for the current thread.
This isn't true for the SMP versions however, so fix this up.

Signed-off-by: default avatarImre Deak <imre.deak@nokia.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7e5a69e8

arch/arm/vfp/vfpmodule.c

+10 −21
Original line number Diff line number Diff line
@@ -428,26 +428,6 @@ static void vfp_pm_init(void) 
static inline void vfp_pm_init(void) { }

#endif /* CONFIG_PM */



/*

 * Synchronise the hardware VFP state of a thread other than current with the

 * saved one. This function is used by the ptrace mechanism.

 */

#ifdef CONFIG_SMP

void vfp_sync_hwstate(struct thread_info *thread)

{

}



void vfp_flush_hwstate(struct thread_info *thread)

{

	/*

	 * On SMP systems, the VFP state is automatically saved at every

	 * context switch. We mark the thread VFP state as belonging to a

	 * non-existent CPU so that the saved one will be reloaded when

	 * needed.

	 */

	thread->vfpstate.hard.cpu = NR_CPUS;

}

#else

void vfp_sync_hwstate(struct thread_info *thread)

{

	unsigned int cpu = get_cpu();
@@ -490,9 +470,18 @@ void vfp_flush_hwstate(struct thread_info *thread) 
		last_VFP_context[cpu] = NULL;

	}



#ifdef CONFIG_SMP

	/*

	 * For SMP we still have to take care of the case where the thread

	 * migrates to another CPU and then back to the original CPU on which

	 * the last VFP user is still the same thread. Mark the thread VFP

	 * state as belonging to a non-existent CPU so that the saved one will

	 * be reloaded in the above case.

	 */

	thread->vfpstate.hard.cpu = NR_CPUS;

#endif

	put_cpu();

}

#endif



#include <linux/smp.h>