| swap_pager.c (236417) | swap_pager.c (237168) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Matthew Dillon, 3 * Copyright (c) 1994 John S. Dyson 4 * Copyright (c) 1990 University of Utah. 5 * Copyright (c) 1982, 1986, 1989, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * This code is derived from software contributed to Berkeley by --- 53 unchanged lines hidden (view full) --- 62 * 63 * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ 64 * 65 * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 66 * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 67 */ 68 69#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1998 Matthew Dillon, 3 * Copyright (c) 1994 John S. Dyson 4 * Copyright (c) 1990 University of Utah. 5 * Copyright (c) 1982, 1986, 1989, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * This code is derived from software contributed to Berkeley by --- 53 unchanged lines hidden (view full) --- 62 * 63 * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ 64 * 65 * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 66 * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 67 */ 68 69#include <sys/cdefs.h> |
| 70__FBSDID("$FreeBSD: head/sys/vm/swap_pager.c 236417 2012-06-01 18:58:50Z eadler $"); | 70__FBSDID("$FreeBSD: head/sys/vm/swap_pager.c 237168 2012-06-16 18:56:19Z alc $"); |
| 71 72#include "opt_swap.h" 73#include "opt_vm.h" 74 75#include <sys/param.h> 76#include <sys/systm.h> 77#include <sys/conf.h> 78#include <sys/kernel.h> --- 1509 unchanged lines hidden (view full) --- 1588 } else 1589 vm_page_flash(m); 1590 } else { 1591 /* 1592 * For write success, clear the dirty 1593 * status, then finish the I/O ( which decrements the 1594 * busy count and possibly wakes waiter's up ). 1595 */ | 71 72#include "opt_swap.h" 73#include "opt_vm.h" 74 75#include <sys/param.h> 76#include <sys/systm.h> 77#include <sys/conf.h> 78#include <sys/kernel.h> --- 1509 unchanged lines hidden (view full) --- 1588 } else 1589 vm_page_flash(m); 1590 } else { 1591 /* 1592 * For write success, clear the dirty 1593 * status, then finish the I/O ( which decrements the 1594 * busy count and possibly wakes waiter's up ). 1595 */ |
| 1596 KASSERT((m->aflags & PGA_WRITEABLE) == 0, | 1596 KASSERT(!pmap_page_is_write_mapped(m), |
| 1597 ("swp_pager_async_iodone: page %p is not write" 1598 " protected", m)); 1599 vm_page_undirty(m); 1600 vm_page_io_finish(m); 1601 if (vm_page_count_severe()) { 1602 vm_page_lock(m); 1603 vm_page_try_to_cache(m); 1604 vm_page_unlock(m); --- 1090 unchanged lines hidden --- | 1597 ("swp_pager_async_iodone: page %p is not write" 1598 " protected", m)); 1599 vm_page_undirty(m); 1600 vm_page_io_finish(m); 1601 if (vm_page_count_severe()) { 1602 vm_page_lock(m); 1603 vm_page_try_to_cache(m); 1604 vm_page_unlock(m); --- 1090 unchanged lines hidden --- |