diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-09-19 23:20:44 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-09-19 23:20:44 +0200 |
| commit | ec91b8ae6735a3f2977dc886ea63ff28e1aeef41 (patch) | |
| tree | 67ac2a696cdd345b543d8415c74166bed11e9d4f /vm/vm_init.c | |
| parent | 9d952fb2d44ec2199a1d08999ff7a68aa26e9507 (diff) | |
| parent | 45fcd2d09c15820e58e2334b80f7367d2f98ebb7 (diff) | |
Merge branch 'master' into HEAD
Conflicts:
ChangeLog
kern/bootstrap.c
kern/debug.c
vm/vm_object.c
Diffstat (limited to 'vm/vm_init.c')
| -rw-r--r-- | vm/vm_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vm/vm_init.c b/vm/vm_init.c index b76b11b6..f6a40602 100644 --- a/vm/vm_init.c +++ b/vm/vm_init.c @@ -37,6 +37,7 @@ #include <mach/machine/vm_types.h> #include <kern/zalloc.h> #include <kern/kalloc.h> +#include <vm/vm_fault.h> #include <vm/vm_object.h> #include <vm/vm_map.h> #include <vm/vm_page.h> @@ -81,4 +82,5 @@ void vm_mem_bootstrap() void vm_mem_init() { vm_object_init(); + memory_object_proxy_init(); } |