Merge branch 'upstream'

[powerpc.git] / include / asm-arm / smp.h

diff --git a/include/asm-arm/smp.h b/include/asm-arm/smp.h
index 6c6c60a..dbb4d85 100644 (file)
--- a/include/asm-arm/smp.h
+++ b/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)