From 6dcf625c41f9a51b4704f45268ed331bdcfb3b55 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 29 Sep 2006 20:27:41 +0000
Subject: [PATCH] Fix most of the WARNS=2 warnings.

---
 sys/boot/i386/libi386/biospci.c       | 1 +
 sys/boot/i386/libi386/bootinfo64.c    | 4 +---
 sys/boot/i386/libi386/elf64_freebsd.c | 2 +-
 sys/boot/i386/libi386/libi386.h       | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index d844b7ead64..b69d8c5873f 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/sys/boot/i386/libi386/biospci.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <bootstrap.h>
 #include <isapnp.h>
 #include <btxv86.h>
+#include "libi386.h"
 
 /*
  * Stupid PCI BIOS interface doesn't let you simply enumerate everything
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index 58b4e3c6b16..17963cea4e0 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -143,9 +143,7 @@ bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernendp)
     u_int64_t			envp;
     vm_offset_t			size;
     char			*rootdevname;
-    int				i, howto;
-    char			*kernelname;
-    const char			*kernelpath;
+    int				howto;
 
     howto = bi_getboothowto(args);
 
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c
index 1a5b0b24715..b72e810ad00 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/sys/boot/i386/libi386/elf64_freebsd.c
@@ -61,7 +61,7 @@ extern p2_entry_t PT2[];
 u_int32_t entry_hi;
 u_int32_t entry_lo;
 
-extern amd64_tramp();
+extern void amd64_tramp();
 
 /*
  * There is an a.out kernel and one or more a.out modules loaded.  
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index 699ea746971..412e1b66858 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -96,8 +96,8 @@ extern vm_offset_t	memtop_copyin;	/* memtop less heap size for the cases */
 					/*  when heap is at the top of extended memory */
 					/*  for other cases - just the same as memtop */
 
-int biospci_find_devclass(uint32_t class, int index);
-int biospci_write_config(uint32_t locator, int offset, int width, int val);
+int biospci_find_devclass(uint32_t class, int index, uint32_t *locator);
+int biospci_write_config(uint32_t locator, int offset, int width, uint32_t val);
 int biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val);
 
 void	biosacpi_detect(void);