Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-um / smp.h

diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h
index d879eba2b52c7d74e646a3213911304f877279c5..84f8cf29324e8950fd941b38a98fe76eea3a463f 100644 (file)
--- a/include/asm-um/smp.h
+++ b/include/asm-um/smp.h
@@ -3,7 +3,6 @@
 
 #ifdef CONFIG_SMP
 
-#include "linux/config.h"
 #include "linux/bitops.h"
 #include "asm/current.h"
 #include "linux/cpumask.h"
@@ -23,6 +22,12 @@ extern inline void smp_cpus_done(unsigned int maxcpus)
 {
 }
 
+extern struct task_struct *idle_threads[NR_CPUS];
+
+#else
+
+#define hard_smp_processor_id()                0
+
 #endif
 
 #endif