From ec9defc2912e86a7e682ec6e37aac102fa69d94d Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 20 Mar 2006 11:31:36 +0000 Subject: 2006-03-20 Thomas Schwinge * DEVELOPMENT: Document the NORMA removal. 2006-03-20 Leonardo Lopes Pereira Remove unused and unsupported code. Consult the file `DEVELOPMENT' for details. [patch #4982] * bogus/norma_device.h: Remove file. * bogus/norma_ether.h: Likewise. * bogus/norma_ipc.h: Likewise. * bogus/norma_task.h: Likewise. * bogus/norma_vm.h: Likewise. * include/mach/mach_norma.defs: Likewise. * include/mach/norma_task.defs: Likewise. * include/mach/norma_special_ports.h: Likewise. * Makefile.in (bogus-files): Remove `norma_device.h', `norma_ether.h', `norma_ipc.h', `norma_task.h' and `norma_vm.h'. (mach-headers): Remove `mach_norma.defs', `norma_task.defs' and `norma_special_ports.h'. * device/ds_routines.c: Don't include anymore and adopt all users of NORMA_DEVICE as if it were always defined to `0'. * device/net_io.c: Likewise for , NORMA_ETHER. * kern/machine.c: Likewise. * ddb/db_command.c: Likevise for , NORMA_IPC. * ipc/ipc_init.c: Likewise. * ipc/ipc_kmsg.c: Likewise. * ipc/ipc_kmsg.h: Likewise. * ipc/ipc_mqueue.c: Likewise. * ipc/ipc_notify.c: Likewise. * ipc/ipc_port.c: Likewise. * ipc/ipc_port.h: Likewise. * ipc/ipc_space.c: Likewise. * ipc/ipc_space.h: Likewise. * ipc/mach_msg.c: Likewise. * kern/ast.c: Likewise. * kern/debug.c: Likewise. * kern/exception.c: Likewise. * kern/startup.c: Likewise. * vm/memory_object.c: Likewise. * vm/vm_map.c: Likewise. * kern/ipc_kobject.c: Likewise for , NORMA_TASK. * kern/task.c: Likewise. * kern/task.h: Likewise. * ddb/db_command.c: Likewise for , NORMA_VM. * device/dev_pager.c: Likewise. * include/mach/mach_types.defs: Likewise. * include/mach/mach_types.h: Likewise. * include/mach/memory_object_default.defs: Likewise. * include/mach/memory_object.defs: Likewise. * ipc/ipc_kmsg.c: Likewise. * kern/ipc_kobject.c: Likewise. * kern/ipc_mig.c: Likewise. * kern/startup.c: Likewise. * vm/memory_object.c: Likewise. * vm/vm_object.c: Likewise. * vm/vm_object.h: Likewise. * vm/vm_pageout.c: Likewise. --- vm/memory_object.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'vm/memory_object.c') diff --git a/vm/memory_object.c b/vm/memory_object.c index c01b740b..16e858a9 100644 --- a/vm/memory_object.c +++ b/vm/memory_object.c @@ -63,11 +63,6 @@ #include /* For vm_map_pageable */ #include -#include -#include -#if NORMA_VM -#include -#endif /* NORMA_VM */ #include #if MACH_PAGEMAP #include @@ -86,7 +81,6 @@ decl_simple_lock_data(,memory_manager_default_lock) * argument conversion. Explicit deallocation is necessary. */ -#if !NORMA_VM /* * If successful, destroys the map copy object. */ @@ -102,7 +96,6 @@ kern_return_t memory_object_data_provided(object, offset, data, data_cnt, data_cnt, lock_value, FALSE, IP_NULL, 0); } -#endif /* !NORMA_VM */ kern_return_t memory_object_data_supply(object, offset, data_copy, data_cnt, @@ -896,7 +889,6 @@ MACRO_END return (KERN_SUCCESS); } -#if !NORMA_VM /* * Old version of memory_object_lock_request. */ @@ -924,7 +916,6 @@ xxx_memory_object_lock_request(object, offset, size, should_return, should_flush, prot, reply_to, reply_to_type)); } -#endif /* !NORMA_VM */ kern_return_t memory_object_set_attributes_common(object, object_ready, may_cache, @@ -989,8 +980,6 @@ memory_object_set_attributes_common(object, object_ready, may_cache, return(KERN_SUCCESS); } -#if !NORMA_VM - /* * XXX rpd claims that reply_to could be obviated in favor of a client * XXX stub that made change_attributes an RPC. Need investigation. @@ -1052,7 +1041,6 @@ kern_return_t memory_object_ready(object, may_cache, copy_strategy) may_cache, copy_strategy, FALSE); } -#endif /* !NORMA_VM */ kern_return_t memory_object_get_attributes(object, object_ready, may_cache, copy_strategy) -- cgit v1.2.3