UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86_32: clean up play_dead 

The removal of the CPU from the various maps was redundant as it already
happened in cpu_disable.

After cleaning this up, cpu_uninit only resets the tlb state, so rename
it and create a noop version for the X86_64 case (so the two play_deads
can be unified later).

Signed-off-by: Alex Nixon <alex.nixon@citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alex Nixon 2008-08-22 11:52:12 +01:00 committed by Ingo Molnar
parent 93be71b672
commit 3790025863
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/cpu/common.c
View File

@ -714,14 +714,10 @@ void __cpuinit cpu_init(void)
mxcsr_feature_mask_init(); mxcsr_feature_mask_init();
} }
#ifdef CONFIG_HOTPLUG_CPU void reset_lazy_tlbstate(void)
void __cpuinit cpu_uninit(void)
{ {
int cpu = raw_smp_processor_id(); int cpu = raw_smp_processor_id();
cpu_clear(cpu, cpu_initialized);
/* lazy TLB state */
per_cpu(cpu_tlbstate, cpu).state = 0; per_cpu(cpu_tlbstate, cpu).state = 0;
per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm; per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
} }
#endif

17
arch/x86/kernel/process_32.c
View File

@ -75,26 +75,17 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
#include <asm/nmi.h> #include <asm/nmi.h>
static void cpu_exit_clear(void) /* We don't actually take CPU down, just spin without interrupts. */
void native_play_dead(void)
{ {
int cpu = raw_smp_processor_id(); int cpu = raw_smp_processor_id();
idle_task_exit(); idle_task_exit();
cpu_uninit(); reset_lazy_tlbstate();
irq_ctx_exit(cpu); irq_ctx_exit(cpu);
cpu_clear(cpu, cpu_callout_map);
cpu_clear(cpu, cpu_callin_map);
numa_remove_cpu(cpu);
}
/* We don't actually take CPU down, just spin without interrupts. */
void native_play_dead(void)
{
/* This must be done before dead CPU ack */
cpu_exit_clear();
mb(); mb();
/* Ack it */ /* Ack it */
__get_cpu_var(cpu_state) = CPU_DEAD; __get_cpu_var(cpu_state) = CPU_DEAD;

7
include/asm-x86/smp.h
View File

@ -221,7 +221,12 @@ static inline int hard_smp_processor_id(void)
#endif /* CONFIG_X86_LOCAL_APIC */ #endif /* CONFIG_X86_LOCAL_APIC */
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
extern void cpu_uninit(void); #ifdef CONFIG_X86_32
extern void reset_lazy_tlbstate(void);
#else
static inline void reset_lazy_tlbstate(void)
{ }
#endif /* CONFIG_X86_32 */
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */