From 6cea1f5ca87e7431fd63ce4c6c358885b24e830c Mon Sep 17 00:00:00 2001
From: hpa <hpa>
Date: Tue, 23 Mar 1999 09:01:59 +0000
Subject: [PATCH] Move far jmp into the boot sector, since there actually is
 space there now (how did that happen?)

---
 ldlinux.asm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/ldlinux.asm b/ldlinux.asm
index 873395c..e3bede4 100644
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -607,8 +607,14 @@ found_it:	; Note: we actually leave two words on the stack here
 		jne kaboom		; matches LDLINUX.SYS
 ;
 ; Done! Jump to the entry point!
+; 
+; Note that some BIOSes are buggy and run the boot sector at 07C0:0000
+; instead of 0000:7C00 and the like.  We don't want to add anything
+; more to the boot sector, so it is written to not assume a fixed
+; value in CS, but we don't want to deal with that anymore from now
+; on.
 ;
-		jmp ldlinux_ent
+		jmp 0:ldlinux_ent
 
 ;
 ;
@@ -783,15 +789,7 @@ ldlinux_magic	db 'LDLINUX SYS'
 
 		align 4
 
-;
-; Entry point.  Note that some BIOSes are buggy and put the boot sector
-; at 07C0:0000 instead of 0000:7C00 and the like.  We don't want to add
-; anything more to the boot sector, so it is written to not assume a fixed
-; value in CS, but we don't want to deal with that anymore from now on.
-;
 ldlinux_ent:
-		jmp 0:ldlinux_ent2
-ldlinux_ent2:
 ;
 ; Tell the user we got this far
 ;
-- 
2.7.4