svn commit: r215632 - stable/7/sys/boot/i386/boot2

[Bruce Cran]

Author: brucec
Date: Sun Nov 21 13:11:50 2010
New Revision: 215632
URL: http://svn.freebsd.org/changeset/base/215632

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/7/sys/boot/i386/boot2/boot1.S
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/boot/i386/boot2/boot1.S
==============================================================================
--- stable/7/sys/boot/i386/boot2/boot1.S	Sun Nov 21 13:04:53 2010	(r215631)
+++ stable/7/sys/boot/i386/boot2/boot1.S	Sun Nov 21 13:11:50 2010	(r215632)
@@ -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.
  */