Removed the workqueue
[akaros.git] / kern / include / smp.h
index 7bceab9..a05062b 100644 (file)
@@ -15,7 +15,6 @@
 #include <trap.h>
 #include <atomic.h>
 #include <process.h>
-#include <workqueue.h>
 
 #ifdef __SHARC__
 typedef sharC_env_t;
@@ -26,7 +25,6 @@ struct per_cpu_info {
        struct proc *cur_proc;
        trapframe_t *cur_tf;
        bool preempt_pending;
-       struct workqueue NTPTV(t) workqueue;
 
 #ifdef __SHARC__
        // held spin-locks. this will have to go elsewhere if multiple kernel
@@ -34,9 +32,14 @@ struct per_cpu_info {
        // zra: Used by Ivy. Let me know if this should go elsewhere.
        sharC_env_t sharC_env;
 #endif
+#ifdef __i386__
+       segdesc_t *gdt;
+#endif
 
-       spinlock_t amsg_lock;
-       struct active_msg_list NTPTV(a0t) NTPTV(a1t) NTPTV(a2t) active_msgs;
+       spinlock_t immed_amsg_lock;
+       struct kernel_msg_list NTPTV(a0t) NTPTV(a1t) NTPTV(a2t) immed_amsgs;
+       spinlock_t routine_amsg_lock;
+       struct kernel_msg_list NTPTV(a0t) NTPTV(a1t) NTPTV(a2t) routine_amsgs;
 }__attribute__((aligned(HW_CACHE_ALIGN)));
 
 typedef struct per_cpu_info NTPTV(t) NTPTV(a0t) NTPTV(a1t) NTPTV(a2t) per_cpu_info_t;