From owner-svn-src-all@freebsd.org  Tue Sep 17 11:20:54 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 95DDBFFAB1;
 Tue, 17 Sep 2019 11:20:54 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46Xgdy3Rj4z3P3p;
 Tue, 17 Sep 2019 11:20:54 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5978B79E7;
 Tue, 17 Sep 2019 11:20:54 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8HBKs6K090934;
 Tue, 17 Sep 2019 11:20:54 GMT (envelope-from ray@FreeBSD.org)
Received: (from ray@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8HBKssp090933;
 Tue, 17 Sep 2019 11:20:54 GMT (envelope-from ray@FreeBSD.org)
Message-Id: <201909171120.x8HBKssp090933@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ray set sender to ray@FreeBSD.org
 using -f
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Tue, 17 Sep 2019 11:20:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r352442 - stable/12/sys/arm/arm
X-SVN-Group: stable-12
X-SVN-Commit-Author: ray
X-SVN-Commit-Paths: stable/12/sys/arm/arm
X-SVN-Commit-Revision: 352442
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Sep 2019 11:20:54 -0000

Author: ray
Date: Tue Sep 17 11:20:53 2019
New Revision: 352442
URL: https://svnweb.freebsd.org/changeset/base/352442

Log:
  MFC r351649 Check for region dups.

Modified:
  stable/12/sys/arm/arm/physmem.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm/arm/physmem.c
==============================================================================
--- stable/12/sys/arm/arm/physmem.c	Tue Sep 17 10:09:59 2019	(r352441)
+++ stable/12/sys/arm/arm/physmem.c	Tue Sep 17 11:20:53 2019	(r352442)
@@ -287,6 +287,8 @@ insert_region(struct region *regions, size_t rcnt, vm_
 
 	ep = regions + rcnt;
 	for (i = 0, rp = regions; i < rcnt; ++i, ++rp) {
+		if (rp->addr == addr && rp->size == size) /* Pure dup. */
+			return (rcnt);
 		if (flags == rp->flags) {
 			if (addr + size == rp->addr) {
 				rp->addr = addr;