lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: merge cpu_exit_clear

Browse Source 
this is the last remaining function in smpboot_32.c
Since it is i386 specific, move it around an ifdef to
smpboot.c

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber de Oliveira Costa
2008-03-19 14:26:12 -03:00
committed by Ingo Molnar
parent 8aef135c73
commit 2cd9fb71ee
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/kernel/smpboot.c
View File

@@ -1207,6 +1207,24 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
} }
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
# ifdef CONFIG_X86_32
void cpu_exit_clear(void)
{
int cpu = raw_smp_processor_id();
idle_task_exit();
cpu_uninit();
irq_ctx_exit(cpu);
cpu_clear(cpu, cpu_callout_map);
cpu_clear(cpu, cpu_callin_map);
unmap_cpu_to_logical_apicid(cpu);
}
# endif /* CONFIG_X86_32 */
void remove_siblinginfo(int cpu) void remove_siblinginfo(int cpu)
{ {
int sibling; int sibling;

19
arch/x86/kernel/smpboot_32.c
View File

@@ -74,25 +74,6 @@ EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
u8 apicid_2_node[MAX_APICID]; u8 apicid_2_node[MAX_APICID];
extern void unmap_cpu_to_logical_apicid(int cpu);
#ifdef CONFIG_HOTPLUG_CPU
void cpu_exit_clear(void)
{
int cpu = raw_smp_processor_id();
idle_task_exit();
cpu_uninit();
irq_ctx_exit(cpu);
cpu_clear(cpu, cpu_callout_map);
cpu_clear(cpu, cpu_callin_map);
unmap_cpu_to_logical_apicid(cpu);
}
#endif
/* Where the IO area was mapped on multiquad, always 0 otherwise */ /* Where the IO area was mapped on multiquad, always 0 otherwise */
void *xquad_portio; void *xquad_portio;
#ifdef CONFIG_X86_NUMAQ #ifdef CONFIG_X86_NUMAQ