Fri Dec 11 18:57:44 2009 UTC ()
Define SYSMAP_VA in <m68k/pmap_motorola.h>
where the Sysmap pointer is declared.


(tsutsui)
diff -r1.14 -r1.15 src/sys/arch/luna68k/include/vmparam.h
diff -r1.26 -r1.27 src/sys/arch/m68k/include/pmap_motorola.h
cvs diff -r1.14 -r1.15 src/sys/arch/luna68k/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/luna68k/include/vmparam.h 2009/12/08 13:47:27 1.14
+++ src/sys/arch/luna68k/include/vmparam.h 2009/12/11 18:57:44 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: vmparam.h,v 1.14 2009/12/08 13:47:27 tsutsui Exp $ */ 1/* $NetBSD: vmparam.h,v 1.15 2009/12/11 18:57:44 tsutsui Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1982, 1986, 1990, 1993 4 * Copyright (c) 1982, 1986, 1990, 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
@@ -126,27 +126,26 @@ @@ -126,27 +126,26 @@
126#define USRIOSIZE (1 * NPTEPG) /* 4mb */ 126#define USRIOSIZE (1 * NPTEPG) /* 4mb */
127#endif 127#endif
128 128
129/*  129/*
130 * Mach derived constants  130 * Mach derived constants
131 */ 131 */
132 132
133/* user/kernel map constants */ 133/* user/kernel map constants */
134#define VM_MIN_ADDRESS ((vaddr_t)0) 134#define VM_MIN_ADDRESS ((vaddr_t)0)
135#define VM_MAXUSER_ADDRESS ((vaddr_t)0xFFFC0000) 135#define VM_MAXUSER_ADDRESS ((vaddr_t)0xFFFC0000)
136#define VM_MAX_ADDRESS ((vaddr_t)0xFFFC0000) 136#define VM_MAX_ADDRESS ((vaddr_t)0xFFFC0000)
137#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0) 137#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0)
138#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)(0x40000000-PAGE_SIZE*NPTEPG)) 138#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)(0x40000000-PAGE_SIZE*NPTEPG))
139#define SYSMAP_VA (VM_MAX_KERNEL_ADDRESS) 
140 139
141/* virtual sizes (bytes) for various kernel submaps */ 140/* virtual sizes (bytes) for various kernel submaps */
142#define VM_MBUF_SIZE (NMBCLUSTERS*MCLBYTES) 141#define VM_MBUF_SIZE (NMBCLUSTERS*MCLBYTES)
143#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE) 142#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
144 143
145/* # of kernel PT pages (initial only, can grow dynamically) */ 144/* # of kernel PT pages (initial only, can grow dynamically) */
146#define VM_KERNEL_PT_PAGES ((vsize_t)2) /* XXX: SYSPTSIZE */ 145#define VM_KERNEL_PT_PAGES ((vsize_t)2) /* XXX: SYSPTSIZE */
147 146
148/* 147/*
149 * Constants which control the way the VM system deals with memory segments. 148 * Constants which control the way the VM system deals with memory segments.
150 * Only one physical contigous memory segment. 149 * Only one physical contigous memory segment.
151 */ 150 */
152#define VM_PHYSSEG_MAX 1 151#define VM_PHYSSEG_MAX 1
cvs diff -r1.26 -r1.27 src/sys/arch/m68k/include/pmap_motorola.h (expand / switch to unified diff)

--- src/sys/arch/m68k/include/pmap_motorola.h 2009/12/11 17:53:22 1.26
+++ src/sys/arch/m68k/include/pmap_motorola.h 2009/12/11 18:57:44 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pmap_motorola.h,v 1.26 2009/12/11 17:53:22 tsutsui Exp $ */ 1/* $NetBSD: pmap_motorola.h,v 1.27 2009/12/11 18:57:44 tsutsui 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
@@ -222,26 +222,27 @@ extern struct pv_header *pv_table; /* ar @@ -222,26 +222,27 @@ extern struct pv_header *pv_table; /* ar
222#define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count) 222#define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count)
223 223
224#define pmap_update(pmap) /* nothing (yet) */ 224#define pmap_update(pmap) /* nothing (yet) */
225 225
226static __inline void 226static __inline void
227pmap_remove_all(struct pmap *pmap) 227pmap_remove_all(struct pmap *pmap)
228{ 228{
229 /* Nothing. */ 229 /* Nothing. */
230} 230}
231 231
232extern paddr_t Sysseg_pa; 232extern paddr_t Sysseg_pa;
233extern st_entry_t *Sysseg; 233extern st_entry_t *Sysseg;
234extern pt_entry_t *Sysmap, *Sysptmap; 234extern pt_entry_t *Sysmap, *Sysptmap;
 235#define SYSMAP_VA VM_MAX_KERNEL_ADDRESS
235extern vsize_t Sysptsize; 236extern vsize_t Sysptsize;
236extern vsize_t mem_size; 237extern vsize_t mem_size;
237extern vaddr_t virtual_avail, virtual_end; 238extern vaddr_t virtual_avail, virtual_end;
238extern u_int protection_codes[]; 239extern u_int protection_codes[];
239#if defined(M68040) || defined(M68060) 240#if defined(M68040) || defined(M68060)
240extern u_int protostfree; 241extern u_int protostfree;
241#endif 242#endif
242 243
243extern char *vmmap; /* map for mem, dumps, etc. */ 244extern char *vmmap; /* map for mem, dumps, etc. */
244extern void *CADDR1, *CADDR2; 245extern void *CADDR1, *CADDR2;
245extern void *msgbufaddr; 246extern void *msgbufaddr;
246 247
247/* for lwp0 uarea initialization after MMU enabled */ 248/* for lwp0 uarea initialization after MMU enabled */