Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/arm32 If not using LPAE, if memory ends at 4GB ...



details:   https://anonhg.NetBSD.org/src/rev/d4f64f30d69f
branches:  trunk
changeset: 337930:d4f64f30d69f
user:      matt <matt%NetBSD.org@localhost>
date:      Mon May 04 00:12:56 2015 +0000

description:
If not using LPAE, if memory ends at 4GB ignore the last page so physical_end
doesn't wrap to 0.

diffstat:

 sys/arch/arm/arm32/arm32_boot.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r dcecd5d22bda -r d4f64f30d69f sys/arch/arm/arm32/arm32_boot.c
--- a/sys/arch/arm/arm32/arm32_boot.c   Sun May 03 22:51:11 2015 +0000
+++ b/sys/arch/arm/arm32/arm32_boot.c   Mon May 04 00:12:56 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_boot.c,v 1.12 2015/01/12 01:18:38 jakllsch Exp $ */
+/*     $NetBSD: arm32_boot.c,v 1.13 2015/05/04 00:12:56 matt Exp $     */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -123,7 +123,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.12 2015/01/12 01:18:38 jakllsch Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.13 2015/05/04 00:12:56 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -268,6 +268,13 @@
                                        break;
                                }
                        }
+#ifndef         HAVE_ARM_LPAE
+                       // If memory ends at 4GB (and wraps to 0), ignore
+                       // the last page.
+                       if (__predict_false(segend == 0 && start > 0)) {
+                               segend = -PAGE_SIZE;
+                       }
+#endif
        
                        uvm_page_physload(start, segend, start, segend,
                            vm_freelist);



Home | Main Index | Thread Index | Old Index