From: David Rhodus Date: Mon, 29 Mar 2004 17:30:23 +0000 (+0000) Subject: Move vm_fault_quick() out from the machine specific location X-Git-Tag: v2.0.1~11645 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d0c17a5e5894db9bb67dc6ebbc07fb4f000b3a88 Move vm_fault_quick() out from the machine specific location as the function is now cpu agnostic. --- diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 12fc0855c6..989d27eb8b 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -39,7 +39,7 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $ - * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.27 2004/02/17 19:38:53 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.28 2004/03/29 17:30:23 drhodus Exp $ */ #include "use_npx.h" @@ -98,22 +98,6 @@ static volatile u_int cpu_reset_proxy_active; #endif extern int _ucodesel, _udatasel; -/* - * quick version of vm_fault - */ -int -vm_fault_quick(v, prot) - caddr_t v; - int prot; -{ - int r; - - if (prot & VM_PROT_WRITE) - r = subyte(v, fubyte(v)); - else - r = fubyte(v); - return(r); -} /* * Finish a fork operation, with process p2 nearly set up. diff --git a/sys/platform/pc32/i386/vm_machdep.c b/sys/platform/pc32/i386/vm_machdep.c index 5bd8c46abe..d2eac1c347 100644 --- a/sys/platform/pc32/i386/vm_machdep.c +++ b/sys/platform/pc32/i386/vm_machdep.c @@ -39,7 +39,7 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $ - * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.27 2004/02/17 19:38:53 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.28 2004/03/29 17:30:23 drhodus Exp $ */ #include "use_npx.h" @@ -98,22 +98,6 @@ static volatile u_int cpu_reset_proxy_active; #endif extern int _ucodesel, _udatasel; -/* - * quick version of vm_fault - */ -int -vm_fault_quick(v, prot) - caddr_t v; - int prot; -{ - int r; - - if (prot & VM_PROT_WRITE) - r = subyte(v, fubyte(v)); - else - r = fubyte(v); - return(r); -} /* * Finish a fork operation, with process p2 nearly set up. diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index d400dd3042..e8986a85ed 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -67,7 +67,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/vm/vm_fault.c,v 1.108.2.8 2002/02/26 05:49:27 silby Exp $ - * $DragonFly: src/sys/vm/vm_fault.c,v 1.12 2004/03/23 22:54:32 dillon Exp $ + * $DragonFly: src/sys/vm/vm_fault.c,v 1.13 2004/03/29 17:30:23 drhodus Exp $ */ /* @@ -884,6 +884,21 @@ readrest: } +/* + * quick version of vm_fault + */ +int +vm_fault_quick(caddr_t v, int prot) +{ + int r; + + if (prot & VM_PROT_WRITE) + r = subyte(v, fubyte(v)); + else + r = fubyte(v); + return(r); +} + /* * vm_fault_wire: *