From 2d1a0b57b6811b79b578f9f22c70e0783ea336c6 Mon Sep 17 00:00:00 2001
From: drochner <drochner@NetBSD.org>
Date: Wed, 22 Feb 2006 22:28:18 +0000
Subject: [PATCH] kill the "fault_type" argument to pager's pgo_fault() methods
 it is never used (and using it would comprise an abstraction violation imho)

---
 sys/uvm/uvm_bio.c    | 8 ++++----
 sys/uvm/uvm_device.c | 8 ++++----
 sys/uvm/uvm_fault.c  | 6 +++---
 sys/uvm/uvm_pager.h  | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys/uvm/uvm_bio.c b/sys/uvm/uvm_bio.c
index 3f464c07d473..42d8bb229f5f 100644
--- a/sys/uvm/uvm_bio.c
+++ b/sys/uvm/uvm_bio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_bio.c,v 1.43 2006/01/31 14:11:25 yamt Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.44 2006/02/22 22:28:18 drochner Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.43 2006/01/31 14:11:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.44 2006/02/22 22:28:18 drochner Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.43 2006/01/31 14:11:25 yamt Exp $");
  */
 
 static int	ubc_fault(struct uvm_faultinfo *, vaddr_t, struct vm_page **,
-			  int, int, vm_fault_t, vm_prot_t, int);
+			  int, int, vm_prot_t, int);
 static struct ubc_map *ubc_find_mapping(struct uvm_object *, voff_t);
 
 /*
@@ -204,7 +204,7 @@ ubc_init(void)
 
 static int
 ubc_fault(struct uvm_faultinfo *ufi, vaddr_t ign1, struct vm_page **ign2,
-    int ign3, int ign4, vm_fault_t fault_type, vm_prot_t access_type,
+    int ign3, int ign4, vm_prot_t access_type,
     int flags)
 {
 	struct uvm_object *uobj;
diff --git a/sys/uvm/uvm_device.c b/sys/uvm/uvm_device.c
index 38c9323d5250..2f6c4ed052ce 100644
--- a/sys/uvm/uvm_device.c
+++ b/sys/uvm/uvm_device.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_device.c,v 1.46 2005/12/11 12:25:29 christos Exp $	*/
+/*	$NetBSD: uvm_device.c,v 1.47 2006/02/22 22:28:18 drochner Exp $	*/
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.46 2005/12/11 12:25:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.47 2006/02/22 22:28:18 drochner Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -71,7 +71,7 @@ static void	udv_init(void);
 static void	udv_reference(struct uvm_object *);
 static void	udv_detach(struct uvm_object *);
 static int	udv_fault(struct uvm_faultinfo *, vaddr_t,
-			  struct vm_page **, int, int, vm_fault_t, vm_prot_t,
+			  struct vm_page **, int, int, vm_prot_t,
 			  int);
 
 /*
@@ -350,7 +350,7 @@ again:
 
 static int
 udv_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, struct vm_page **pps,
-    int npages, int centeridx, vm_fault_t fault_type, vm_prot_t access_type,
+    int npages, int centeridx, vm_prot_t access_type,
     int flags)
 {
 	struct vm_map_entry *entry = ufi->entry;
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c
index 4baebcceedd2..00f3cc27ab75 100644
--- a/sys/uvm/uvm_fault.c
+++ b/sys/uvm/uvm_fault.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_fault.c,v 1.108 2006/02/15 14:06:45 yamt Exp $	*/
+/*	$NetBSD: uvm_fault.c,v 1.109 2006/02/22 22:28:18 drochner Exp $	*/
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.108 2006/02/15 14:06:45 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.109 2006/02/22 22:28:18 drochner Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1017,7 +1017,7 @@ ReFault:
 
 		/* locked: maps(read), amap (if there), uobj */
 		error = uobj->pgops->pgo_fault(&ufi, startva, pages, npages,
-		    centeridx, fault_type, access_type, PGO_LOCKED|PGO_SYNCIO);
+		    centeridx, access_type, PGO_LOCKED|PGO_SYNCIO);
 
 		/* locked: nothing, pgo_fault has unlocked everything */
 
diff --git a/sys/uvm/uvm_pager.h b/sys/uvm/uvm_pager.h
index c80fd3f29793..5c2217c241f4 100644
--- a/sys/uvm/uvm_pager.h
+++ b/sys/uvm/uvm_pager.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pager.h,v 1.33 2006/02/11 12:45:07 yamt Exp $	*/
+/*	$NetBSD: uvm_pager.h,v 1.34 2006/02/22 22:28:18 drochner Exp $	*/
 
 /*
  *
@@ -137,7 +137,7 @@ struct uvm_pagerops {
 
 	/* special non-standard fault processing */
 	int	(*pgo_fault)(struct uvm_faultinfo *, vaddr_t, struct vm_page **,
-			     int, int, vm_fault_t, vm_prot_t, int);
+			     int, int, vm_prot_t, int);
 
 	/* get/read pages */
 	int	(*pgo_get)(struct uvm_object *, voff_t, struct vm_page **,