[src/trunk]: src/sys/arch/evbarm/fdt Fix previous

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/168a48a4140f
branches:  trunk
changeset: 445534:168a48a4140f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Nov 01 10:48:48 2018 +0000

description:
Fix previous

diffstat:

 sys/arch/evbarm/fdt/fdt_memory.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r b609840901fa -r 168a48a4140f sys/arch/evbarm/fdt/fdt_memory.c
--- a/sys/arch/evbarm/fdt/fdt_memory.c  Thu Nov 01 10:21:41 2018 +0000
+++ b/sys/arch/evbarm/fdt/fdt_memory.c  Thu Nov 01 10:48:48 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_memory.c,v 1.2 2018/11/01 10:21:41 jmcneill Exp $ */
+/* $NetBSD: fdt_memory.c,v 1.3 2018/11/01 10:48:48 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "opt_bootconfig.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_memory.c,v 1.2 2018/11/01 10:21:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_memory.c,v 1.3 2018/11/01 10:48:48 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -147,12 +147,12 @@
                        next->mr_mem.end = mr->mr_mem.end;
                        mr->mr_mem.end = start;
                        TAILQ_INSERT_AFTER(&fdt_memory_ranges, mr, next, mr_list);
-               } else if (start <= mr->mr_mem.start && end < mr->mr_mem.end) {
+               } else if (start <= mr->mr_mem.start && end > mr->mr_mem.start && end < mr->mr_mem.end) {
                        /*
                         * Partial overlap at the beginning of the range.
                         */
                        mr->mr_mem.start = end;
-               } else if (start > mr->mr_mem.start && end >= mr->mr_mem.end) {
+               } else if (start > mr->mr_mem.start && start < mr->mr_mem.end && end >= mr->mr_mem.end) {
                        /*
                         * Partial overlap at the end of the range.
                         */