From e60e871a8e694331cafe1f1c78121dacd00acda1 Mon Sep 17 00:00:00 2001
From: simonb <simonb@NetBSD.org>
Date: Tue, 12 Nov 2002 00:47:10 +0000
Subject: [PATCH] Fix the end-of-kernel calculation when we don't have a valid
 bootinfo structure.  From Chris Demetriou.

---
 sys/arch/sbmips/sbmips/machdep.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/sys/arch/sbmips/sbmips/machdep.c b/sys/arch/sbmips/sbmips/machdep.c
index 1cf35b5614c3..9047d4eeacd2 100644
--- a/sys/arch/sbmips/sbmips/machdep.c
+++ b/sys/arch/sbmips/sbmips/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2002/11/09 05:49:30 cgd Exp $ */
+/* $NetBSD: machdep.c,v 1.14 2002/11/12 00:47:10 simonb Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -178,7 +178,6 @@ mach_init(long fwhandle, long magic, long bootdata, long reserved)
 	 * called because we may need CFE's TLB handler
 	 */
 
-	cfe_present = 0;
 	if (magic == BOOTINFO_MAGIC)
 		bcopy((struct bootinfo_v1 *)bootdata, &bootinfo,
 		    sizeof bootinfo);
@@ -188,14 +187,17 @@ mach_init(long fwhandle, long magic, long bootdata, long reserved)
 		bootinfo.version = BOOTINFO_VERSION;
 		bootinfo.fwhandle = fwhandle;
 		bootinfo.fwentry = bootdata;
+		bootinfo.ssym = (vaddr_t)end;
+		bootinfo.esym = (vaddr_t)end;
 	}
 
+	kernend = (caddr_t)mips_round_page(end);
 #ifdef DDB
-        ksym_start = (void *)bootinfo.ssym;
-        ksym_end   = (void *)bootinfo.esym;
-        kernend = (caddr_t)mips_round_page((vaddr_t)ksym_end);
-#else
-        kernend = (caddr_t)mips_round_page((vaddr_t)end);
+	if (magic == BOOTINFO_MAGIC) {
+		ksym_start = (void *)bootinfo.ssym;
+		ksym_end   = (void *)bootinfo.esym;
+		kernend = (caddr_t)mips_round_page((vaddr_t)ksym_end);
+	}
 #endif
 
 	consinit();