do not pass up un-init vftype
authorderaadt <deraadt@openbsd.org>
Fri, 21 Feb 1997 06:07:25 +0000 (06:07 +0000)
committerderaadt <deraadt@openbsd.org>
Fri, 21 Feb 1997 06:07:25 +0000 (06:07 +0000)
sys/arch/hp300/hp300/trap.c
sys/arch/mvme68k/mvme68k/trap.c
sys/arch/sun3/sun3/trap.c

index c30f793..a2f7185 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: trap.c,v 1.7 1997/02/05 17:33:02 downsj Exp $ */
+/*     $OpenBSD: trap.c,v 1.8 1997/02/21 06:07:25 deraadt Exp $        */
 /*     $NetBSD: trap.c,v 1.47 1996/10/14 20:06:31 thorpej Exp $        */
 
 /*
@@ -631,7 +631,7 @@ trap(type, code, v, frame)
                        vftype = VM_PROT_WRITE;
                        ftype = VM_PROT_READ | VM_PROT_WRITE;
                } else
-                       ftype = VM_PROT_READ;
+                       vftype = ftype = VM_PROT_READ;
 
                va = trunc_page((vm_offset_t)v);
 
index fa1dfbc..5b41765 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: trap.c,v 1.13 1997/02/04 17:23:20 deraadt Exp $ */
+/*     $OpenBSD: trap.c,v 1.14 1997/02/21 06:07:27 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -578,7 +578,7 @@ copyfault:
                        vftype = VM_PROT_WRITE;
                        ftype = VM_PROT_READ | VM_PROT_WRITE;
                } else
-                       ftype = VM_PROT_READ;
+                       vftype = ftype = VM_PROT_READ;
                va = trunc_page((vm_offset_t)v);
 
                if (map == kernel_map && va == 0) {
index 48535ca..f3eb4d0 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: trap.c,v 1.14 1997/02/06 20:03:59 kstailey Exp $      */
+/*     $OpenBSD: trap.c,v 1.15 1997/02/21 06:07:28 deraadt Exp $       */
 /*     $NetBSD: trap.c,v 1.63-1.65ish 1997/01/16 15:41:40 gwr Exp $    */
 
 /*
@@ -491,7 +491,7 @@ trap(type, code, v, frame)
                        vftype = VM_PROT_WRITE;
                        ftype = VM_PROT_READ | VM_PROT_WRITE;
                } else
-                       ftype = VM_PROT_READ;
+                       vftype = ftype = VM_PROT_READ;
                va = trunc_page((vm_offset_t)v);
 
                /*