From ffa1a6b0d376fb05b03ef0c09bc663f1f4b8bac8 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Fri, 9 Jul 1999 16:41:19 +0000
Subject: [PATCH] bufhashinit() is called with a caddr_t and is expected to
 return the same in both the alpha and i386 ports.

---
 sys/kern/vfs_bio.c | 6 +++---
 sys/sys/bio.h      | 4 ++--
 sys/sys/buf.h      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 57c9808a34e9..a0731ebe0a2b 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *		John S. Dyson.
  *
- * $Id: vfs_bio.c,v 1.221 1999/07/08 06:05:52 mckusick Exp $
+ * $Id: vfs_bio.c,v 1.222 1999/07/08 17:58:55 mckusick Exp $
  */
 
 /*
@@ -286,8 +286,8 @@ bd_wakeup(int dirtybuflevel)
  * Initialize buffer headers and related structures. 
  */
 
-vm_offset_t
-bufhashinit(vm_offset_t vaddr)
+caddr_t
+bufhashinit(caddr_t vaddr)
 {
 	/* first, make a null hash table */
 	for (bufhashmask = 8; bufhashmask < nbuf / 4; bufhashmask <<= 1)
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 87043e30b95b..022285fb8456 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.75 1999/07/04 00:25:32 mckusick Exp $
+ * $Id: buf.h,v 1.76 1999/07/08 06:05:58 mckusick Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -446,7 +446,7 @@ extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
 
 struct uio;
 
-vm_offset_t bufhashinit __P((vm_offset_t));
+caddr_t bufhashinit __P((caddr_t));
 void	bufinit __P((void));
 void	bwillwrite __P((void));
 void	bremfree __P((struct buf *));
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 87043e30b95b..022285fb8456 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.75 1999/07/04 00:25:32 mckusick Exp $
+ * $Id: buf.h,v 1.76 1999/07/08 06:05:58 mckusick Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -446,7 +446,7 @@ extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
 
 struct uio;
 
-vm_offset_t bufhashinit __P((vm_offset_t));
+caddr_t bufhashinit __P((caddr_t));
 void	bufinit __P((void));
 void	bwillwrite __P((void));
 void	bremfree __P((struct buf *));