 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.56 2010/10/22 07:22:57 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.57 2010/10/27 14:51:29 uebayasi Exp $	*/
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -87,27 +87,27 @@
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * uvm_page.c: page ops.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.56 2010/10/22 07:22:57 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.57 2010/10/27 14:51:29 uebayasi Exp $");
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
 #include "opt_readahead.h"
 #include "opt_xip.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/sched.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 @@ -124,33 +124,31 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v
 /*
  * physical memory config is stored in vm_physmem.
  */
 SIMPLEQ_HEAD(vm_physseg_freelist, vm_physseg);
 struct vm_physseg *vm_physmem_ptrs[VM_PHYSSEG_MAX];
 int vm_nphysmem = 0;
 static struct vm_physseg vm_physmem_store[VM_PHYSSEG_MAX];
 static struct vm_physseg_freelist vm_physmem_freelist =
     SIMPLEQ_HEAD_INITIALIZER(vm_physmem_freelist);
 #ifdef XIP
 struct vm_physseg *vm_physdev_ptrs[VM_PHYSSEG_MAX];
 int vm_nphysdev = 0;
 static struct vm_physseg vm_physdev_store[VM_PHYSSEG_MAX];
 static struct vm_physseg_freelist vm_physdev_freelist =
     SIMPLEQ_HEAD_INITIALIZER(vm_physdev_freelist);
 #endif
 /*
  * Some supported CPUs in a given architecture don't support all
  * of the things necessary to do idle page zero'ing efficiently.
  * We therefore provide a way to enable it from machdep code here.
  */
 bool vm_page_zero_enable = false;
 /*
  * number of pages per-CPU to reserve for the kernel.
  */
 int vm_page_reserve_kernel = 5;
 @@ -822,27 +820,26 @@ uvm_page_physload(paddr_t start, paddr_t
 void
 uvm_page_physunload(void *cookie)
+{
 	struct vm_physseg *seg = cookie;
 	panic("memory unload is not supported yet");
 	/* XXX */
 	uvm_physseg_free(&vm_physmem_freelist, vm_physmem_ptrs, seg);
 	vm_nphysmem--;
+}
 #ifdef XIP
 void *
 uvm_page_physload_device(paddr_t start, paddr_t end, paddr_t avail_start,
     paddr_t avail_end, int prot, int flags)
+{
 	struct vm_physseg *seg;
 	int i;
 	seg = uvm_physseg_alloc(&vm_physdev_freelist, vm_physdev_ptrs,
 	    vm_nphysdev, start, end);
 	KASSERT(seg != NULL);
 	seg->prot = prot;
 	seg->flags = flags;	/* XXXUEBS BUS_SPACE_MAP_* */
 @@ -895,27 +892,26 @@ uvm_page_physunload_device(void *cookie)
+{
 	struct vm_physseg *seg = cookie;
 #ifdef __HAVE_PMAP_PHYSSEG
 #ifdef __HAVE_PMAP_PHYSSEG_INIT
 	pmap_physseg_fini(seg);
 #endif
 #endif
 	kmem_free(seg->pgs, sizeof(struct vm_page) * (seg->end - seg->start));
 	uvm_physseg_free(&vm_physdev_freelist, vm_physdev_ptrs, seg);
 	vm_nphysdev--;
+}
 #endif
 int uvm_physseg_inited;
 static struct vm_physseg *
 uvm_physseg_alloc(struct vm_physseg_freelist *freelist,
     struct vm_physseg **segs, int nsegs,
     const paddr_t start, const paddr_t end)
+{
 	struct vm_physseg *ps;
 	if (uvmexp.pagesize == 0)
 		panic("uvm_page_physload: page size not set!");
 	if (start >= end)
 @@ -952,32 +948,30 @@ uvm_physseg_free(struct vm_physseg_freel
 	uvm_physseg_remove(segs, seg);
 	SIMPLEQ_INSERT_TAIL(freelist, seg, list);
+}
 static void
 uvm_physseg_init(void)
+{
 	int lcv;
 	for (lcv = 0; lcv < VM_PHYSSEG_MAX; lcv++) {
 		SIMPLEQ_INSERT_TAIL(&vm_physmem_freelist,
 		    &vm_physmem_store[lcv], list);
+	}
 #ifdef XIP
 	for (lcv = 0; lcv < VM_PHYSSEG_MAX; lcv++) {
 		SIMPLEQ_INSERT_TAIL(&vm_physdev_freelist,
 		    &vm_physdev_store[lcv], list);
+	}
 #endif
+}
 static void
 uvm_physseg_insert(struct vm_physseg *ps,
     struct vm_physseg **segs, int nsegs)
+{
 #if (VM_PHYSSEG_STRAT == VM_PSTRAT_RANDOM)
 	/* random: put it at the end (easy!) */
 	segs[nsegs] = ps;
 #elif (VM_PHYSSEG_STRAT == VM_PSTRAT_BSEARCH)
+	{
 		int lcv;
 @@ -1049,35 +1043,33 @@ static inline bool vm_physseg_within_p(s
 static inline bool vm_physseg_ge_p(struct vm_physseg *, int, paddr_t,
     const struct vm_page *, int *);
 static inline bool vm_physseg_lt_p(struct vm_physseg *, int, paddr_t,
     const struct vm_page *, int *);
 int
 vm_physseg_find(paddr_t pframe, int *offp)
+{
 	return VM_PHYSSEG_FIND(vm_physmem_ptrs, vm_nphysmem, VM_PHYSSEG_OP_PF,
 	    pframe, NULL, offp);
+}
 #ifdef XIP
 int
 vm_physseg_find_device(paddr_t pframe, int *offp)
+{
 	return VM_PHYSSEG_FIND(vm_physdev_ptrs, vm_nphysdev, VM_PHYSSEG_OP_PF,
 	    pframe, NULL, offp);
+}
 #endif
 #if VM_PHYSSEG_MAX == 1
 static inline int
 vm_physseg_find_contig(struct vm_physseg **segs, int nsegs, int op,
     paddr_t pframe, const struct vm_page *pg, int *offp)
+{
 	/* 'contig' case */
 	if (nsegs == 0)
 		return(-1);
 	if (vm_physseg_within_p(segs[0], op, pframe, pg, offp)) {
 		return(0);
+	}
 @@ -1191,31 +1183,29 @@ vm_physseg_lt_p(struct vm_physseg *seg,
 /*
  * PHYS_TO_VM_PAGE: find vm_page for a PA.   used by MI code to get vm_pages
  * back from an I/O mapping (ugh!).   used in some MD code as well.
  */
 struct vm_page *
 uvm_phys_to_vm_page(paddr_t pa)
+{
 	paddr_t pf = atop(pa);
 	int	off;
 	int	psi;
 #ifdef XIP
 	psi = vm_physseg_find_device(pf, &off);
 	if (psi != -1)
 		return(&vm_physdev_ptrs[psi]->pgs[off]);
 #endif
 	psi = vm_physseg_find(pf, &off);
 	if (psi != -1)
 		return(&vm_physmem_ptrs[psi]->pgs[off]);
 	return(NULL);
+}
 paddr_t
 uvm_vm_page_to_phys(const struct vm_page *pg)
+{
 	return pg->phys_addr;
+}
 @@ -2211,29 +2201,27 @@ uvm_pagecopy(struct vm_page *src, struct
 	dst->flags &= ~PG_CLEAN;
 	pmap_copy_page(VM_PAGE_TO_PHYS(src), VM_PAGE_TO_PHYS(dst));
+}
 /*
  * uvm_pageismanaged: test it see that a page (specified by PA) is managed.
  */
 bool
 uvm_pageismanaged(paddr_t pa)
+{
 	return
 #ifdef XIP
 	    (vm_physseg_find_device(atop(pa), NULL) != -1) ||
 #endif
 	    (vm_physseg_find(atop(pa), NULL) != -1);
+}
 /*
  * uvm_page_lookup_freelist: look up the free list for the specified page
  */
 int
 uvm_page_lookup_freelist(struct vm_page *pg)
+{
 	int lcv;
 	lcv = vm_physseg_find(atop(VM_PAGE_TO_PHYS(pg)), NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_page.h,v 1.59.2.31 2010/10/22 07:22:57 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.h,v 1.59.2.32 2010/10/27 14:51:30 uebayasi Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993, The Regents of the University of California.
+ *
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -259,30 +259,28 @@ struct vm_physseg {
  */
 extern bool vm_page_zero_enable;
 /*
  * physical memory config is stored in vm_physmem.
  */
 #define	VM_PHYSMEM_PTR(i)	(vm_physmem_ptrs[i])
 #define	VM_PHYSDEV_PTR(i)	(vm_physdev_ptrs[i])
 extern struct vm_physseg *vm_physmem_ptrs[VM_PHYSSEG_MAX];
 extern int vm_nphysmem;
 #ifdef XIP
 extern struct vm_physseg *vm_physdev_ptrs[VM_PHYSSEG_MAX];
 extern int vm_nphysdev;
 #endif
 #define	vm_nphysseg	vm_nphysmem	/* XXX backward compat */
 /*
  * prototypes: the following prototypes define the interface to pages
  */
 void uvm_page_init(vaddr_t *, vaddr_t *);
 #if defined(UVM_PAGE_TRKOWN)
 void uvm_page_own(struct vm_page *, const char *);
 #endif
 #if !defined(PMAP_STEAL_MEMORY)
 bool uvm_page_physget(paddr_t *);
 @@ -301,29 +299,27 @@ void uvm_page_unbusy(struct vm_page **,
 struct vm_page *uvm_pagelookup(struct uvm_object *, voff_t);
 void uvm_pageunwire(struct vm_page *);
 void uvm_pagewait(struct vm_page *, int);
 void uvm_pagewake(struct vm_page *);
 void uvm_pagewire(struct vm_page *);
 void uvm_pagezero(struct vm_page *);
 bool uvm_pageismanaged(paddr_t);
 int uvm_page_lookup_freelist(struct vm_page *);
 int vm_physseg_find(paddr_t, int *);
 struct vm_page *uvm_phys_to_vm_page(paddr_t);
 paddr_t uvm_vm_page_to_phys(const struct vm_page *);
 #ifdef XIP
 int vm_physseg_find_device(paddr_t, int *);
 #endif
 /*
  * macros
  */
 #define UVM_PAGE_TREE_PENALTY	4	/* XXX: a guess */
 #define VM_PAGE_TO_PHYS(entry)	uvm_vm_page_to_phys(entry)
 #ifdef __HAVE_VM_PAGE_MD
 #define	VM_PAGE_TO_MD(pg)	(&(pg)->mdpage)
 #endif