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 Wrap long lines.



details:   https://anonhg.NetBSD.org/src/rev/acf14569ea09
branches:  trunk
changeset: 341598:acf14569ea09
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Nov 13 07:55:18 2015 +0000

description:
Wrap long lines.

diffstat:

 sys/arch/arm/arm32/pmap.c |  17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r cc6681a2949d -r acf14569ea09 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Fri Nov 13 03:56:44 2015 +0000
+++ b/sys/arch/arm/arm32/pmap.c Fri Nov 13 07:55:18 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.328 2015/11/11 17:54:17 skrll Exp $ */
+/*     $NetBSD: pmap.c,v 1.329 2015/11/13 07:55:18 skrll Exp $ */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
 
 #include <arm/locore.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.328 2015/11/11 17:54:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.329 2015/11/13 07:55:18 skrll Exp $");
 
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
@@ -5009,7 +5009,11 @@
 
        if (pm->pm_remove_all) {
 #ifdef ARM_MMU_EXTENDED
-               KASSERTMSG(curcpu()->ci_pmap_cur != pm || pm->pm_pai[0].pai_asid == curcpu()->ci_pmap_asid_cur, "pmap/asid %p/%#x != %s cur pmap/asid %p/%#x", pm, pm->pm_pai[0].pai_asid, 
curcpu()->ci_data.cpu_name, curcpu()->ci_pmap_cur, curcpu()->ci_pmap_asid_cur);
+               KASSERTMSG(curcpu()->ci_pmap_cur != pm
+                   || pm->pm_pai[0].pai_asid == curcpu()->ci_pmap_asid_cur,
+                   "pmap/asid %p/%#x != %s cur pmap/asid %p/%#x", pm,
+                   pm->pm_pai[0].pai_asid, curcpu()->ci_data.cpu_name,
+                   curcpu()->ci_pmap_cur, curcpu()->ci_pmap_asid_cur);
                /*
                 * Finish up the pmap_remove_all() optimisation by flushing
                 * all our ASIDs.
@@ -5038,7 +5042,12 @@
                PMAP_COUNT(shootdown_ipis);
        }
 #endif
-       KASSERTMSG(curcpu()->ci_pmap_cur != pm || pm->pm_pai[0].pai_asid == curcpu()->ci_pmap_asid_cur, "pmap/asid %p/%#x != %s cur pmap/asid %p/%#x", pm, pm->pm_pai[0].pai_asid, 
curcpu()->ci_data.cpu_name, curcpu()->ci_pmap_cur, curcpu()->ci_pmap_asid_cur);
+
+       KASSERTMSG(curcpu()->ci_pmap_cur != pm
+           || pm->pm_pai[0].pai_asid == curcpu()->ci_pmap_asid_cur,
+           "pmap/asid %p/%#x != %s cur pmap/asid %p/%#x", pm,
+           pm->pm_pai[0].pai_asid, curcpu()->ci_data.cpu_name,
+           curcpu()->ci_pmap_cur, curcpu()->ci_pmap_asid_cur);
 #else
        if (pmap_is_current(pm)) {
                /*



Home | Main Index | Thread Index | Old Index