Module Name: src Committed By: matt Date: Mon Dec 31 01:23:31 UTC 2012
Modified Files: src/sys/arch/arm/arm32: arm32_kvminit.c Log Message: Correct one of the kernel_size calculations. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 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.15 src/sys/arch/arm/arm32/arm32_kvminit.c:1.16 --- src/sys/arch/arm/arm32/arm32_kvminit.c:1.15 Mon Dec 10 06:51:49 2012 +++ src/sys/arch/arm/arm32/arm32_kvminit.c Mon Dec 31 01:23:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_kvminit.c,v 1.15 2012/12/10 06:51:49 matt Exp $ */ +/* $NetBSD: arm32_kvminit.c,v 1.16 2012/12/31 01:23:31 matt Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -122,7 +122,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.15 2012/12/10 06:51:49 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.16 2012/12/31 01:23:31 matt Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -390,7 +390,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b + UND_STACK_SIZE + UPAGES) * PAGE_SIZE; kernel_size += round_page(MSGBUFSIZE); kernel_size += 0x10000; /* slop */ - kernel_size += (kernel_size + L2_S_SEGSIZE - 1) / L2_S_SEGSIZE; + kernel_size += PAGE_SIZE * (kernel_size + L2_S_SEGSIZE - 1) / L2_S_SEGSIZE; kernel_size = round_page(kernel_size); /*