From 68b7d21a4ac433d0622a9ec8f51e54367e7c1467 Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@FreeBSD.org>
Date: Wed, 25 Aug 1999 06:56:37 +0000
Subject: [PATCH] Rename 'bios_jmp' to 'bios16_jmp' to make it clear what it's
 related to.

---
 sys/amd64/amd64/bios.c   | 6 +++---
 sys/i386/i386/bios.c     | 6 +++---
 sys/i386/i386/bioscall.s | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 521761f67731..595f6f5cd8ff 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.19 1999/08/24 16:42:08 msmith Exp $
+ *      $Id: bios.c,v 1.20 1999/08/25 06:44:32 peter Exp $
  */
 
 /*
@@ -287,7 +287,7 @@ set_bios_selectors(struct bios_segments *seg, int flags)
 }
 
 extern int vm86pa;
-extern void bios_jmp(void);
+extern void bios16_jmp(void);
 
 /*
  * this routine is really greedy with selectors, and uses 5:
@@ -366,7 +366,7 @@ bios16(struct bios_args *args, char *fmt, ...)
 	args->seg.args.limit = 0xffff;
     }
 
-    args->seg.code32.base = (u_int)&bios_jmp & PG_FRAME;
+    args->seg.code32.base = (u_int)&bios16_jmp & PG_FRAME;
     args->seg.code32.limit = 0xffff;	
 
     ptd = (u_int *)rcr3();
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 521761f67731..595f6f5cd8ff 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.19 1999/08/24 16:42:08 msmith Exp $
+ *      $Id: bios.c,v 1.20 1999/08/25 06:44:32 peter Exp $
  */
 
 /*
@@ -287,7 +287,7 @@ set_bios_selectors(struct bios_segments *seg, int flags)
 }
 
 extern int vm86pa;
-extern void bios_jmp(void);
+extern void bios16_jmp(void);
 
 /*
  * this routine is really greedy with selectors, and uses 5:
@@ -366,7 +366,7 @@ bios16(struct bios_args *args, char *fmt, ...)
 	args->seg.args.limit = 0xffff;
     }
 
-    args->seg.code32.base = (u_int)&bios_jmp & PG_FRAME;
+    args->seg.code32.base = (u_int)&bios16_jmp & PG_FRAME;
     args->seg.code32.limit = 0xffff;	
 
     ptd = (u_int *)rcr3();
diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s
index a7e9dd071e15..3d95a6278dd2 100644
--- a/sys/i386/i386/bioscall.s
+++ b/sys/i386/i386/bioscall.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bioscall.s,v 1.3 1999/07/29 07:10:34 msmith Exp $
+ *      $Id: bioscall.s,v 1.4 1999/08/25 06:44:32 peter Exp $
  */
 
 /*
@@ -123,12 +123,12 @@ ENTRY(bios16_call)
 	movl	20(%ebp),%edi
 
 	pushl	$BC32SEL
-	leal	CNAME(bios_jmp),%ebp
+	leal	CNAME(bios16_jmp),%ebp
 	andl	$PAGE_MASK,%ebp
 	pushl	%ebp			/* reload %cs and */
 	lret				/* ...continue below */
-	.globl	CNAME(bios_jmp)
-CNAME(bios_jmp):
+	.globl	CNAME(bios16_jmp)
+CNAME(bios16_jmp):
 	data16
 	lcall	_bioscall_vector	/* 16-bit call */