Module Name: src
Committed By: jmcneill
Date: Thu Aug 11 22:26:19 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: pmap.c
Log Message:
pmap_memory isn't a static array anymore so sizeof doesn't work on it
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/usermode/usermode/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/usermode/usermode/pmap.c
diff -u src/sys/arch/usermode/usermode/pmap.c:1.6 src/sys/arch/usermode/usermode/pmap.c:1.7
--- src/sys/arch/usermode/usermode/pmap.c:1.6 Wed Aug 10 01:32:44 2011
+++ src/sys/arch/usermode/usermode/pmap.c Thu Aug 11 22:26:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.6 2011/08/10 01:32:44 jmcneill Exp $ */
+/* $NetBSD: pmap.c,v 1.7 2011/08/11 22:26:18 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.6 2011/08/10 01:32:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.7 2011/08/11 22:26:18 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,6 +45,7 @@
struct pmap * const kernel_pmap_ptr = &pmap_kernel_store;
static uint8_t *pmap_memory;
+static vsize_t pmap_memory_size = 1024 * MEMSIZE;
static vaddr_t virtual_avail, virtual_end;
static vaddr_t pmap_maxkvaddr;
@@ -53,12 +54,12 @@
void
pmap_bootstrap(void)
{
- pmap_memory = calloc(1, 1024 * MEMSIZE);
+ pmap_memory = calloc(1, pmap_memory_size);
if (pmap_memory == NULL)
panic("pmap_bootstrap: no memory");
virtual_avail = (vaddr_t)pmap_memory;
- virtual_end = virtual_avail + sizeof(pmap_memory);
+ virtual_end = virtual_avail + pmap_memory_size;
uvm_page_physload(atop(virtual_avail),
atop(virtual_end),
