svn commit: r243305 - head/sys/boot/sparc64/boot1
Marius Strobl
marius at FreeBSD.org
Mon Nov 19 19:31:54 UTC 2012
Author: marius
Date: Mon Nov 19 19:31:54 2012
New Revision: 243305
URL: http://svnweb.freebsd.org/changeset/base/243305
Log:
Fix build after r243245.
Submitted by: trasz
Modified:
head/sys/boot/sparc64/boot1/boot1.c
Modified: head/sys/boot/sparc64/boot1/boot1.c
==============================================================================
--- head/sys/boot/sparc64/boot1/boot1.c Mon Nov 19 19:30:30 2012 (r243304)
+++ head/sys/boot/sparc64/boot1/boot1.c Mon Nov 19 19:31:54 2012 (r243305)
@@ -60,7 +60,7 @@ static void load(const char *);
static void bcopy(const void *src, void *dst, size_t len);
static void bzero(void *b, size_t len);
-static int mount(const char *device);
+static int domount(const char *device);
static int dskread(void *buf, u_int64_t lba, int nblk);
static void panic(const char *fmt, ...) __dead2;
@@ -347,8 +347,8 @@ main(int ac, char **av)
" Boot loader: %s\n", "", bootpath, path);
#endif
- if (mount(bootpath) == -1)
- panic("mount");
+ if (domount(bootpath) == -1)
+ panic("domount");
#ifdef ZFSBOOT
loadzfs();
@@ -497,17 +497,17 @@ load(const char *fname)
#endif /* ZFSBOOT */
static int
-mount(const char *device)
+domount(const char *device)
{
if ((bootdev = ofw_open(device)) == -1) {
- printf("mount: can't open device\n");
+ printf("domount: can't open device\n");
return (-1);
}
#ifndef ZFSBOOT
dmadat = &__dmadat;
if (fsread(0, NULL, 0)) {
- printf("mount: can't read superblock\n");
+ printf("domount: can't read superblock\n");
return (-1);
}
#endif
More information about the svn-src-head
mailing list