typo

2 files changed, 9 insertions, 36 deletions

diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index b592906559d..cf94b1cb114 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.19 1998/02/20 14:47:51 niklas Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.20 1998/04/25 07:04:11 niklas Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -136,7 +136,7 @@ vntblinit()
 
 
 /*
- * Mark a mount point as busy. Used to synchornize access and to delay
+ * Mark a mount point as busy. Used to synchronize access and to delay
  * unmounting. Interlock is not released on failure.
  */
 
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index ebe5fa82592..9dbde817dff 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_map.c,v 1.13 1998/03/01 00:38:11 niklas Exp $	*/
+/*	$OpenBSD: vm_map.c,v 1.14 1998/04/25 07:01:19 niklas Exp $	*/
 /*	$NetBSD: vm_map.c,v 1.23 1996/02/10 00:08:08 christos Exp $	*/
 
 /* 
@@ -136,16 +136,8 @@
  *	maps and requires map entries.
  */
 
-#if defined(MACHINE_NEW_NONCONTIG)
-u_int8_t	kentry_data_store[MAX_KMAP*sizeof(struct vm_map) +
-			MAX_KMAPENT*sizeof(struct vm_map_entry)];
-vm_offset_t	kentry_data = (vm_offset_t) kentry_data_store;
-vm_size_t	kentry_data_size = sizeof(kentry_data_store);
-#else
-/* NUKE NUKE NUKE */
 vm_offset_t	kentry_data;
 vm_size_t	kentry_data_size;
-#endif
 vm_map_entry_t	kentry_free;
 vm_map_t	kmap_free;
 
@@ -168,12 +160,6 @@ vm_map_startup()
 	vm_map_t mp;
 
 	/*
-	 * zero kentry area
-	 * XXX necessary?
-	 */
-	bzero((caddr_t)kentry_data, kentry_data_size);
-
-	/*
 	 * Static map structures for allocation before initialization of
 	 * kernel map or kmem map.  vm_map_create knows how to deal with them.
 	 */
@@ -211,24 +197,11 @@ vmspace_alloc(min, max, pageable)
 	register struct vmspace *vm;
 
 	if (mapvmpgcnt == 0 && mapvm == 0) {
-#if defined(MACHINE_NEW_NONCONTIG)
-		int vm_page_count = 0;
-		int lcv;
-
-		for (lcv = 0; lcv < vm_nphysseg; lcv++)
-			vm_page_count += (vm_physmem[lcv].end - 
-							vm_physmem[lcv].start);
-
-		mapvmpgcnt = (vm_page_count * 
-		sizeof(struct vm_map_entry) + PAGE_SIZE - 1) / PAGE_SIZE;
-
-#elif defined(MACHINE_NONCONTIG) 
-		mapvmpgcnt = (vm_page_count * 
-		sizeof(struct vm_map_entry) + PAGE_SIZE - 1) / PAGE_SIZE;
-#else /* must be contig */
-		mapvmpgcnt = ((last_page-first_page) * 
-		sizeof(struct vm_map_entry) + PAGE_SIZE - 1) / PAGE_SIZE;
-#endif /* contig */
+#ifndef MACHINE_NONCONTIG
+		mapvmpgcnt = ((last_page-first_page) * sizeof(struct vm_map_entry) + PAGE_SIZE - 1) / PAGE_SIZE;
+#else
+		mapvmpgcnt = (vm_page_count * sizeof(struct vm_map_entry) + PAGE_SIZE - 1) / PAGE_SIZE;
+#endif
 		mapvm_start = mapvm = kmem_alloc_pageable(kernel_map,
 			mapvmpgcnt * PAGE_SIZE);
 		mapvmmax = mapvm_start + mapvmpgcnt * PAGE_SIZE;
@@ -996,7 +969,7 @@ _vm_map_clip_end(map, entry, end)
  *	range prior to calling vm_map_submap.
  *
  *	Only a limited number of operations can be performed
- *	within this rage after calling vm_map_submap:
+ *	within this range after calling vm_map_submap:
  *		vm_fault
  *	[Don't try vm_map_copy!]
  *