From owner-svn-src-all@FreeBSD.ORG  Mon Nov 19 19:31:54 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B0FD27D0;
 Mon, 19 Nov 2012 19:31:54 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9313D8FC12;
 Mon, 19 Nov 2012 19:31:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJJVs1p028740;
 Mon, 19 Nov 2012 19:31:54 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJJVsMb028739;
 Mon, 19 Nov 2012 19:31:54 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201211191931.qAJJVsMb028739@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 19 Nov 2012 19:31:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243305 - head/sys/boot/sparc64/boot1
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Nov 2012 19:31:54 -0000

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