From owner-svn-src-all@FreeBSD.ORG  Sun Nov 14 08:25:28 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 133151065674;
	Sun, 14 Nov 2010 08:25:28 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 01DFB8FC1A;
	Sun, 14 Nov 2010 08:25:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAE8PRW8075186;
	Sun, 14 Nov 2010 08:25:27 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAE8PRV4075184;
	Sun, 14 Nov 2010 08:25:27 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201011140825.oAE8PRV4075184@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sun, 14 Nov 2010 08:25:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215284 - head/sys/boot/i386/boot2
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 14 Nov 2010 08:25:28 -0000

Author: brucec
Date: Sun Nov 14 08:25:27 2010
New Revision: 215284
URL: http://svn.freebsd.org/changeset/base/215284

Log:
  When rebooting the machine jump to 0xf000:fff0 instead of 0xffff:0x0.
  This is the same change that was made in rev 1.33 of boot/i386/btx/btx/btx.S
  
  PR:	i386/91871
  Submitted by:	Bjorn Konig <bkoenig at cs.tu-berlin.de>
  MFC after:	1 week

Modified:
  head/sys/boot/i386/boot2/boot1.S

Modified: head/sys/boot/i386/boot2/boot1.S
==============================================================================
--- head/sys/boot/i386/boot2/boot1.S	Sun Nov 14 08:06:29 2010	(r215283)
+++ head/sys/boot/i386/boot2/boot1.S	Sun Nov 14 08:25:27 2010	(r215284)
@@ -239,7 +239,7 @@ error:		callw putstr			# Display message
 		xorb %ah,%ah			# BIOS: Get
 		int $0x16			#  keypress
 		movw $0x1234, BDA_BOOT		# Do a warm boot
-		ljmp $0xffff,$0x0		# reboot the machine
+		ljmp $0xf000,$0x0		# reboot the machine
 /*
  * Display a null-terminated string using the BIOS output.
  */