svn commit: r327703 - head/stand/mips/beri/boot2

John Baldwin jhb at FreeBSD.org
Mon Jan 8 18:44:37 UTC 2018


Author: jhb
Date: Mon Jan  8 18:44:36 2018
New Revision: 327703
URL: https://svnweb.freebsd.org/changeset/base/327703

Log:
  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

Modified:
  head/stand/mips/beri/boot2/boot2.c

Modified: head/stand/mips/beri/boot2/boot2.c
==============================================================================
--- head/stand/mips/beri/boot2/boot2.c	Mon Jan  8 18:42:40 2018	(r327702)
+++ head/stand/mips/beri/boot2/boot2.c	Mon Jan  8 18:44:36 2018	(r327703)
@@ -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,9 +147,10 @@ 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)


More information about the svn-src-head mailing list