diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-03-31 12:57:05 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-05-19 16:11:56 +0200 |
| commit | b3c5e41bc05bc622c637d1da75a3c63091e4e789 (patch) | |
| tree | 21327a66953e3014359ac8b4fce2e814ed2fdd62 /vm | |
| parent | 8b026d66eb22e1fcf1cb03974606dca991aae392 (diff) | |
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.
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/vm_fault.c | 2 | ||||
| -rw-r--r-- | vm/vm_map.h | 2 | ||||
| -rw-r--r-- | vm/vm_object.h | 2 | ||||
| -rw-r--r-- | vm/vm_page.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/vm/vm_fault.c b/vm/vm_fault.c index 686156c9..0fa4d6af 100644 --- a/vm/vm_fault.c +++ b/vm/vm_fault.c @@ -51,7 +51,7 @@ #include <mach/memory_object.h> #include <vm/memory_object_user.user.h> /* For memory_object_data_{request,unlock} */ -#include <kern/macro_help.h> +#include <kern/macros.h> #include <kern/slab.h> #if MACH_PCSAMPLE diff --git a/vm/vm_map.h b/vm/vm_map.h index b8103ebc..fc7730a2 100644 --- a/vm/vm_map.h +++ b/vm/vm_map.h @@ -52,7 +52,7 @@ #include <vm/vm_types.h> #include <kern/lock.h> #include <kern/rbtree.h> -#include <kern/macro_help.h> +#include <kern/macros.h> /* TODO: make it dynamic */ #define KENTRY_DATA_SIZE (256*PAGE_SIZE) diff --git a/vm/vm_object.h b/vm/vm_object.h index 5c42f568..3bfc67ab 100644 --- a/vm/vm_object.h +++ b/vm/vm_object.h @@ -45,7 +45,7 @@ #include <kern/lock.h> #include <kern/assert.h> #include <kern/debug.h> -#include <kern/macro_help.h> +#include <kern/macros.h> #include <vm/pmap.h> #include <ipc/ipc_types.h> diff --git a/vm/vm_page.h b/vm/vm_page.h index 4fe1b41d..e6a8c497 100644 --- a/vm/vm_page.h +++ b/vm/vm_page.h @@ -42,7 +42,7 @@ #include <kern/queue.h> #include <kern/lock.h> -#include <kern/macro_help.h> +#include <kern/macros.h> #include <kern/sched_prim.h> /* definitions of wait/wakeup */ #if MACH_VM_DEBUG |