mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 18:39:59 +00:00
Code Issues Releases Wiki Activity

x86: use remove_from_maps in cpu_disable

Browse source 
it is already used in x86_64. In i386, it only
removes from cpu_online_map

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber Costa 2008-03-03 14:13:05 -03:00 committed by Ingo Molnar
parent fc25da9ec6
commit 045f9d2202
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/x86/kernel/smpboot_32.c
View file

@ -1041,6 +1041,11 @@ void __init native_smp_prepare_boot_cpu(void)
}
#ifdef CONFIG_HOTPLUG_CPU
static void __ref remove_cpu_from_maps(int cpu)
{
cpu_clear(cpu, cpu_online_map);
}
int __cpu_disable(void)
{
cpumask_t map = cpu_online_map;
@ -1066,7 +1071,7 @@ int __cpu_disable(void)
remove_siblinginfo(cpu);
cpu_clear(cpu, map);
remove_cpu_from_maps(cpu);
fixup_irqs(map);
/* It's now safe to remove this processor from the online map */
cpu_clear(cpu, cpu_online_map);

8
arch/x86/kernel/smpboot_64.c
View file

@ -838,10 +838,9 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
}
#ifdef CONFIG_HOTPLUG_CPU
static void __ref remove_cpu_from_maps(void)
static void __ref remove_cpu_from_maps(int cpu)
{
int cpu = smp_processor_id();
cpu_clear(cpu, cpu_online_map);
cpu_clear(cpu, cpu_callout_map);
cpu_clear(cpu, cpu_callin_map);
clear_bit(cpu, (unsigned long *)&cpu_initialized); /* was set by cpu_init() */
@ -880,8 +879,7 @@ int __cpu_disable(void)
remove_siblinginfo(cpu);
/* It's now safe to remove this processor from the online map */
cpu_clear(cpu, cpu_online_map);
remove_cpu_from_maps();
remove_cpu_from_maps(cpu);
fixup_irqs(cpu_online_map);
return 0;
}