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

x86: change naming to match x86_64 

Change unmap_cpu_to_logical_apicid to numa_remove_cpu.
Besides being shorter, it is the same name x86_64 uses. We
can save an ifdef in the code this way.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber Costa 2008-06-04 02:03:07 -03:00 committed by Ingo Molnar
parent b5841765a2
commit 78e622705c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,13 +181,12 @@ static void map_cpu_to_logical_apicid(void)
map_cpu_to_node(cpu, node); map_cpu_to_node(cpu, node);
} }
static void unmap_cpu_to_logical_apicid(int cpu) static void numa_remove_cpu(int cpu)
{ {
cpu_2_logical_apicid[cpu] = BAD_APICID; cpu_2_logical_apicid[cpu] = BAD_APICID;
unmap_cpu_to_node(cpu); unmap_cpu_to_node(cpu);
} }
#else #else
#define unmap_cpu_to_logical_apicid(cpu) do {} while (0)
#define map_cpu_to_logical_apicid() do {} while (0) #define map_cpu_to_logical_apicid() do {} while (0)
#endif #endif
@ -946,10 +945,7 @@ restore_state:
if (boot_error) { if (boot_error) {
/* Try to put things back the way they were before ... */ /* Try to put things back the way they were before ... */
unmap_cpu_to_logical_apicid(cpu);
#ifdef CONFIG_X86_64
numa_remove_cpu(cpu); /* was set by numa_add_cpu */ numa_remove_cpu(cpu); /* was set by numa_add_cpu */
#endif
cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */
cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */
cpu_clear(cpu, cpu_present_map); cpu_clear(cpu, cpu_present_map);
@ -1244,7 +1240,7 @@ void cpu_exit_clear(void)
cpu_clear(cpu, cpu_callout_map); cpu_clear(cpu, cpu_callout_map);
cpu_clear(cpu, cpu_callin_map); cpu_clear(cpu, cpu_callin_map);
unmap_cpu_to_logical_apicid(cpu); numa_remove_cpu(cpu);
} }
# endif /* CONFIG_X86_32 */ # endif /* CONFIG_X86_32 */