Fix warnings in preparation for adding -Wall -Wcast-qual to the

        kernel compile

4 files changed, 10 insertions, 9 deletions

diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 2462a05..2c699fa 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: linker.h,v 1.11 1998/11/11 13:04:40 peter Exp $
+ *	$Id: linker.h,v 1.12 1999/01/25 08:42:24 dfr Exp $
  */
 
 #ifndef _SYS_LINKER_H_
@@ -43,7 +43,8 @@ MALLOC_DECLARE(M_LINKER);
 typedef struct linker_file* linker_file_t;
 typedef TAILQ_HEAD(, linker_file) linker_file_list_t;
 
-typedef caddr_t linker_sym_t;	/* opaque symbol */
+typedef caddr_t linker_sym_t;		/* opaque symbol */
+typedef c_caddr_t c_linker_sym_t;	/* const opaque symbol */
 
 /*
  * expanded out linker_sym_t
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 3b11123..87a856b 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $Id: malloc.h,v 1.39 1999/01/21 08:29:08 dillon Exp $
+ * $Id: malloc.h,v 1.40 1999/01/21 09:23:21 dillon Exp $
  */
 
 #ifndef _SYS_MALLOC_H_
@@ -162,7 +162,7 @@ struct kmembuckets {
  */
 #define kmemxtob(alloc)	(kmembase + (alloc) * PAGE_SIZE)
 #define btokmemx(addr)	(((caddr_t)(addr) - kmembase) / PAGE_SIZE)
-#define btokup(addr)	(&kmemusage[(caddr_t)(addr) - kmembase >> PAGE_SHIFT])
+#define btokup(addr)	(&kmemusage[((caddr_t)(addr) - kmembase) >> PAGE_SHIFT])
 
 /*
  * Macro versions for the usual cases of malloc/free
diff --git a/sys/sys/module.h b/sys/sys/module.h
index 3e0a000..c8d8557 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: module.h,v 1.6 1999/01/09 14:59:49 dfr Exp $
+ *	$Id: module.h,v 1.7 1999/01/27 20:09:21 dillon Exp $
  */
 
 #ifndef _SYS_MODULE_H_
@@ -37,7 +37,7 @@ typedef enum modeventtype {
 
 typedef	struct module *module_t;
 
-typedef	int (*modeventhand_t)(module_t mod, modeventtype_t what,
+typedef	int (*modeventhand_t)(module_t mod, int /*modeventtype_t*/ what,
 			      void *arg);
 
 /*
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index f5c54b1..9604690 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.79 1999/01/05 18:50:01 eivind Exp $
+ * $Id: vnode.h,v 1.80 1999/01/20 14:49:12 eivind Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -422,12 +422,12 @@ struct vop_generic_args {
 
 #define ASSERT_VOP_LOCKED(vp, str)				\
     if ((vp) && IS_LOCKING_VFS(vp) && !VOP_ISLOCKED(vp)) {	\
-	panic("%s: %x is not locked but should be", str, vp);	\
+	panic("%s: %p is not locked but should be", str, vp);	\
     }
 
 #define ASSERT_VOP_UNLOCKED(vp, str)				\
     if ((vp) && IS_LOCKING_VFS(vp) && VOP_ISLOCKED(vp)) {	\
-	panic("%s: %x is locked but shouldn't be", str, vp);	\
+	panic("%s: %p is locked but shouldn't be", str, vp);	\
     }
 
 #else