Module Name: src
Committed By: maya
Date: Fri Dec 23 10:48:12 UTC 2016
Modified Files:
src/sys/arch/news68k/news68k: pmap_bootstrap.c
src/sys/arch/next68k/next68k: pmap_bootstrap.c
Log Message:
more psize_t physmem fallout. remove conflicting types.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/news68k/news68k/pmap_bootstrap.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/next68k/next68k/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/news68k/news68k/pmap_bootstrap.c
diff -u src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.40 src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.41
--- src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.40 Fri Feb 10 06:28:39 2012
+++ src/sys/arch/news68k/news68k/pmap_bootstrap.c Fri Dec 23 10:48:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.40 2012/02/10 06:28:39 mhitch Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.41 2016/12/23 10:48:12 maya Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.40 2012/02/10 06:28:39 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.41 2016/12/23 10:48:12 maya Exp $");
#include "opt_m68k_arch.h"
@@ -56,7 +56,7 @@ extern char *etext;
extern char *extiobase;
extern char *cache_ctl, *cache_clr;
-extern int maxmem, physmem;
+extern int maxmem;
extern paddr_t avail_start, avail_end;
/*
Index: src/sys/arch/next68k/next68k/pmap_bootstrap.c
diff -u src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.43 src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.44
--- src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.43 Sun Jan 5 06:30:48 2014
+++ src/sys/arch/next68k/next68k/pmap_bootstrap.c Fri Dec 23 10:48:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.43 2014/01/05 06:30:48 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.44 2016/12/23 10:48:12 maya Exp $ */
/*
* This file was taken from mvme68k/mvme68k/pmap_bootstrap.c
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.43 2014/01/05 06:30:48 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.44 2016/12/23 10:48:12 maya Exp $");
#include "opt_m68k_arch.h"
@@ -65,7 +65,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;