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

Commit 232ff5eb authored by Chris Metcalf's avatar Chris Metcalf
Browse files

tile: Remove finish_arch_switch 



Move the simulator bits into switch_to() and use
finish_arch_post_lock_switch() for the homecache migration bits.

Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
parent a0ddef81

arch/tile/include/asm/switch_to.h

+3 −5
Original line number Diff line number Diff line
@@ -53,15 +53,13 @@ extern unsigned long get_switch_to_pc(void); 
 * Kernel threads can check to see if they need to migrate their

 * stack whenever they return from a context switch; for user

 * threads, we defer until they are returning to user-space.

 * We defer homecache migration until the runqueue lock is released.

 */

#define finish_arch_switch(prev) do {                                     \

	if (unlikely((prev)->state == TASK_DEAD))                         \

		__insn_mtspr(SPR_SIM_CONTROL, SIM_CONTROL_OS_EXIT |       \

			((prev)->pid << _SIM_CONTROL_OPERATOR_BITS));     \

#define finish_arch_post_lock_switch() do {                               \

	__insn_mtspr(SPR_SIM_CONTROL, SIM_CONTROL_OS_SWITCH |             \

		(current->pid << _SIM_CONTROL_OPERATOR_BITS));            \

	if (current->mm == NULL && !kstack_hash &&                        \

	    current_thread_info()->homecache_cpu != smp_processor_id())   \

	    current_thread_info()->homecache_cpu != raw_smp_processor_id()) \

		homecache_migrate_kthread();                              \

} while (0)

arch/tile/kernel/process.c

+5 −0
Original line number Diff line number Diff line
@@ -446,6 +446,11 @@ struct task_struct *__sched _switch_to(struct task_struct *prev, 
	hardwall_switch_tasks(prev, next);

#endif



	/* Notify the simulator of task exit. */

	if (unlikely(prev->state == TASK_DEAD))

		__insn_mtspr(SPR_SIM_CONTROL, SIM_CONTROL_OS_EXIT |

			     (prev->pid << _SIM_CONTROL_OPERATOR_BITS));



	/*

	 * Switch kernel SP, PC, and callee-saved registers.

	 * In the context of the new task, return the old task pointer