Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index d699a16b0cb275609b6c8fd474426d37cb6f7a9c..837e8bce134930405e98192986c3b4fd10ce4151 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -6,7 +6,6 @@
  *             Alan Cox. <alan@redhat.com>
  */
 
-#include <linux/config.h>
 
 extern void cpu_idle(void);
 
@@ -82,7 +81,11 @@ void smp_prepare_boot_cpu(void);
  */
 #define raw_smp_processor_id()                 0
 #define hard_smp_processor_id()                        0
-#define smp_call_function(func,info,retry,wait)        ({ 0; })
+static inline int up_smp_call_function(void)
+{
+       return 0;
+}
+#define smp_call_function(func,info,retry,wait)        (up_smp_call_function())
 #define on_each_cpu(func,info,retry,wait)      \
        ({                                      \
                local_irq_disable();            \
@@ -122,4 +125,6 @@ static inline void smp_send_reschedule(int cpu) { }
 #define put_cpu()              preempt_enable()
 #define put_cpu_no_resched()   preempt_enable_no_resched()
 
+void smp_setup_processor_id(void);
+
 #endif /* __LINUX_SMP_H */