浏览代码

[PATCH] ARM SMP: Rename cpu_present_mask to cpu_possible_map

The kernel's terminology for this is cpu_possible_map not
cpu_present_mask.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 20 年之前
父节点
当前提交
d12734d14e
共有 3 个文件被更改,包括 3 次插入6 次删除
  1. 2 2
      arch/arm/kernel/smp.c
  2. 1 1
      arch/arm/mach-integrator/platsmp.c
  3. 0 3
      include/asm-arm/smp.h

+ 2 - 2
arch/arm/kernel/smp.c

@@ -36,7 +36,7 @@
  * The present bitmask indicates that the CPU is physically present.
  * The online bitmask indicates that the CPU is up and running.
  */
-cpumask_t cpu_present_mask;
+cpumask_t cpu_possible_map;
 cpumask_t cpu_online_map;
 
 /*
@@ -235,7 +235,7 @@ void __init smp_prepare_boot_cpu(void)
 {
 	unsigned int cpu = smp_processor_id();
 
-	cpu_set(cpu, cpu_present_mask);
+	cpu_set(cpu, cpu_possible_map);
 	cpu_set(cpu, cpu_online_map);
 }
 

+ 1 - 1
arch/arm/mach-integrator/platsmp.c

@@ -178,7 +178,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	 * be present.
 	 */
 	for (i = 0; i < max_cpus; i++) {
-		cpu_set(i, cpu_present_mask);
+		cpu_set(i, cpu_possible_map);
 	}
 
 	/*

+ 0 - 3
include/asm-arm/smp.h

@@ -23,9 +23,6 @@
 
 #define raw_smp_processor_id() (current_thread_info()->cpu)
 
-extern cpumask_t cpu_present_mask;
-#define cpu_possible_map cpu_present_mask
-
 /*
  * at the moment, there's not a big penalty for changing CPUs
  * (the >big< penalty is running SMP in the first place)