Module Name: src
Committed By: cherry
Date: Thu Dec 22 16:05:15 UTC 2016
Modified Files:
src/sys/arch/cesfic/cesfic: machdep.c
src/sys/arch/luna68k/luna68k: pmap_bootstrap.c
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
src/sys/arch/x68k/x68k: pmap_bootstrap.c
src/sys/rump/librump/rumpkern: emul.c
src/sys/sys: systm.h
src/sys/uvm: uvm_page.c
Log Message:
physmem should be of type psize_t
Also, use PRIxPSIZE when printf(9)ing physmem.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
cvs rdiff -u -r1.84 -r1.85 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x68k/x68k/pmap_bootstrap.c
cvs rdiff -u -r1.179 -r1.180 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.271 -r1.272 src/sys/sys/systm.h
cvs rdiff -u -r1.188 -r1.189 src/sys/uvm/uvm_page.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/cesfic/cesfic/machdep.c
diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.66 src/sys/arch/cesfic/cesfic/machdep.c:1.67
--- src/sys/arch/cesfic/cesfic/machdep.c:1.66 Thu Nov 5 03:48:51 2015
+++ src/sys/arch/cesfic/cesfic/machdep.c Thu Dec 22 16:05:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.66 2015/11/05 03:48:51 pgoyette Exp $ */
+/* $NetBSD: machdep.c,v 1.67 2016/12/22 16:05:14 cherry Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2015/11/05 03:48:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.67 2016/12/22 16:05:14 cherry Exp $");
#include "opt_bufcache.h"
#include "opt_ddb.h"
@@ -111,7 +111,7 @@ struct vm_map *phys_map = NULL;
* Declare these as initialized data so we can patch them.
*/
/*int maxmem;*/ /* max memory per process */
-extern int physmem; /* max supported memory, changes to actual */
+extern psize_t physmem; /* max supported memory, changes to actual */
extern u_int lowram;
Index: src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
diff -u src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.36 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.37
--- src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.36 Sat Jan 26 15:46:24 2013
+++ src/sys/arch/luna68k/luna68k/pmap_bootstrap.c Thu Dec 22 16:05:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.36 2013/01/26 15:46:24 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.37 2016/12/22 16:05:15 cherry Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.36 2013/01/26 15:46:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.37 2016/12/22 16:05:15 cherry Exp $");
#include "opt_m68k_arch.h"
@@ -51,7 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: pmap_bootstr
extern char *etext;
-extern int maxmem, physmem;
+extern int maxmem;
+extern psize_t physmem;
extern paddr_t avail_start, avail_end;
/*
Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.84 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.85
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.84 Thu Dec 22 14:47:58 2016
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Thu Dec 22 16:05:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.84 2016/12/22 14:47:58 cherry Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.85 2016/12/22 16:05:15 cherry Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.84 2016/12/22 14:47:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.85 2016/12/22 16:05:15 cherry Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -477,7 +477,7 @@ initarm(void *arg)
physmem = (physical_end - physical_start) / PAGE_SIZE;
/* Tell the user about the memory */
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
+ printf("physmemory: %"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
/*
Index: src/sys/arch/x68k/x68k/pmap_bootstrap.c
diff -u src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.60 src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.61
--- src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.60 Sun Oct 27 02:06:06 2013
+++ src/sys/arch/x68k/x68k/pmap_bootstrap.c Thu Dec 22 16:05:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.60 2013/10/27 02:06:06 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.61 2016/12/22 16:05:15 cherry Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.60 2013/10/27 02:06:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.61 2016/12/22 16:05:15 cherry Exp $");
#include "opt_m68k_arch.h"
@@ -52,7 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: pmap_bootstr
extern char *etext;
-extern int maxmem, physmem;
+extern int maxmem;
+extern psize_t physmem;
extern paddr_t avail_start, avail_end;
/*
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.179 src/sys/rump/librump/rumpkern/emul.c:1.180
--- src/sys/rump/librump/rumpkern/emul.c:1.179 Tue Jan 26 23:12:17 2016
+++ src/sys/rump/librump/rumpkern/emul.c Thu Dec 22 16:05:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.179 2016/01/26 23:12:17 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.180 2016/12/22 16:05:15 cherry Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.179 2016/01/26 23:12:17 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.180 2016/12/22 16:05:15 cherry Exp $");
#include <sys/param.h>
#include <sys/cprng.h>
@@ -54,7 +54,7 @@ void (*rump_vfs_fini)(void) = (void *)nu
* calling rump_init()
*/
#define PHYSMEM 512*256
-int physmem = PHYSMEM;
+psize_t physmem = PHYSMEM;
int nkmempages = PHYSMEM/2; /* from le chapeau */
#undef PHYSMEM
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.271 src/sys/sys/systm.h:1.272
--- src/sys/sys/systm.h:1.271 Wed Jul 6 05:20:48 2016
+++ src/sys/sys/systm.h Thu Dec 22 16:05:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.271 2016/07/06 05:20:48 ozaki-r Exp $ */
+/* $NetBSD: systm.h,v 1.272 2016/12/22 16:05:15 cherry Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -82,7 +82,7 @@ extern int autoniceval; /* proc
extern int selwait; /* select timeout address */
extern int maxmem; /* max memory per process */
-extern int physmem; /* physical memory */
+extern psize_t physmem; /* physical memory */
extern dev_t dumpdev; /* dump device */
extern dev_t dumpcdev; /* dump device (character equivalent) */
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.188 src/sys/uvm/uvm_page.c:1.189
--- src/sys/uvm/uvm_page.c:1.188 Thu Dec 22 13:26:25 2016
+++ src/sys/uvm/uvm_page.c Thu Dec 22 16:05:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.188 2016/12/22 13:26:25 cherry Exp $ */
+/* $NetBSD: uvm_page.c,v 1.189 2016/12/22 16:05:15 cherry Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.188 2016/12/22 13:26:25 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.189 2016/12/22 16:05:15 cherry Exp $");
#include "opt_ddb.h"
#include "opt_uvm.h"
@@ -116,7 +116,7 @@ int vm_page_reserve_kernel = UVM_RESERVE
/*
* physical memory size;
*/
-int physmem;
+psize_t physmem;
/*
* local variables
