diff options
| author | Chris Metcalf <cmetcalf@ezchip.com> | 2015-07-30 12:32:46 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@ezchip.com> | 2015-08-03 12:14:48 -0400 |
| commit | 232ff5eb2bf304fc699b132134437a7cb9b2ec16 (patch) | |
| tree | ed92e241ee1a96418ccf4a91200bd63ebb4d5567 /arch | |
| parent | a0ddef81f4aeeeec3326f6b6a255d8ea13b41908 (diff) | |
| download | linux-stable-232ff5eb2bf304fc699b132134437a7cb9b2ec16.tar.gz linux-stable-232ff5eb2bf304fc699b132134437a7cb9b2ec16.tar.bz2 linux-stable-232ff5eb2bf304fc699b132134437a7cb9b2ec16.zip | |
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: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Chris Metcalf <cmetcalf@ezchip.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tile/include/asm/switch_to.h | 8 | ||||
| -rw-r--r-- | arch/tile/kernel/process.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/tile/include/asm/switch_to.h b/arch/tile/include/asm/switch_to.h index b8f888cbe6b0..34ee72705521 100644 --- a/arch/tile/include/asm/switch_to.h +++ b/arch/tile/include/asm/switch_to.h @@ -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) diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c index a45213781ad0..7d5769310bef 100644 --- a/arch/tile/kernel/process.c +++ b/arch/tile/kernel/process.c @@ -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 |