mac80211: A-MPDU Rx adding basic functionality

[safe/jmp/linux-2.6] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index d699a16..c25e66b 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -6,7 +6,7 @@
  *             Alan Cox. <alan@redhat.com>
  */
 
-#include <linux/config.h>
+#include <linux/errno.h>
 
 extern void cpu_idle(void);
 
@@ -54,6 +54,9 @@ extern void smp_cpus_done(unsigned int max_cpus);
  */
 int smp_call_function(void(*func)(void *info), void *info, int retry, int wait);
 
+int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
+                               int retry, int wait);
+
 /*
  * Call a function on all processors
  */
@@ -81,8 +84,12 @@ void smp_prepare_boot_cpu(void);
  *     These macros fold the SMP functionality into a single CPU system
  */
 #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 (*func)(void *), void *info)
+{
+       return 0;
+}
+#define smp_call_function(func, info, retry, wait) \
+                       (up_smp_call_function(func, info))
 #define on_each_cpu(func,info,retry,wait)      \
        ({                                      \
                local_irq_disable();            \
@@ -93,6 +100,16 @@ void smp_prepare_boot_cpu(void);
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()                     1
 #define smp_prepare_boot_cpu()                 do {} while (0)
+#define smp_call_function_single(cpuid, func, info, retry, wait) \
+({ \
+       WARN_ON(cpuid != 0);    \
+       local_irq_disable();    \
+       (func)(info);           \
+       local_irq_enable();     \
+       0;                      \
+})
+#define smp_call_function_mask(mask, func, info, wait) \
+                       (up_smp_call_function(func, info))
 
 #endif /* !SMP */
 
@@ -122,4 +139,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 */