From owner-svn-src-stable-7@FreeBSD.ORG  Sun Nov 30 00:00:02 2008
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E94B3106567A;
	Sun, 30 Nov 2008 00:00:02 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D97428FC0A;
	Sun, 30 Nov 2008 00:00:02 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAU002i9065993;
	Sun, 30 Nov 2008 00:00:02 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAU002At065992;
	Sun, 30 Nov 2008 00:00:02 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <200811300000.mAU002At065992@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sun, 30 Nov 2008 00:00:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185458 - stable/7/sys/boot/i386/boot0
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Nov 2008 00:00:03 -0000

Author: luigi
Date: Sun Nov 30 00:00:02 2008
New Revision: 185458
URL: http://svn.freebsd.org/changeset/base/185458

Log:
  MFC: pass the correct value in %si to the next stage boot
  
  Approved by:	re@

Modified:
  stable/7/sys/boot/i386/boot0/boot0.S

Modified: stable/7/sys/boot/i386/boot0/boot0.S
==============================================================================
--- stable/7/sys/boot/i386/boot0/boot0.S	Sat Nov 29 21:48:12 2008	(r185457)
+++ stable/7/sys/boot/i386/boot0/boot0.S	Sun Nov 30 00:00:02 2008	(r185458)
@@ -319,8 +319,9 @@ main.15:	movw $LOAD,%bx			# Address for 
 		jc main.10			# If error
 		cmpw $MAGIC,0x1fe(%bx)		# Bootable?
 		jne main.10			# No
-		movw $crlf,%si			# Leave some
-		callw puts			#  space
+		pushw %si			# Save ptr to selected part.
+		callw putn			# Leave some space
+		popw %si			# Restore, next stage uses it
 		jmp *%bx			# Invoke bootstrap
 
 /*