From 8983326f88912bbdb11f7e289b4824622edc5612 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 11 Jul 2005 17:38:36 +0100
Subject: [PATCH] --- yaml --- r: 4757 b: refs/heads/master c:
 d12734d14e5602816f0b16b17a8cef5ea70afb5a h: refs/heads/master i:   4755:
 9fc91870395bce3222ae1e92a97eba489f725f30 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/kernel/smp.c              | 4 ++--
 trunk/arch/arm/mach-integrator/platsmp.c | 2 +-
 trunk/include/asm-arm/smp.h              | 3 ---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 127ba71f5d48..4c702f9bd911 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7343c9ba8ed9d504cd2daf960da58971c6631601
+refs/heads/master: d12734d14e5602816f0b16b17a8cef5ea70afb5a
diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
index a931409c8fe4..44a27b2a3c29 100644
--- a/trunk/arch/arm/kernel/smp.c
+++ b/trunk/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);
 }
 
diff --git a/trunk/arch/arm/mach-integrator/platsmp.c b/trunk/arch/arm/mach-integrator/platsmp.c
index ead15dfcb53d..88f40a5189cd 100644
--- a/trunk/arch/arm/mach-integrator/platsmp.c
+++ b/trunk/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);
 	}
 
 	/*
diff --git a/trunk/include/asm-arm/smp.h b/trunk/include/asm-arm/smp.h
index 6c6c60adbbaa..dbb4d859c586 100644
--- a/trunk/include/asm-arm/smp.h
+++ b/trunk/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)