Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

[deliverable/linux.git] / include / asm-um / smp.h

diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h
index ca552261ed1fcee5c3493830d2903e9754bcc3a3..f27a963131741ba935f80ec424c9b4c413ae63d4 100644 (file)
--- a/include/asm-um/smp.h
+++ b/include/asm-um/smp.h
@@ -18,12 +18,16 @@ extern int hard_smp_processor_id(void);
 extern int ncpus;
 
 
-extern inline void smp_cpus_done(unsigned int maxcpus)
+static 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