diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-09-29 20:24:26 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-09-29 20:24:26 +0000 |
| commit | 6c3ef808d60891c572af2ad28a83e33387dd89e3 (patch) | |
| tree | f8ea81117dbc6f0592a22da94d83114fe085a5f8 | |
| parent | ba7759fc530a11e351cc5bd3b06a92b4b02a05d3 (diff) | |
Add missing prototype for bios_getdiskinfo() to amd64/disksubr.c.
Include systm.h inside #ifdef DEBUG in i386/disksubr.c, as
amd64/disksubr.c.
Makes amd64 and i386 disksubr.c identical once more.
| -rw-r--r-- | sys/arch/amd64/amd64/disksubr.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/disksubr.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c index c8b0cf7efd0..327cbee4457 100644 --- a/sys/arch/amd64/amd64/disksubr.c +++ b/sys/arch/amd64/amd64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.76 2015/09/27 18:03:18 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.77 2015/09/29 20:24:25 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -44,6 +44,8 @@ #include <machine/biosvar.h> +bios_diskinfo_t *bios_getdiskinfo(dev_t dev); + /* * Attempt to read a disk label from a device * using the indicated strategy routine. diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c index b961039d285..e502c3e0e5f 100644 --- a/sys/arch/i386/i386/disksubr.c +++ b/sys/arch/i386/i386/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.114 2015/09/27 20:20:23 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.115 2015/09/29 20:24:25 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -32,13 +32,16 @@ */ #include <sys/param.h> -#include <sys/systm.h> #include <sys/buf.h> #include <sys/disklabel.h> #include <sys/disk.h> #include <sys/reboot.h> #include <sys/conf.h> +#ifdef DEBUG +#include <sys/systm.h> +#endif + #include <machine/biosvar.h> bios_diskinfo_t *bios_getdiskinfo(dev_t dev); |