| subr_syscall.c (14868) | subr_syscall.c (15809) |
|---|---|
| 1/*- 2 * Copyright (C) 1994, David Greenman 3 * Copyright (c) 1990, 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * the University of Utah, and William Jolitz. 8 * --- 21 unchanged lines hidden (view full) --- 30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 * 37 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 | 1/*- 2 * Copyright (C) 1994, David Greenman 3 * Copyright (c) 1990, 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * the University of Utah, and William Jolitz. 8 * --- 21 unchanged lines hidden (view full) --- 30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 * 37 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 |
| 38 * $Id: trap.c,v 1.74 1996/03/27 17:33:39 bde Exp $ | 38 * $Id: trap.c,v 1.75 1996/03/28 05:40:57 dyson Exp $ |
| 39 */ 40 41/* 42 * 386 Trap and System call handling 43 */ 44 45#include "opt_ktrace.h" 46#include "opt_ddb.h" --- 754 unchanged lines hidden (view full) --- 801 --p->p_lock; 802 return (1); 803 } 804 } 805 806 v = trunc_page(vtopte(va)); 807 808 /* | 39 */ 40 41/* 42 * 386 Trap and System call handling 43 */ 44 45#include "opt_ktrace.h" 46#include "opt_ddb.h" --- 754 unchanged lines hidden (view full) --- 801 --p->p_lock; 802 return (1); 803 } 804 } 805 806 v = trunc_page(vtopte(va)); 807 808 /* |
| 809 * wire the pte page 810 */ 811 if (va < USRSTACK) { 812 vm_map_pageable(&vm->vm_map, v, round_page(v+1), FALSE); 813 } 814 815 /* | |
| 816 * fault the data page 817 */ 818 rv = vm_fault(&vm->vm_map, va, VM_PROT_READ|VM_PROT_WRITE, FALSE); 819 | 809 * fault the data page 810 */ 811 rv = vm_fault(&vm->vm_map, va, VM_PROT_READ|VM_PROT_WRITE, FALSE); 812 |
| 820 /* 821 * unwire the pte page 822 */ 823 if (va < USRSTACK) { 824 vm_map_pageable(&vm->vm_map, v, round_page(v+1), TRUE); 825 } 826 | |
| 827 --p->p_lock; 828 829 if (rv != KERN_SUCCESS) 830 return 1; 831 832 return (0); 833} 834 --- 120 unchanged lines hidden --- | 813 --p->p_lock; 814 815 if (rv != KERN_SUCCESS) 816 return 1; 817 818 return (0); 819} 820 --- 120 unchanged lines hidden --- |