From 4b34130b861911b2fbc62e706239d55ce817d203 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 17 Dec 2008 18:45:14 +0100 Subject: Add a "vg_" to public viengoos identifiers. 2008-12-17 Neal H. Walfield * viengoos/activity.h: Add a "vg_" to public viengoos identifiers. Update users. * viengoos/addr-trans.h: Likewise. * viengoos/addr.h: Likewise. * viengoos/cap.h: Likewise. * viengoos/folio.h: Likewise. * viengoos/futex.h: Likewise. * viengoos/rpc.h: Likewise. * viengoos/thread.h: Likewise. --- libhurd-mm/mm-init.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libhurd-mm/mm-init.c') diff --git a/libhurd-mm/mm-init.c b/libhurd-mm/mm-init.c index caf362e..896b69f 100644 --- a/libhurd-mm/mm-init.c +++ b/libhurd-mm/mm-init.c @@ -38,19 +38,19 @@ extern struct hurd_startup_data *__hurd_startup_data; -addr_t meta_data_activity; +vg_addr_t meta_data_activity; int mm_init_done; void -mm_init (addr_t activity) +mm_init (vg_addr_t activity) { assert (! mm_init_done); extern int output_debug; output_debug = 1; - if (ADDR_IS_VOID (activity)) + if (VG_ADDR_IS_VOID (activity)) meta_data_activity = __hurd_startup_data->activity; else meta_data_activity = activity; @@ -74,8 +74,8 @@ mm_init (addr_t activity) #ifdef i386 void test (int nesting) { - addr_t addr = as_alloc (PAGESIZE_LOG2, 1, true); - void *a = ADDR_TO_PTR (addr_extend (addr, 0, PAGESIZE_LOG2)); + vg_addr_t addr = as_alloc (PAGESIZE_LOG2, 1, true); + void *a = VG_ADDR_TO_PTR (vg_addr_extend (addr, 0, PAGESIZE_LOG2)); int recursed = false; @@ -83,7 +83,7 @@ mm_init (addr_t activity) bool fault (struct pager *pager, uintptr_t offset, int count, bool ro, uintptr_t fault_addr, uintptr_t ip, - struct activation_fault_info info) + struct vg_activation_fault_info info) { assert (a == (void *) (fault_addr & ~(PAGESIZE - 1))); assert (count == 1); @@ -115,9 +115,9 @@ mm_init (addr_t activity) /* We cannot easily check esp and eip here. */ as_ensure (addr); - storage = storage_alloc (ADDR_VOID, - cap_page, STORAGE_UNKNOWN, - OBJECT_POLICY_DEFAULT, + storage = storage_alloc (VG_ADDR_VOID, + vg_cap_page, STORAGE_UNKNOWN, + VG_OBJECT_POLICY_DEFAULT, addr); if (nesting > 1 && ! recursed) -- cgit v1.2.3