Module Name: src
Committed By: skrll
Date: Mon Dec 30 15:42:40 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
Log Message:
Remove unnecessary brackets and unwrap a conditional. Same code before
and after.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.58 src/sys/arch/aarch64/aarch64/pmap.c:1.59
--- src/sys/arch/aarch64/aarch64/pmap.c:1.58 Sat Dec 28 17:19:43 2019
+++ src/sys/arch/aarch64/aarch64/pmap.c Mon Dec 30 15:42:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.58 2019/12/28 17:19:43 jmcneill Exp $ */
+/* $NetBSD: pmap.c,v 1.59 2019/12/30 15:42:39 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.58 2019/12/28 17:19:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.59 2019/12/30 15:42:39 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -323,8 +323,7 @@ pmap_devmap_bootstrap(vaddr_t l0pt, cons
(va < (VM_KERNEL_IO_ADDRESS + VM_KERNEL_IO_SIZE)));
/* update and check virtual_devmap_addr */
- if ((virtual_devmap_addr == 0) ||
- (virtual_devmap_addr > va)) {
+ if (virtual_devmap_addr == 0 || virtual_devmap_addr > va) {
virtual_devmap_addr = va;
}
@@ -423,7 +422,7 @@ pmap_bootstrap(vaddr_t vstart, vaddr_t v
#endif
/* devmap already uses last of va? */
- if ((virtual_devmap_addr != 0) && (virtual_devmap_addr < vend))
+ if (virtual_devmap_addr != 0 && virtual_devmap_addr < vend)
vend = virtual_devmap_addr;
virtual_avail = vstart;
