From e1d2ff9f4486d8165fa33ec5346439ab2dfeeeb6 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Fri, 15 Nov 1996 09:00:56 +0000
Subject: [PATCH] Change this back to movl for -current since it seems to work
 there. Bruce says that movl is broken in -stable, which would certainly
 explain why this didn't work there.

---
 sys/amd64/amd64/locore.S | 4 ++--
 sys/amd64/amd64/locore.s | 4 ++--
 sys/i386/i386/locore.s   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 3595bb881d9..ab2c7159287 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.76 1996/11/11 04:20:18 dyson Exp $
+ *	$Id: locore.s,v 1.77 1996/11/14 15:55:21 jkh Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -525,7 +525,7 @@ olddiskboot:
 
 #if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
 	movl	$0x10200, %esi
-	lea	$R(_userconfig_from_boot),%edi
+	movl	$R(_userconfig_from_boot),%edi
 	movl	$512,%ecx
 	cld
 	rep
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 3595bb881d9..ab2c7159287 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.76 1996/11/11 04:20:18 dyson Exp $
+ *	$Id: locore.s,v 1.77 1996/11/14 15:55:21 jkh Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -525,7 +525,7 @@ olddiskboot:
 
 #if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
 	movl	$0x10200, %esi
-	lea	$R(_userconfig_from_boot),%edi
+	movl	$R(_userconfig_from_boot),%edi
 	movl	$512,%ecx
 	cld
 	rep
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 3595bb881d9..ab2c7159287 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.76 1996/11/11 04:20:18 dyson Exp $
+ *	$Id: locore.s,v 1.77 1996/11/14 15:55:21 jkh Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -525,7 +525,7 @@ olddiskboot:
 
 #if defined(USERCONFIG_BOOT) && defined(USERCONFIG)
 	movl	$0x10200, %esi
-	lea	$R(_userconfig_from_boot),%edi
+	movl	$R(_userconfig_from_boot),%edi
 	movl	$512,%ecx
 	cld
 	rep