From 857f4d44be4d79b3675be7f8623a3d8c59e0c8c7 Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Sun, 16 Apr 1995 10:12:16 +0000
Subject: [PATCH] Remove gratuitous waste of 2K of memory for BIOS variables.
 We never load the kernel at 0-640k; we haven't had the ability to do that
 since before 2.0R. Furthermore, I fail to see how putting an instruction at 0
 and then doing a .org 0x500 is going to prevent the stuff from getting
 clobbered in the first place; a.out is just too stupid to know about sparse
 address spaces.

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

diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 367ab8404930..f088f4c4d551 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.50 1995/03/10 08:41:26 phk Exp $
+ *	$Id: locore.s,v 1.51 1995/03/11 03:49:46 phk Exp $
  */
 
 /*
@@ -154,13 +154,7 @@ _bdb_exists:	.long	0
  */
 NON_GPROF_ENTRY(btext)
 	movw	$0x1234,0x472			/* warm boot */
-	jmp	1f
-	/*
-	 * XXX now that we load at 1MB is this still really used?
-	 */
-	.org	0x500				/* space for BIOS variables */
 
-1:
 	/* Set up a real frame, some day we will be doing returns */
 	pushl	%ebp
 	movl	%esp, %ebp
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 367ab8404930..f088f4c4d551 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.50 1995/03/10 08:41:26 phk Exp $
+ *	$Id: locore.s,v 1.51 1995/03/11 03:49:46 phk Exp $
  */
 
 /*
@@ -154,13 +154,7 @@ _bdb_exists:	.long	0
  */
 NON_GPROF_ENTRY(btext)
 	movw	$0x1234,0x472			/* warm boot */
-	jmp	1f
-	/*
-	 * XXX now that we load at 1MB is this still really used?
-	 */
-	.org	0x500				/* space for BIOS variables */
 
-1:
 	/* Set up a real frame, some day we will be doing returns */
 	pushl	%ebp
 	movl	%esp, %ebp
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 367ab8404930..f088f4c4d551 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.50 1995/03/10 08:41:26 phk Exp $
+ *	$Id: locore.s,v 1.51 1995/03/11 03:49:46 phk Exp $
  */
 
 /*
@@ -154,13 +154,7 @@ _bdb_exists:	.long	0
  */
 NON_GPROF_ENTRY(btext)
 	movw	$0x1234,0x472			/* warm boot */
-	jmp	1f
-	/*
-	 * XXX now that we load at 1MB is this still really used?
-	 */
-	.org	0x500				/* space for BIOS variables */
 
-1:
 	/* Set up a real frame, some day we will be doing returns */
 	pushl	%ebp
 	movl	%esp, %ebp