Deleted Added
full compact
vm_page.h (17294) vm_page.h (17334)
1/*
2 * Copyright (c) 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * The Mach Operating System project at Carnegie-Mellon University.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 47 unchanged lines hidden (view full) ---

56 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
57 * School of Computer Science
58 * Carnegie Mellon University
59 * Pittsburgh PA 15213-3890
60 *
61 * any improvements or extensions that they make and grant Carnegie the
62 * rights to redistribute these changes.
63 *
1/*
2 * Copyright (c) 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * The Mach Operating System project at Carnegie-Mellon University.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 47 unchanged lines hidden (view full) ---

56 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
57 * School of Computer Science
58 * Carnegie Mellon University
59 * Pittsburgh PA 15213-3890
60 *
61 * any improvements or extensions that they make and grant Carnegie the
62 * rights to redistribute these changes.
63 *
64 * $Id: vm_page.h,v 1.29 1996/06/26 05:39:25 dyson Exp $
64 * $Id: vm_page.h,v 1.30 1996/07/27 03:24:06 dyson Exp $
65 */
66
67/*
68 * Resident memory system definitions.
69 */
70
71#ifndef _VM_PAGE_
72#define _VM_PAGE_

--- 142 unchanged lines hidden (view full) ---

215 (m)->flags |= PG_WANTED; \
216 assert_wait((int) (m), (interruptible)); \
217 }
218
219#define PAGE_WAKEUP(m) { \
220 (m)->flags &= ~PG_BUSY; \
221 if ((m)->flags & PG_WANTED) { \
222 (m)->flags &= ~PG_WANTED; \
65 */
66
67/*
68 * Resident memory system definitions.
69 */
70
71#ifndef _VM_PAGE_
72#define _VM_PAGE_

--- 142 unchanged lines hidden (view full) ---

215 (m)->flags |= PG_WANTED; \
216 assert_wait((int) (m), (interruptible)); \
217 }
218
219#define PAGE_WAKEUP(m) { \
220 (m)->flags &= ~PG_BUSY; \
221 if ((m)->flags & PG_WANTED) { \
222 (m)->flags &= ~PG_WANTED; \
223 (m)->flags |= PG_REFERENCED; \
224 wakeup((caddr_t) (m)); \
225 } \
226 }
227
228#if PAGE_SIZE == 4096
229#define VM_PAGE_BITS_ALL 0xff
230#endif
231

--- 15 unchanged lines hidden (view full) ---

247void vm_page_free_zero __P((vm_page_t));
248void vm_page_insert __P((vm_page_t, vm_object_t, vm_pindex_t));
249vm_page_t vm_page_lookup __P((vm_object_t, vm_pindex_t));
250void vm_page_remove __P((vm_page_t));
251void vm_page_rename __P((vm_page_t, vm_object_t, vm_pindex_t));
252vm_offset_t vm_page_startup __P((vm_offset_t, vm_offset_t, vm_offset_t));
253void vm_page_unwire __P((vm_page_t));
254void vm_page_wire __P((vm_page_t));
223 wakeup((caddr_t) (m)); \
224 } \
225 }
226
227#if PAGE_SIZE == 4096
228#define VM_PAGE_BITS_ALL 0xff
229#endif
230

--- 15 unchanged lines hidden (view full) ---

246void vm_page_free_zero __P((vm_page_t));
247void vm_page_insert __P((vm_page_t, vm_object_t, vm_pindex_t));
248vm_page_t vm_page_lookup __P((vm_object_t, vm_pindex_t));
249void vm_page_remove __P((vm_page_t));
250void vm_page_rename __P((vm_page_t, vm_object_t, vm_pindex_t));
251vm_offset_t vm_page_startup __P((vm_offset_t, vm_offset_t, vm_offset_t));
252void vm_page_unwire __P((vm_page_t));
253void vm_page_wire __P((vm_page_t));
255void vm_page_unqueue __P((vm_page_t, int));
254void vm_page_unqueue __P((vm_page_t));
255void vm_page_unqueue_nowakeup __P((vm_page_t));
256void vm_page_set_validclean __P((vm_page_t, int, int));
257void vm_page_set_invalid __P((vm_page_t, int, int));
258static __inline boolean_t vm_page_zero_fill __P((vm_page_t));
259int vm_page_is_valid __P((vm_page_t, int, int));
260void vm_page_test_dirty __P((vm_page_t));
261int vm_page_bits __P((int, int));
262
263/*

--- 23 unchanged lines hidden (view full) ---

287#endif
288}
289
290static __inline void
291vm_page_protect(vm_page_t mem, int prot)
292{
293 if (prot == VM_PROT_NONE) {
294 if (mem->flags & (PG_WRITEABLE|PG_MAPPED)) {
256void vm_page_set_validclean __P((vm_page_t, int, int));
257void vm_page_set_invalid __P((vm_page_t, int, int));
258static __inline boolean_t vm_page_zero_fill __P((vm_page_t));
259int vm_page_is_valid __P((vm_page_t, int, int));
260void vm_page_test_dirty __P((vm_page_t));
261int vm_page_bits __P((int, int));
262
263/*

--- 23 unchanged lines hidden (view full) ---

287#endif
288}
289
290static __inline void
291vm_page_protect(vm_page_t mem, int prot)
292{
293 if (prot == VM_PROT_NONE) {
294 if (mem->flags & (PG_WRITEABLE|PG_MAPPED)) {
295 pmap_page_protect(mem, prot);
295 pmap_page_protect(VM_PAGE_TO_PHYS(mem), prot);
296 mem->flags &= ~(PG_WRITEABLE|PG_MAPPED);
297 }
298 } else if ((prot == VM_PROT_READ) && (mem->flags & PG_WRITEABLE)) {
296 mem->flags &= ~(PG_WRITEABLE|PG_MAPPED);
297 }
298 } else if ((prot == VM_PROT_READ) && (mem->flags & PG_WRITEABLE)) {
299 pmap_page_protect(mem, prot);
299 pmap_page_protect(VM_PAGE_TO_PHYS(mem), prot);
300 mem->flags &= ~PG_WRITEABLE;
301 }
302}
303
304/*
305 * vm_page_zero_fill:
306 *
307 * Zero-fill the specified page.

--- 27 unchanged lines hidden ---
300 mem->flags &= ~PG_WRITEABLE;
301 }
302}
303
304/*
305 * vm_page_zero_fill:
306 *
307 * Zero-fill the specified page.

--- 27 unchanged lines hidden ---