Module Name: src
Committed By: skrll
Date: Sat Sep 2 11:57:09 UTC 2017
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.354 -r1.355 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.354 src/sys/arch/arm/arm32/pmap.c:1.355
--- src/sys/arch/arm/arm32/pmap.c:1.354 Sat Sep 2 11:52:30 2017
+++ src/sys/arch/arm/arm32/pmap.c Sat Sep 2 11:57:09 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.354 2017/09/02 11:52:30 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.355 2017/09/02 11:57:09 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
#include <arm/locore.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.354 2017/09/02 11:52:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.355 2017/09/02 11:57:09 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -1937,8 +1937,7 @@ pmap_vac_me_user(struct vm_page_md *md,
/* Writable mappings */
if (pv->pv_flags & PVF_WRITE)
++writable;
- } else
- if (pv->pv_flags & PVF_WRITE)
+ } else if (pv->pv_flags & PVF_WRITE)
other_writable = 1;
}
@@ -1981,8 +1980,7 @@ pmap_vac_me_user(struct vm_page_md *md,
PTE_SYNC_CURRENT(pv->pv_pmap, ptep);
}
cpu_cpwait();
- } else
- if (entries > cacheable_entries) {
+ } else if (entries > cacheable_entries) {
/*
* Turn cacheing back on for some pages. If it is a kernel
* page, only do so if there are no other writable pages.
@@ -2425,8 +2423,7 @@ pmap_clearbit(struct vm_page_md *md, pad
npte |= pte_l2_s_cache_mode;
pv->pv_flags &= ~PVF_NC;
}
- } else
- if (l2pte_writable_p(opte)) {
+ } else if (l2pte_writable_p(opte)) {
/*
* Entry is writable/cacheable: check if pmap
* is current if it is flush it, otherwise it
