Move attribute defines from types.h to lib.h

f25448ff · Silas Boyd-Wickizer · 4f9c36a7 · f25448ff · f25448ff · f25448ff
--- a/lib.h
+++ b/lib.h
@@ -22,3 +22,7 @@
 #define subfetch(ptr, val)     __sync_sub_and_fetch(ptr, val)
 #define fetchadd(ptr, val)     __sync_fetch_and_add(ptr, val)
 #define __offsetof             offsetof
+
+#define __mpalign__ __attribute__((aligned(CACHELINE)))
+#define __padout__  char __padout[0] __attribute__((aligned(CACHELINE)))
+#define __noret__   __attribute__((noreturn))
--- a/prof.c
+++ b/prof.c
 #include "types.h"
+#include "kernel.h"
 #include "spinlock.h"
 #include "condvar.h"
 #include "fs.h"
 #include "file.h"
 #include "prof.h"
-#include "kernel.h"
 #include "bits.h"
 #include "amd64.h"


--- a/sampler.c
+++ b/sampler.c
@@ -3,7 +3,6 @@
 #include "condvar.h"
 #include "fs.h"
 #include "file.h"
-#include "prof.h"
 #include "kernel.h"
 #include "bits.h"
 #include "amd64.h"

--- a/types.h
+++ b/types.h
@@ -18,6 +18,3 @@ typedef uptr paddr;

 typedef u64 pme_t; // Page Map Entry (refers to any entry in any level)
 typedef pme_t pml4e_t;
-
-#define __mpalign__ __attribute__((aligned(CACHELINE)))
-#define __padout__ char __padout[0] __attribute__((aligned(CACHELINE)))