CVS commit: src/sys/arch

[Maya Rashish]

Module Name:    src
Committed By:   maya
Date:           Fri Dec 23 08:09:54 UTC 2016

Modified Files:
        src/sys/arch/hp300/hp300: pmap_bootstrap.c
        src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c

Log Message:
remove conflicting declarations of physmem. we want it to be psize_t


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/hp300/hp300/pmap_bootstrap.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.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/hp300/hp300/pmap_bootstrap.c
diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.58 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.59
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.58	Sat Sep 21 06:24:43 2013
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c	Fri Dec 23 08:09:54 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.58 2013/09/21 06:24:43 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.59 2016/12/23 08:09:54 maya Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.58 2013/09/21 06:24:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.59 2016/12/23 08:09:54 maya Exp $");
 
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap_bootstr
 extern char *etext;
 extern vaddr_t CLKbase, MMUbase;
 
-extern int maxmem, physmem;
+extern int maxmem;
 extern paddr_t avail_start, avail_end;
 
 /*

Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.52 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.53
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.52	Thu Sep 19 12:04:36 2013
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Fri Dec 23 08:09:54 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.52 2013/09/19 12:04:36 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.53 2016/12/23 08:09:54 maya Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.52 2013/09/19 12:04:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.53 2016/12/23 08:09:54 maya Exp $");
 
 #include "opt_m68k_arch.h"
 
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap_bootstr
 
 extern char *etext;
 
-extern int maxmem, physmem;
+extern int maxmem;
 extern paddr_t avail_start, avail_end;
 extern phys_ram_seg_t mem_clusters[];
 extern int mem_cluster_cnt;