More merge conflicts..

63e4719f · Silas Boyd-Wickizer · 7c537db5 · 06a9242b · 63e4719f · 63e4719f
--- a/compiler.h
+++ b/compiler.h
 #define __padout__  char __padout[0] __attribute__((aligned(CACHELINE)))
 #define __mpalign__ __attribute__((aligned(CACHELINE)))
 #define __noret__   __attribute__((noreturn))
-
-static inline void
-barrier(void)
-{
-  __asm volatile("" ::: "memory");
-}
+#define barrier() __asm volatile("" ::: "memory")
--- a/param.h
+++ b/param.h
@@ -21,7 +21,6 @@
 #define VERIFYFREE    LOCKSTAT
 #define ALLOC_MEMSET  1
 #define KSHAREDSIZE   (32 << 10)
-#define WQENABLE      1
 #define WQSHIFT       4
 #if defined(HW_josmp)
 #define NCPU         16  // maximum number of CPUs

--- a/proc.c
+++ b/proc.c
@@ -376,8 +376,6 @@ scheduler(void)
        worked = wq_trywork();
      } while(worked);
      sti();
-      if (!WQENABLE)
-        hlt();
    }
  }
 }

--- a/wq.c
+++ b/wq.c
-#if WQENABLE
 #include "types.h"
 #include "kernel.h"
 #include "spinlock.h"
@@ -248,5 +247,3 @@ initwq(void)
  for (i = 0; i < NCPU; i++)
    initlock(&queue[i].lock, "wq lock", LOCKSTAT_WQ);
 }
-
-#endif // WQENABLE