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

Commit 2cd9fb71 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: merge cpu_exit_clear 



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: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8aef135c

arch/x86/kernel/smpboot.c

+18 −0
Original line number Original line Diff line number Diff line
@@ -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;

arch/x86/kernel/smpboot_32.c

+0 −19
Original line number Original line Diff line number Diff line
@@ -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