Fri Dec 23 10:48:12 2016 UTC ()
more psize_t physmem fallout. remove conflicting types.


(maya)
diff -r1.40 -r1.41 src/sys/arch/news68k/news68k/pmap_bootstrap.c
diff -r1.43 -r1.44 src/sys/arch/next68k/next68k/pmap_bootstrap.c
cvs diff -r1.40 -r1.41 src/sys/arch/news68k/news68k/pmap_bootstrap.c (expand / switch to unified diff)

--- src/sys/arch/news68k/news68k/pmap_bootstrap.c 2012/02/10 06:28:39 1.40
+++ src/sys/arch/news68k/news68k/pmap_bootstrap.c 2016/12/23 10:48:12 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pmap_bootstrap.c,v 1.40 2012/02/10 06:28:39 mhitch Exp $ */ 1/* $NetBSD: pmap_bootstrap.c,v 1.41 2016/12/23 10:48:12 maya Exp $ */
2 2
3/*  3/*
4 * Copyright (c) 1991, 1993 4 * Copyright (c) 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * the Systems Programming Group of the University of Utah Computer 8 * the Systems Programming Group of the University of Utah Computer
9 * Science Department. 9 * Science Department.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -29,44 +29,44 @@ @@ -29,44 +29,44 @@
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE. 33 * SUCH DAMAGE.
34 * 34 *
35 * @(#)pmap_bootstrap.c 8.1 (Berkeley) 6/10/93 35 * @(#)pmap_bootstrap.c 8.1 (Berkeley) 6/10/93
36 */ 36 */
37/* 37/*
38 * news68k/pmap_bootstrap.c - from hp300 and mvme68k 38 * news68k/pmap_bootstrap.c - from hp300 and mvme68k
39 */ 39 */
40 40
41#include <sys/cdefs.h> 41#include <sys/cdefs.h>
42__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.40 2012/02/10 06:28:39 mhitch Exp $"); 42__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.41 2016/12/23 10:48:12 maya Exp $");
43 43
44#include "opt_m68k_arch.h" 44#include "opt_m68k_arch.h"
45 45
46#include <sys/param.h> 46#include <sys/param.h>
47#include <uvm/uvm_extern.h> 47#include <uvm/uvm_extern.h>
48 48
49#include <machine/cpu.h> 49#include <machine/cpu.h>
50#include <machine/pte.h> 50#include <machine/pte.h>
51#include <machine/vmparam.h> 51#include <machine/vmparam.h>
52 52
53#define RELOC(v, t) *((t*)((uintptr_t)&(v) + firstpa)) 53#define RELOC(v, t) *((t*)((uintptr_t)&(v) + firstpa))
54 54
55extern char *etext; 55extern char *etext;
56extern char *extiobase; 56extern char *extiobase;
57extern char *cache_ctl, *cache_clr; 57extern char *cache_ctl, *cache_clr;
58 58
59extern int maxmem, physmem; 59extern int maxmem;
60extern paddr_t avail_start, avail_end; 60extern paddr_t avail_start, avail_end;
61 61
62/* 62/*
63 * Special purpose kernel virtual addresses, used for mapping 63 * Special purpose kernel virtual addresses, used for mapping
64 * physical pages for a variety of temporary or permanent purposes: 64 * physical pages for a variety of temporary or permanent purposes:
65 * 65 *
66 * CADDR1, CADDR2: pmap zero/copy operations 66 * CADDR1, CADDR2: pmap zero/copy operations
67 * vmmap: /dev/mem, crash dumps, parity error checking 67 * vmmap: /dev/mem, crash dumps, parity error checking
68 * msgbufaddr: kernel message buffer 68 * msgbufaddr: kernel message buffer
69 */ 69 */
70void *CADDR1, *CADDR2; 70void *CADDR1, *CADDR2;
71char *vmmap; 71char *vmmap;
72void *msgbufaddr; 72void *msgbufaddr;
cvs diff -r1.43 -r1.44 src/sys/arch/next68k/next68k/pmap_bootstrap.c (expand / switch to unified diff)

--- src/sys/arch/next68k/next68k/pmap_bootstrap.c 2014/01/05 06:30:48 1.43
+++ src/sys/arch/next68k/next68k/pmap_bootstrap.c 2016/12/23 10:48:12 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pmap_bootstrap.c,v 1.43 2014/01/05 06:30:48 tsutsui Exp $ */ 1/* $NetBSD: pmap_bootstrap.c,v 1.44 2016/12/23 10:48:12 maya Exp $ */
2 2
3/* 3/*
4 * This file was taken from mvme68k/mvme68k/pmap_bootstrap.c 4 * This file was taken from mvme68k/mvme68k/pmap_bootstrap.c
5 * should probably be re-synced when needed. 5 * should probably be re-synced when needed.
6 * cvs id of source for the most recent syncing: 6 * cvs id of source for the most recent syncing:
7 * NetBSD: pmap_bootstrap.c,v 1.15 2000/11/20 19:35:30 scw Exp  7 * NetBSD: pmap_bootstrap.c,v 1.15 2000/11/20 19:35:30 scw Exp
8 * NetBSD: pmap_bootstrap.c,v 1.17 2001/11/08 21:53:44 scw Exp 8 * NetBSD: pmap_bootstrap.c,v 1.17 2001/11/08 21:53:44 scw Exp
9 */ 9 */
10 10
11 11
12/*  12/*
13 * Copyright (c) 1991, 1993 13 * Copyright (c) 1991, 1993
14 * The Regents of the University of California. All rights reserved. 14 * The Regents of the University of California. All rights reserved.
@@ -35,47 +35,47 @@ @@ -35,47 +35,47 @@
35 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 35 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
36 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 36 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
37 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 37 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
38 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 38 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
39 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 39 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
40 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 40 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
41 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 41 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
42 * SUCH DAMAGE. 42 * SUCH DAMAGE.
43 * 43 *
44 * @(#)pmap_bootstrap.c 8.1 (Berkeley) 6/10/93 44 * @(#)pmap_bootstrap.c 8.1 (Berkeley) 6/10/93
45 */ 45 */
46 46
47#include <sys/cdefs.h> 47#include <sys/cdefs.h>
48__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.43 2014/01/05 06:30:48 tsutsui Exp $"); 48__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.44 2016/12/23 10:48:12 maya Exp $");
49 49
50#include "opt_m68k_arch.h" 50#include "opt_m68k_arch.h"
51 51
52#include <sys/param.h> 52#include <sys/param.h>
53#include <sys/kcore.h> 53#include <sys/kcore.h>
54#include <uvm/uvm_extern.h> 54#include <uvm/uvm_extern.h>
55 55
56#include <machine/cpu.h> 56#include <machine/cpu.h>
57#include <machine/pte.h> 57#include <machine/pte.h>
58#include <machine/vmparam.h> 58#include <machine/vmparam.h>
59 59
60#include <next68k/next68k/seglist.h> 60#include <next68k/next68k/seglist.h>
61 61
62#include <next68k/dev/intiovar.h> 62#include <next68k/dev/intiovar.h>
63 63
64#define RELOC(v, t) *((t*)((uintptr_t)&(v) + firstpa)) 64#define RELOC(v, t) *((t*)((uintptr_t)&(v) + firstpa))
65 65
66extern char *etext; 66extern char *etext;
67 67
68extern int maxmem, physmem; 68extern int maxmem;
69extern paddr_t avail_start, avail_end; 69extern paddr_t avail_start, avail_end;
70extern phys_ram_seg_t mem_clusters[]; 70extern phys_ram_seg_t mem_clusters[];
71extern int mem_cluster_cnt; 71extern int mem_cluster_cnt;
72extern paddr_t msgbufpa; 72extern paddr_t msgbufpa;
73 73
74/* 74/*
75 * Special purpose kernel virtual addresses, used for mapping 75 * Special purpose kernel virtual addresses, used for mapping
76 * physical pages for a variety of temporary or permanent purposes: 76 * physical pages for a variety of temporary or permanent purposes:
77 * 77 *
78 * CADDR1, CADDR2: pmap zero/copy operations 78 * CADDR1, CADDR2: pmap zero/copy operations
79 * vmmap: /dev/mem, crash dumps, parity error checking 79 * vmmap: /dev/mem, crash dumps, parity error checking
80 * msgbufaddr: kernel message buffer 80 * msgbufaddr: kernel message buffer
81 */ 81 */