CVS commit: src/sys/arch/evbarm/tegra

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Sat May 30 23:17:37 UTC 2015

Modified Files:
        src/sys/arch/evbarm/tegra: tegra_machdep.c

Log Message:
Use the first1g for kernel memory, not the 2nd one.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/tegra/tegra_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.16 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.17
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.16	Mon May 18 19:32:48 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c	Sat May 30 23:17:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.16 2015/05/18 19:32:48 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.17 2015/05/30 23:17:37 matt Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.16 2015/05/18 19:32:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.17 2015/05/30 23:17:37 matt Exp $");
 
 #include "opt_tegra.h"
 #include "opt_machdep.h"
@@ -143,7 +143,7 @@ static const struct pmap_devmap devmap[]
 #undef	_S
 
 #ifdef PMAP_NEED_ALLOC_POOLPAGE
-static struct boot_physmem bp_highgig = {
+static struct boot_physmem bp_lowgig = {
 	.bp_start = TEGRA_EXTMEM_BASE / NBPG,
 	.bp_pages = (KERNEL_VM_BASE - KERNEL_BASE) / NBPG,
 	.bp_freelist = VM_FREELIST_ISADMA,
@@ -311,11 +311,10 @@ initarm(void *arg)
 	evbarm_device_register = tegra_device_register;
 
 #ifdef PMAP_NEED_ALLOC_POOLPAGE
-	if (atop(ram_size) > bp_highgig.bp_pages) {
-		bp_highgig.bp_start += atop(ram_size) - bp_highgig.bp_pages;
-		arm_poolpage_vmfreelist = bp_highgig.bp_freelist;
+	if (atop(ram_size) > bp_lowgig.bp_pages) {
+		arm_poolpage_vmfreelist = bp_lowgig.bp_freelist;
 		return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE,
-		    &bp_highgig, 1);
+		    &bp_lowgig, 1);
 	}
 #endif