From 697030ed3d78281b1d648a6fc37e8fc58edf32d4 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Tue, 18 Feb 1997 14:07:03 +0000 Subject: [PATCH] Removed vestiges of Mach lock types. vm_map.h: Removed #include of . curproc is only used in some macros and users of the macros already include . --- sys/vm/vm.h | 11 ----------- sys/vm/vm_map.h | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/sys/vm/vm.h b/sys/vm/vm.h index a87c43565021..1fd27452dd03 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -70,15 +70,4 @@ struct vm_page; typedef struct vm_page *vm_page_t; #endif -/* - * MACH VM locking type mappings to kernel types - */ -#include -typedef struct simplelock simple_lock_data_t; -typedef struct simplelock *simple_lock_t; -#if 0 -typedef struct lock lock_data_t; -typedef struct lock *lock_t; -#endif - #endif /* VM_H */ diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 1c55c57ae268..19dfaa7a2957 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -133,7 +133,7 @@ struct vm_map { vm_size_t size; /* virtual size */ boolean_t is_main_map; /* Am I a main map? */ int ref_count; /* Reference count */ - simple_lock_data_t ref_lock; /* Lock for ref_count field */ + struct simplelock ref_lock; /* Lock for ref_count field */ vm_map_entry_t hint; /* hint for quick lookups */ vm_map_entry_t first_free; /* First free space hint */ boolean_t entries_pageable; /* map entries pageable?? */ @@ -188,8 +188,6 @@ typedef struct { * Perform locking on the data portion of a map. */ -#include /* XXX for curproc and p_pid */ - #define vm_map_lock_drain_interlock(map) { \ lockmgr(&(map)->lock, LK_DRAIN|LK_INTERLOCK, \ &(map)->ref_lock, curproc); \