From 43c6fba4f6e2909ae78ee679ee2e5c2f2d70ff3e Mon Sep 17 00:00:00 2001
From: Doug Rabson <dfr@FreeBSD.org>
Date: Thu, 15 Oct 1998 22:00:54 +0000
Subject: [PATCH] Fix a typo preventing the correct value of kernend from being
 picked up from the bootstrap.  Also change some debug printfs from #if 0 to
 #ifdef DEBUG_CLUSTER to make it easier to debug startup memory problems.

---
 sys/alpha/alpha/machdep.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index d4185256c5c..6d35e8a4f37 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: machdep.c,v 1.16 1998/10/14 09:53:24 peter Exp $
+ *	$Id: machdep.c,v 1.17 1998/10/14 10:08:35 peter Exp $
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -700,7 +700,7 @@ alpha_init(pfn, ptb, bim, bip, biv)
 #endif
 	/* But if the bootstrap tells us otherwise, believe it! */
 	if (bootinfo.kernend)
-		kernend = (vm_offset_t)round_page(kernend);
+		kernend = round_page(bootinfo.kernend);
 	preload_metadata = (caddr_t)bootinfo.modptr;
 	kern_envp = bootinfo.envp;
 
@@ -729,14 +729,14 @@ alpha_init(pfn, ptb, bim, bip, biv)
 		       mddtp->mddt_cluster_cnt);
 	}
 
-#if 0
+#ifdef DEBUG_CLUSTER
 	printf("Memory cluster count: %d\n", mddtp->mddt_cluster_cnt);
 #endif
 
 	phys_avail_cnt = 0;
 	for (i = 0; i < mddtp->mddt_cluster_cnt; i++) {
 		memc = &mddtp->mddt_clusters[i];
-#if 0
+#ifdef DEBUG_CLUSTER
 		printf("MEMC %d: pfn 0x%lx cnt 0x%lx usage 0x%lx\n", i,
 		       memc->mddt_pfn, memc->mddt_pg_cnt, memc->mddt_usage);
 #endif
@@ -780,7 +780,7 @@ alpha_init(pfn, ptb, bim, bip, biv)
 				 * Must compute the location of the kernel
 				 * within the segment.
 				 */
-#if 0
+#ifdef DEBUG_CLUSTER
 				printf("Cluster %d contains kernel\n", i);
 #endif
 				if (!pmap_uses_prom_console()) {
@@ -788,7 +788,7 @@ alpha_init(pfn, ptb, bim, bip, biv)
 				/*
 				 * There is a chunk before the kernel.
 				 */
-#if 0
+#ifdef DEBUG_CLUSTER
 						printf("Loading chunk before kernel: "
 						       "0x%lx / 0x%lx\n", pfn0, kernstartpfn);
 #endif
@@ -801,7 +801,7 @@ alpha_init(pfn, ptb, bim, bip, biv)
 				/*
 				 * There is a chunk after the kernel.
 				 */
-#if 0
+#ifdef DEBUG_CLUSTER
 					printf("Loading chunk after kernel: "
 					       "0x%lx / 0x%lx\n", kernendpfn, pfn1);
 #endif
@@ -813,7 +813,7 @@ alpha_init(pfn, ptb, bim, bip, biv)
 				/*
 				 * Just load this cluster as one chunk.
 				 */
-#if 0
+#ifdef DEBUG_CLUSTER
 				printf("Loading cluster %d: 0x%lx / 0x%lx\n", i,
 				       pfn0, pfn1);
 #endif