From owner-svn-src-stable@FreeBSD.ORG  Sun Nov 21 12:52:34 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 509EC1065670;
	Sun, 21 Nov 2010 12:52:34 +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 3EFA18FC15;
	Sun, 21 Nov 2010 12:52:34 +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 oALCqYiH057128;
	Sun, 21 Nov 2010 12:52:34 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oALCqYjR057126;
	Sun, 21 Nov 2010 12:52:34 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201011211252.oALCqYjR057126@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sun, 21 Nov 2010 12:52:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215630 - stable/8/sys/boot/i386/boot2
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Nov 2010 12:52:34 -0000

Author: brucec
Date: Sun Nov 21 12:52:33 2010
New Revision: 215630
URL: http://svn.freebsd.org/changeset/base/215630

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

Modified:
  stable/8/sys/boot/i386/boot2/boot1.S
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/boot/i386/boot2/boot1.S
==============================================================================
--- stable/8/sys/boot/i386/boot2/boot1.S	Sun Nov 21 12:47:54 2010	(r215629)
+++ stable/8/sys/boot/i386/boot2/boot1.S	Sun Nov 21 12:52:33 2010	(r215630)
@@ -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,$0xfff0		# reboot the machine
 /*
  * Display a null-terminated string using the BIOS output.
  */