aboutsummaryrefslogtreecommitdiff
path: root/stand
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2018-01-08 18:44:36 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2018-01-08 18:44:36 +0000
commit94335944178dc8d876d52f6a9c0e67ec04e97da4 (patch)
tree2329d859db38dac1dbc96f6a87eac25b85f3b76e /stand
parent8b0a00b745c93e0abe27f9782086d812f6226ceb (diff)
downloadsrc-94335944178dc8d876d52f6a9c0e67ec04e97da4.tar.gz
src-94335944178dc8d876d52f6a9c0e67ec04e97da4.zip
Define __dmadat after #include'ing ufsread.c.
The __dmadat variable is a statically allocated I/O buffer. The type is declared in the ufsread.c source file and clang warns if a variable is defined before it's type is declared. Sponsored by: DARPA / AFRL
Notes
Notes: svn path=/head/; revision=327703
Diffstat (limited to 'stand')
-rw-r--r--stand/mips/beri/boot2/boot2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/stand/mips/beri/boot2/boot2.c b/stand/mips/beri/boot2/boot2.c
index 8dba05012715..bc46dbd80adb 100644
--- a/stand/mips/beri/boot2/boot2.c
+++ b/stand/mips/beri/boot2/boot2.c
@@ -118,8 +118,6 @@ static const unsigned char flags[NOPT] = {
static const char *const dev_nm[] = {"dram", "cfi", "sdcard"};
static const u_int dev_nm_count = nitems(dev_nm);
-static struct dmadat __dmadat;
-
static struct dsk {
unsigned type; /* BOOTINFO_DEV_TYPE_x object type. */
uintptr_t unitptr; /* Unit number or pointer to object. */
@@ -149,10 +147,11 @@ static int dskread(void *, unsigned, unsigned);
static int xputc(int);
static int xgetc(int);
-
#define UFS_SMALL_CGBASE
#include "ufsread.c"
+static struct dmadat __dmadat;
+
static inline int
xfsread(ufs_ino_t inode, void *buf, size_t nbyte)
{