Module Name: src Committed By: skrll Date: Fri Jul 3 06:26:41 UTC 2020
Modified Files: src/sys/arch/arm/arm32: arm32_kvminit.c Log Message: Use howmany() To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/arm/arm32/arm32_kvminit.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/arm32_kvminit.c diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.61 src/sys/arch/arm/arm32/arm32_kvminit.c:1.62 --- src/sys/arch/arm/arm32/arm32_kvminit.c:1.61 Fri Jul 3 06:22:48 2020 +++ src/sys/arch/arm/arm32/arm32_kvminit.c Fri Jul 3 06:26:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_kvminit.c,v 1.61 2020/07/03 06:22:48 skrll Exp $ */ +/* $NetBSD: arm32_kvminit.c,v 1.62 2020/07/03 06:26:41 skrll Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -127,7 +127,7 @@ #include "opt_multiprocessor.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.61 2020/07/03 06:22:48 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.62 2020/07/03 06:26:41 skrll Exp $"); #include <sys/param.h> @@ -476,7 +476,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b kernel_size += 0x10000; /* slop */ if (!mapallmem_p) { kernel_size += PAGE_SIZE - * ((kernel_size + L2_S_SEGSIZE - 1) / L2_S_SEGSIZE); + * howmany(kernel_size, L2_S_SEGSIZE); } kernel_size = round_page(kernel_size); @@ -484,7 +484,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b * Now we know how many L2 pages it will take. */ const size_t KERNEL_L2PT_KERNEL_NUM = - round_page(kernel_size + L2_S_SEGSIZE - 1) / L2_S_SEGSIZE; + howmany(kernel_size, L2_S_SEGSIZE); VPRINTF("%s: %zu L2 pages are needed to map %#zx kernel bytes\n", __func__, KERNEL_L2PT_KERNEL_NUM, kernel_size);