Author: trasz
Date: Mon Nov 19 01:15:32 2012
New Revision: 243254
URL: http://svnweb.freebsd.org/changeset/base/243254
Log:
Fix build on powerpc.
Reviewed by: nwhitehorn
Modified:
head/sys/boot/powerpc/boot1.chrp/boot1.c
Modified: head/sys/boot/powerpc/boot1.chrp/boot1.c
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/boot1.c Mon Nov 19 00:19:27 2012
(r243253)
+++ head/sys/boot/powerpc/boot1.chrp/boot1.c Mon Nov 19 01:15:32 2012
(r243254)
@@ -61,7 +61,7 @@ static void usage(void);
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, int quiet);
+static int domount(const char *device, int quiet);
static void panic(const char *fmt, ...) __dead2;
static int printf(const char *fmt, ...);
@@ -431,7 +431,7 @@ main(int ac, char **av)
bootpath_full[len+2] = '\0';
}
- if (mount(bootpath_full,1) >= 0)
+ if (domount(bootpath_full,1) >= 0)
break;
if (bootdev > 0)
@@ -439,10 +439,10 @@ main(int ac, char **av)
}
if (i >= 16)
- panic("mount");
+ panic("domount");
} else {
- if (mount(bootpath_full,0) == -1)
- panic("mount");
+ if (domount(bootpath_full,0) == -1)
+ panic("domount");
}
printf(" Boot volume: %s\n",bootpath_full);
@@ -469,17 +469,17 @@ exit(int code)
static struct dmadat __dmadat;
static int
-mount(const char *device, int quiet)
+domount(const char *device, int quiet)
{
dmadat = &__dmadat;
if ((bootdev = ofw_open(device)) == -1) {
- printf("mount: can't open device\n");
+ printf("domount: can't open device\n");
return (-1);
}
if (fsread(0, NULL, 0)) {
if (!quiet)
- printf("mount: can't read superblock\n");
+ printf("domount: can't read superblock\n");
return (-1);
}
return (0);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
