From b3c5e41bc05bc622c637d1da75a3c63091e4e789 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Tue, 31 Mar 2015 12:57:05 +0200
Subject: kern: import `macros.h' from x15

Import the macro definitions from the x15 kernel project, and replace
all similar definitions littered all over the place with it.

Importing this file will make importing code from the x15 kernel
easier.  We are already using the red-black tree implementation and
the slab allocator from it, and we will import even more code in the
near future.

* kern/list.h: Do not define `structof', include `macros.h' instead.
* kern/rbtree.h: Likewise.
* kern/slab.c: Do not define `ARRAY_SIZE', include `macros.h' instead.
* i386/grub/misc.h: Likewise.
* i386/i386/xen.h: Do not define `barrier', include `macros.h' instead.
* kern/macro_help.h: Delete file.  Replaced by `macros.h'.
* kern/macros.h: New file.
* Makefrag.am (libkernel_a_SOURCES): Add new file, remove old file.
* device/dev_master.h: Adopt accordingly.
* device/io_req.h: Likewise.
* device/net_io.h: Likewise.
* i386/intel/read_fault.c: Likewise.
* ipc/ipc_kmsg.h: Likewise.
* ipc/ipc_mqueue.h: Likewise.
* ipc/ipc_object.h: Likewise.
* ipc/ipc_port.h: Likewise.
* ipc/ipc_space.h: Likewise.
* ipc/ipc_splay.c: Likewise.
* ipc/ipc_splay.h: Likewise.
* kern/assert.h: Likewise.
* kern/ast.h: Likewise.
* kern/pc_sample.h: Likewise.
* kern/refcount.h: Likewise.
* kern/sched.h: Likewise.
* kern/sched_prim.c: Likewise.
* kern/timer.c: Likewise.
* kern/timer.h: Likewise.
* vm/vm_fault.c: Likewise.
* vm/vm_map.h: Likewise.
* vm/vm_object.h: Likewise.
* vm/vm_page.h: Likewise.
---
 ipc/ipc_kmsg.h   | 2 +-
 ipc/ipc_mqueue.h | 2 +-
 ipc/ipc_object.h | 2 +-
 ipc/ipc_port.h   | 2 +-
 ipc/ipc_space.h  | 2 +-
 ipc/ipc_splay.c  | 2 +-
 ipc/ipc_splay.h  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ipc')

diff --git a/ipc/ipc_kmsg.h b/ipc/ipc_kmsg.h
index 620785b..393c039 100644
--- a/ipc/ipc_kmsg.h
+++ b/ipc/ipc_kmsg.h
@@ -38,7 +38,7 @@
 #include <mach/message.h>
 #include <kern/assert.h>
 #include <kern/cpu_number.h>
-#include <kern/macro_help.h>
+#include <kern/macros.h>
 #include <kern/kalloc.h>
 #include <ipc/ipc_marequest.h>
 #include <ipc/ipc_object.h>
diff --git a/ipc/ipc_mqueue.h b/ipc/ipc_mqueue.h
index f8a2f1e..2af5e02 100644
--- a/ipc/ipc_mqueue.h
+++ b/ipc/ipc_mqueue.h
@@ -37,7 +37,7 @@
 #include <mach/message.h>
 #include <kern/assert.h>
 #include <kern/lock.h>
-#include <kern/macro_help.h>
+#include <kern/macros.h>
 #include <ipc/ipc_kmsg_queue.h>
 #include <ipc/ipc_kmsg.h>
 #include <ipc/ipc_thread.h>
diff --git a/ipc/ipc_object.h b/ipc/ipc_object.h
index b83bb5a..be5bea7 100644
--- a/ipc/ipc_object.h
+++ b/ipc/ipc_object.h
@@ -38,7 +38,7 @@
 #include <mach/message.h>
 #include <ipc/ipc_types.h>
 #include <kern/lock.h>
-#include <kern/macro_help.h>
+#include <kern/macros.h>
 #include <kern/slab.h>
 
 typedef unsigned int ipc_object_refs_t;
diff --git a/ipc/ipc_port.h b/ipc/ipc_port.h
index 6914c71..ade6967 100644
--- a/ipc/ipc_port.h
+++ b/ipc/ipc_port.h
@@ -43,7 +43,7 @@
 #include <mach/kern_return.h>
 #include <mach/port.h>
 #include <kern/lock.h>
-#include <kern/macro_help.h>
+#include <kern/macros.h>
 #include <kern/ipc_kobject.h>
 #include <ipc/ipc_mqueue.h>
 #include <ipc/ipc_table.h>
diff --git a/ipc/ipc_space.h b/ipc/ipc_space.h
index c4683d2..3bd2f4d 100644
--- a/ipc/ipc_space.h
+++ b/ipc/ipc_space.h
@@ -42,7 +42,7 @@
 #include <mach/boolean.h>
 #include <mach/kern_return.h>
 #include <mach/mach_types.h>
-#include <kern/macro_help.h>
+#include <kern/macros.h>
 #include <kern/lock.h>
 #include <kern/slab.h>
 #include <ipc/ipc_splay.h>
diff --git a/ipc/ipc_splay.c b/ipc/ipc_splay.c
index 6fb5bcb..062a69f 100644
--- a/ipc/ipc_splay.c
+++ b/ipc/ipc_splay.c
@@ -35,7 +35,7 @@
 
 #include <mach/port.h>
 #include <kern/assert.h>
-#include <kern/macro_help.h>
+#include <kern/macros.h>
 #include <ipc/ipc_entry.h>
 #include <ipc/ipc_splay.h>
 
diff --git a/ipc/ipc_splay.h b/ipc/ipc_splay.h
index d3316ef..42e5a80 100644
--- a/ipc/ipc_splay.h
+++ b/ipc/ipc_splay.h
@@ -38,7 +38,7 @@
 
 #include <mach/port.h>
 #include <kern/assert.h>
-#include <kern/macro_help.h>
+#include <kern/macros.h>
 #include <ipc/ipc_entry.h>
 
 typedef struct ipc_splay_tree {
-- 
cgit v1.2.3