Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix previous

Browse Source
This commit is contained in:
jmcneill 2018-11-01 10:48:48 +00:00
parent 8e63a218ff
commit 32eec71f56
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/evbarm/fdt/fdt_memory.c
View File

@ -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 @@ fdt_memory_remove_range(uint64_t start, uint64_t size)
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.
*/