From 1cc273db90ed49ba889c14669c8fc581679d3030 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Fri, 12 Jul 1996 05:25:47 +0000
Subject: [PATCH] Moved the definition of dflt_name to the correct file
 (table.c is only for explicitly initialized data) and made it conditional on
 NAMEBLOCK.

---
 sys/i386/boot/biosboot/boot.c  | 6 ++++--
 sys/i386/boot/biosboot/boot2.S | 4 +++-
 sys/i386/boot/biosboot/table.c | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index 5606d4fbab52..2decc57d0ea7 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.51 1996/07/05 19:55:03 julian Exp $
+ *	$Id: boot.c,v 1.52 1996/07/09 02:28:20 julian Exp $
  */
 
 
@@ -61,8 +61,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #define NAMEBUF_LEN	(8*1024)
 
+#ifdef NAMEBLOCK
+char *dflt_name;
+#endif
 char namebuf[NAMEBUF_LEN];
-extern	char *dflt_name;
 struct exec head;
 struct bootinfo bootinfo;
 int loadflags;
diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S
index ecb6b81e13b2..aa37e7d2c0ad 100644
--- a/sys/i386/boot/biosboot/boot2.S
+++ b/sys/i386/boot/biosboot/boot2.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
- *	$Id: boot2.S,v 1.6 1995/01/25 21:37:40 bde Exp $
+ *	$Id: boot2.S,v 1.7 1996/07/05 19:55:04 julian Exp $
  */
 
 #include	"asm.h"
@@ -58,9 +58,11 @@ ENTRY(boot2)
 	mov	%ax, %es
 	data32
 	shll	$4, %eax
+#ifdef NAMEBLOCK
 	addr32
 	data32
 	movl	%esp, EXT(dflt_name)
+#endif
 
 	/* fix up GDT entries for bootstrap */
 #define FIXUP(gdt_index) \
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index 9f3959a3ba7b..e2be8b7091a5 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.10 1996/04/07 14:28:05 bde Exp $
+ *	$Id: table.c,v 1.11 1996/07/05 19:55:05 julian Exp $
  */
 
 /*
@@ -140,4 +140,3 @@ char *devs[] = { "wd", "dk", "fd", "wt", "sd", 0 };
 char dflname[] = "/kernel";
 char *name = dflname;
 unsigned long tw_chars = 0x5C2D2F7C;	/* "\-/|" */
-char *dflt_name;