Compiles with GCC
[akaros.git] / kern / include / smp.h
index e911da9..36be0bb 100644 (file)
 /* SMP related functions */
 
 #include <arch/smp.h>
-#include <arch/types.h>
+#include <ros/common.h>
 #include <trap.h>
 #include <atomic.h>
+#include <process.h>
 #include <workqueue.h>
 #include <env.h>
 
 // will want this padded out to cacheline alignment
 struct per_cpu_info {
-       uint32_t lock;
+       spinlock_t lock;
        bool preempt_pending;
-       struct workqueue workqueue;
+       struct workqueue TP(void*) workqueue;
+#ifdef __i386__
+       spinlock_t amsg_lock;
+       unsigned amsg_current;
+       active_message_t active_msgs[NUM_ACTIVE_MESSAGES];
+#endif
 };
-extern struct per_cpu_info  per_cpu_info[MAX_NUM_CPUS];
+extern struct per_cpu_info per_cpu_info[MAX_NUM_CPUS];
 extern volatile uint8_t num_cpus;
 
 /* SMP bootup functions */
@@ -34,7 +40,7 @@ int smp_call_function_self(poly_isr_t handler, TV(t) data,
                            handler_wrapper_t** wait_wrapper);
 int smp_call_function_all(poly_isr_t handler, TV(t) data,
                           handler_wrapper_t** wait_wrapper);
-int smp_call_function_single(uint8_t dest, poly_isr_t handler, TV(t) data,
+int smp_call_function_single(uint32_t dest, poly_isr_t handler, TV(t) data,
                              handler_wrapper_t** wait_wrapper);
 int smp_call_wait(handler_wrapper_t*SAFE wrapper);