summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2006-09-29 20:27:41 +0000
committerru <ru@FreeBSD.org>2006-09-29 20:27:41 +0000
commit4a9bb44813fe335db326ad660a45562f321e9c2d (patch)
tree9259006dcdfe67a22ac7331591ce26f238433c32 /sys/boot
parent4a28927c3ca9a49b9c7ab58cbde66a330eadf736 (diff)
downloadFreeBSD-src-4a9bb44813fe335db326ad660a45562f321e9c2d.zip
FreeBSD-src-4a9bb44813fe335db326ad660a45562f321e9c2d.tar.gz
Fix most of the WARNS=2 warnings.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/libi386/biospci.c1
-rw-r--r--sys/boot/i386/libi386/bootinfo64.c4
-rw-r--r--sys/boot/i386/libi386/elf64_freebsd.c2
-rw-r--r--sys/boot/i386/libi386/libi386.h4
4 files changed, 5 insertions, 6 deletions
diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index d844b7e..b69d8c5 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 58b4e3c..17963ce 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 1a5b0b2..b72e810 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 699ea74..412e1b6 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);
OpenPOWER on IntegriCloud