Source-Changes-HG archive

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

[src/netbsd-9]: src/sys/arch/aarch64/aarch64 Pull up following revision(s) (r...



details:   https://anonhg.NetBSD.org/src/rev/659dcb1fc684
branches:  netbsd-9
changeset: 1001838:659dcb1fc684
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jun 30 18:39:37 2020 +0000

description:
Pull up following revision(s) (requested by ryo in ticket #976):

        sys/arch/aarch64/aarch64/pmap.c: revision 1.79

Fix bug with incorrect range calculation when doing icache sync.

This is called by sysarch(ARM_SYNC_ICACHE) from aarch32 (compat_netbsd32) emul process.
pointed out by rin@, thanks.

XXX pullup-9

diffstat:

 sys/arch/aarch64/aarch64/pmap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 6ecd67c15058 -r 659dcb1fc684 sys/arch/aarch64/aarch64/pmap.c
--- a/sys/arch/aarch64/aarch64/pmap.c   Tue Jun 30 18:22:48 2020 +0000
+++ b/sys/arch/aarch64/aarch64/pmap.c   Tue Jun 30 18:39:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.41.2.5 2020/01/21 11:15:52 martin Exp $     */
+/*     $NetBSD: pmap.c,v 1.41.2.6 2020/06/30 18:39:37 martin Exp $     */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.41.2.5 2020/01/21 11:15:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.41.2.6 2020/06/30 18:39:37 martin Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
@@ -850,7 +850,7 @@
                pte = *ptep;
                if (lxpde_valid(pte)) {
                        vaddr_t eob = (va + blocksize) & ~(blocksize - 1);
-                       vsize_t len = ulmin(eva, eob - va);
+                       vsize_t len = ulmin(eva, eob) - va;
 
                        if (l3pte_writable(pte)) {
                                cpu_icache_sync_range(va, len);



Home | Main Index | Thread Index | Old Index