Wed Dec 9 12:21:59 2009 UTC ()
Fix wrong NBSEG values for all hp300 pmap derived m68k ports.
They were incorrect since 1997 on amiga and atari, and since 2002
on other ports, but fortunately they don't look so fatal.

Anyway, these values will be moved into <m68k/pmap_motorola.h> soon
since they are quite pmap implementation dependent.


(tsutsui)
diff -r1.45 -r1.46 src/sys/arch/amiga/include/param.h
diff -r1.31 -r1.32 src/sys/arch/atari/include/param.h
diff -r1.8 -r1.9 src/sys/arch/cesfic/include/param.h
diff -r1.49 -r1.50 src/sys/arch/hp300/include/param.h
diff -r1.8 -r1.9 src/sys/arch/luna68k/include/param.h
diff -r1.41 -r1.42 src/sys/arch/mac68k/include/param.h
diff -r1.29 -r1.30 src/sys/arch/mvme68k/include/param.h
diff -r1.12 -r1.13 src/sys/arch/news68k/include/param.h
diff -r1.8 -r1.9 src/sys/arch/next68k/include/param.h
diff -r1.24 -r1.25 src/sys/arch/x68k/include/param.h
cvs diff -r1.45 -r1.46 src/sys/arch/amiga/include/param.h (expand / switch to unified diff)

--- src/sys/arch/amiga/include/param.h 2008/01/06 18:50:32 1.45
+++ src/sys/arch/amiga/include/param.h 2009/12/09 12:21:58 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.45 2008/01/06 18:50:32 mhitch Exp $ */ 1/* $NetBSD: param.h,v 1.46 2009/12/09 12:21:58 tsutsui Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. 4 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
5 * All rights reserved. 5 * 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
@@ -79,30 +79,30 @@ @@ -79,30 +79,30 @@
79#ifndef _MACHINE_PARAM_H_ 79#ifndef _MACHINE_PARAM_H_
80#define _MACHINE_PARAM_H_ 80#define _MACHINE_PARAM_H_
81 81
82/* 82/*
83 * Machine dependent constants for amiga 83 * Machine dependent constants for amiga
84 */ 84 */
85#define _MACHINE amiga 85#define _MACHINE amiga
86#define MACHINE "amiga" 86#define MACHINE "amiga"
87 87
88#define PGSHIFT 13 /* LOG2(NBPG) */ 88#define PGSHIFT 13 /* LOG2(NBPG) */
89#define KERNBASE 0x00000000 /* start of kernel virtual */ 89#define KERNBASE 0x00000000 /* start of kernel virtual */
90 90
91#define SEGSHIFT 24 /* LOG2(NBSEG) [68030 value] */ 91#define SEGSHIFT 24 /* LOG2(NBSEG) [68030 value] */
92/* bytes/segment */ 92
93/* (256 * (1 << PGSHIFT)) == (1 << SEGSHIFT) */ 93#define NBSEG ((mmutype == MMU_68040) ? \
94#define NBSEG ((mmutype == MMU_68040) \ 94 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
95 ? (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 95 /* bytes/segment */
96#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 96#define SEGOFSET (NBSEG-1) /* byte offset into segment */
97 97
98#define UPAGES 2 /* pages of u-area */ 98#define UPAGES 2 /* pages of u-area */
99 99
100#include <m68k/param.h> 100#include <m68k/param.h>
101 101
102#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 102#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
103 103
104/* 104/*
105 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 105 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
106 * logical pages. 106 * logical pages.
107 */ 107 */
108#define NKMEMPAGES_MIN_DEFAULT ((3 * 1024 * 1024) >> PAGE_SHIFT) 108#define NKMEMPAGES_MIN_DEFAULT ((3 * 1024 * 1024) >> PAGE_SHIFT)
cvs diff -r1.31 -r1.32 src/sys/arch/atari/include/param.h (expand / switch to unified diff)

--- src/sys/arch/atari/include/param.h 2008/01/03 01:02:04 1.31
+++ src/sys/arch/atari/include/param.h 2009/12/09 12:21:58 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.31 2008/01/03 01:02:04 joerg Exp $ */ 1/* $NetBSD: param.h,v 1.32 2009/12/09 12:21:58 tsutsui Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. 4 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
5 * All rights reserved. 5 * 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
@@ -79,30 +79,30 @@ @@ -79,30 +79,30 @@
79#ifndef _MACHINE_PARAM_H_ 79#ifndef _MACHINE_PARAM_H_
80#define _MACHINE_PARAM_H_ 80#define _MACHINE_PARAM_H_
81 81
82/* 82/*
83 * Machine dependent constants for atari 83 * Machine dependent constants for atari
84 */ 84 */
85#define _MACHINE atari 85#define _MACHINE atari
86#define MACHINE "atari" 86#define MACHINE "atari"
87 87
88#define PGSHIFT 13 /* LOG2(NBPG) */ 88#define PGSHIFT 13 /* LOG2(NBPG) */
89#define KERNBASE 0x00000000 /* start of kernel virtual */ 89#define KERNBASE 0x00000000 /* start of kernel virtual */
90 90
91#define SEGSHIFT 24 /* LOG2(NBSEG) [68030 value] */ 91#define SEGSHIFT 24 /* LOG2(NBSEG) [68030 value] */
92/* bytes/segment */ 92
93/* (256 * (1 << PGSHIFT)) == (1 << SEGSHIFT) */ 
94#define NBSEG ((mmutype == MMU_68040) \ 93#define NBSEG ((mmutype == MMU_68040) \
95 ? (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 94 ? (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
 95 /* bytes/segment */
96#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 96#define SEGOFSET (NBSEG-1) /* byte offset into segment */
97 97
98#define UPAGES 2 /* pages of u-area */ 98#define UPAGES 2 /* pages of u-area */
99 99
100#include <m68k/param.h> 100#include <m68k/param.h>
101 101
102#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 102#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
103 103
104/* 104/*
105 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 105 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
106 * logical pages. 106 * logical pages.
107 */ 107 */
108#define NKMEMPAGES_MIN_DEFAULT ((3 * 1024 * 1024) >> PAGE_SHIFT) 108#define NKMEMPAGES_MIN_DEFAULT ((3 * 1024 * 1024) >> PAGE_SHIFT)
cvs diff -r1.8 -r1.9 src/sys/arch/cesfic/include/param.h (expand / switch to unified diff)

--- src/sys/arch/cesfic/include/param.h 2009/03/14 14:45:58 1.8
+++ src/sys/arch/cesfic/include/param.h 2009/12/09 12:21:58 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.8 2009/03/14 14:45:58 dsl Exp $ */ 1/* $NetBSD: param.h,v 1.9 2009/12/09 12:21:58 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
@@ -91,30 +91,30 @@ @@ -91,30 +91,30 @@
91 * is valid to fetch data elements of type t from on this architecture. 91 * is valid to fetch data elements of type t from on this architecture.
92 * This does not reflect the optimal alignment, just the possibility 92 * This does not reflect the optimal alignment, just the possibility
93 * (within reasonable limits).  93 * (within reasonable limits).
94 * 94 *
95 */ 95 */
96 96
97#define PGSHIFT 12 /* LOG2(NBPG) */ 97#define PGSHIFT 12 /* LOG2(NBPG) */
98#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 98#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
99 99
100#define SEGSHIFT 22 /* LOG2(NBSEG) */ 100#define SEGSHIFT 22 /* LOG2(NBSEG) */
101#if defined(M68030) && !defined(M68040) && !defined(M68060) 101#if defined(M68030) && !defined(M68040) && !defined(M68060)
102#define NBSEG (1 << SEGSHIFT) /* bytes/segment */ 102#define NBSEG (1 << SEGSHIFT) /* bytes/segment */
103#elif (defined(M68040) || defined(M68060)) && !defined(M68030) 103#elif (defined(M68040) || defined(M68060)) && !defined(M68030)
104#define NBSEG (32 * (1 << PGSHIFT)) 104#define NBSEG (1 << 18 /* SG4_SHIFT2 */)
105#else 105#else
106#define NBSEG ((mmutype == MMU_68040) ? \ 106#define NBSEG ((mmutype == MMU_68040) ? \
107 (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 107 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
108#endif 108#endif
109#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 109#define SEGOFSET (NBSEG-1) /* byte offset into segment */
110 110
111#define KERNBASE 0x00002000 /* start of kernel virtual */ 111#define KERNBASE 0x00002000 /* start of kernel virtual */
112 112
113#define UPAGES 2 /* pages of u-area */ 113#define UPAGES 2 /* pages of u-area */
114 114
115#include <m68k/param.h> 115#include <m68k/param.h>
116 116
117/* 117/*
118 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 118 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
119 * logical pages. 119 * logical pages.
120 */ 120 */
cvs diff -r1.49 -r1.50 src/sys/arch/hp300/include/param.h (expand / switch to unified diff)

--- src/sys/arch/hp300/include/param.h 2007/12/31 13:38:50 1.49
+++ src/sys/arch/hp300/include/param.h 2009/12/09 12:21:58 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.49 2007/12/31 13:38:50 ad Exp $ */ 1/* $NetBSD: param.h,v 1.50 2009/12/09 12:21:58 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
@@ -82,30 +82,30 @@ @@ -82,30 +82,30 @@
82/* 82/*
83 * Machine dependent constants for HP9000 series 300. 83 * Machine dependent constants for HP9000 series 300.
84 */ 84 */
85#define _MACHINE hp300 85#define _MACHINE hp300
86#define MACHINE "hp300" 86#define MACHINE "hp300"
87 87
88#define PGSHIFT 12 /* LOG2(NBPG) */ 88#define PGSHIFT 12 /* LOG2(NBPG) */
89#define KERNBASE 0x00000000 /* start of kernel virtual */ 89#define KERNBASE 0x00000000 /* start of kernel virtual */
90 90
91#define SEGSHIFT 22 /* LOG2(NBSEG) */ 91#define SEGSHIFT 22 /* LOG2(NBSEG) */
92#if defined(M68030) && !defined(M68040) && !defined(M68060) 92#if defined(M68030) && !defined(M68040) && !defined(M68060)
93#define NBSEG (1 << SEGSHIFT) /* bytes/segment */ 93#define NBSEG (1 << SEGSHIFT) /* bytes/segment */
94#elif (defined(M68040) || defined(M68060)) && !defined(M68030) 94#elif (defined(M68040) || defined(M68060)) && !defined(M68030)
95#define NBSEG (32 * (1 << PGSHIFT)) 95#define NBSEG (1 << 18 /* SG4_SHIFT2 */)
96#else 96#else
97#define NBSEG ((mmutype == MMU_68040) ? \ 97#define NBSEG ((mmutype == MMU_68040) ? \
98 (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 98 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
99#endif 99#endif
100#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 100#define SEGOFSET (NBSEG-1) /* byte offset into segment */
101 101
102#define UPAGES 2 /* pages of u-area */ 102#define UPAGES 2 /* pages of u-area */
103 103
104#include <m68k/param.h> 104#include <m68k/param.h>
105 105
106#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 106#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
107 107
108/* 108/*
109 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 109 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
110 * logical pages. 110 * logical pages.
111 */ 111 */
cvs diff -r1.8 -r1.9 src/sys/arch/luna68k/include/param.h (expand / switch to unified diff)

--- src/sys/arch/luna68k/include/param.h 2009/03/14 14:46:01 1.8
+++ src/sys/arch/luna68k/include/param.h 2009/12/09 12:21:58 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.8 2009/03/14 14:46:01 dsl Exp $ */ 1/* $NetBSD: param.h,v 1.9 2009/12/09 12:21:58 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
@@ -79,30 +79,30 @@ @@ -79,30 +79,30 @@
79#ifndef _MACHINE_PARAM_H_ 79#ifndef _MACHINE_PARAM_H_
80#define _MACHINE_PARAM_H_ 80#define _MACHINE_PARAM_H_
81 81
82#define _MACHINE luna68k 82#define _MACHINE luna68k
83#define MACHINE "luna68k" 83#define MACHINE "luna68k"
84 84
85#define PGSHIFT 12 /* LOG2(NBPG) */ 85#define PGSHIFT 12 /* LOG2(NBPG) */
86#define KERNBASE 0x00000000 /* start of kernel virtual */ 86#define KERNBASE 0x00000000 /* start of kernel virtual */
87 87
88#define SEGSHIFT 22 /* LOG2(NBSEG) */ 88#define SEGSHIFT 22 /* LOG2(NBSEG) */
89#if defined(M68030) && !defined(M68040) && !defined(M68060) 89#if defined(M68030) && !defined(M68040) && !defined(M68060)
90#define NBSEG (1 << SEGSHIFT) /* bytes/segment */ 90#define NBSEG (1 << SEGSHIFT) /* bytes/segment */
91#elif (defined(M68040) || defined(M68060)) && !defined(M68030) 91#elif (defined(M68040) || defined(M68060)) && !defined(M68030)
92#define NBSEG (32 * (1 << PGSHIFT)) 92#define NBSEG (1 << 18 /* SG4_SHIFT2 */)
93#else 93#else
94#define NBSEG ((mmutype == MMU_68040) ? \ 94#define NBSEG ((mmutype == MMU_68040) ? \
95 (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 95 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
96#endif 96#endif
97#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 97#define SEGOFSET (NBSEG-1) /* byte offset into segment */
98 98
99#define UPAGES 2 /* pages of u-area */ 99#define UPAGES 2 /* pages of u-area */
100 100
101#include <m68k/param.h> 101#include <m68k/param.h>
102 102
103#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 103#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
104 104
105#ifndef MSGBUFSIZE 105#ifndef MSGBUFSIZE
106#define MSGBUFSIZE NBPG /* default message buffer size */ 106#define MSGBUFSIZE NBPG /* default message buffer size */
107#endif 107#endif
108 108
cvs diff -r1.41 -r1.42 src/sys/arch/mac68k/include/param.h (expand / switch to unified diff)

--- src/sys/arch/mac68k/include/param.h 2005/12/11 12:18:03 1.41
+++ src/sys/arch/mac68k/include/param.h 2009/12/09 12:21:58 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.41 2005/12/11 12:18:03 christos Exp $ */ 1/* $NetBSD: param.h,v 1.42 2009/12/09 12:21:58 tsutsui Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1982, 1990 The Regents of the University of California. 4 * Copyright (c) 1982, 1990 The Regents of the University of California.
5 * All rights reserved. 5 * 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
@@ -117,30 +117,30 @@ @@ -117,30 +117,30 @@
117 117
118/* 118/*
119 * Get interrupt glue. 119 * Get interrupt glue.
120 */ 120 */
121#include <machine/intr.h> 121#include <machine/intr.h>
122 122
123#define PGSHIFT 12 /* LOG2(NBPG) */ 123#define PGSHIFT 12 /* LOG2(NBPG) */
124#define KERNBASE 0x00000000 /* start of kernel virtual */ 124#define KERNBASE 0x00000000 /* start of kernel virtual */
125 125
126#define SEGSHIFT 22 /* LOG2(NBSEG) */ 126#define SEGSHIFT 22 /* LOG2(NBSEG) */
127#if defined(M68030) && !defined(M68040) && !defined(M68060) 127#if defined(M68030) && !defined(M68040) && !defined(M68060)
128#define NBSEG (1 << SEGSHIFT) /* bytes/segment */ 128#define NBSEG (1 << SEGSHIFT) /* bytes/segment */
129#elif (defined(M68040) || defined(M68060)) && !defined(M68030) 129#elif (defined(M68040) || defined(M68060)) && !defined(M68030)
130#define NBSEG (32 * (1 << PGSHIFT)) 130#define NBSEG (1 << 18 /* SG4_SHIFT2 */)
131#else 131#else
132#define NBSEG ((mmutype == MMU_68040) ? \ 132#define NBSEG ((mmutype == MMU_68040) ? \
133 (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 133 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
134#endif 134#endif
135#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 135#define SEGOFSET (NBSEG-1) /* byte offset into segment */
136 136
137#define UPAGES 3 /* pages of u-area */ 137#define UPAGES 3 /* pages of u-area */
138 138
139#include <m68k/param.h> 139#include <m68k/param.h>
140 140
141#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 141#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
142 142
143/* 143/*
144 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 144 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
145 * logical pages. 145 * logical pages.
146 */ 146 */
cvs diff -r1.29 -r1.30 src/sys/arch/mvme68k/include/param.h (expand / switch to unified diff)

--- src/sys/arch/mvme68k/include/param.h 2008/01/12 09:54:28 1.29
+++ src/sys/arch/mvme68k/include/param.h 2009/12/09 12:21:58 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.29 2008/01/12 09:54:28 tsutsui Exp $ */ 1/* $NetBSD: param.h,v 1.30 2009/12/09 12:21:58 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
@@ -89,30 +89,30 @@ @@ -89,30 +89,30 @@
89/* 89/*
90 * Grab the interrupt definitions 90 * Grab the interrupt definitions
91 */ 91 */
92#include <machine/intr.h> 92#include <machine/intr.h>
93#endif /* _KERNEL */ 93#endif /* _KERNEL */
94 94
95#define PGSHIFT 12 /* LOG2(NBPG) */ 95#define PGSHIFT 12 /* LOG2(NBPG) */
96#define KERNBASE 0x00000000 /* start of kernel virtual */ 96#define KERNBASE 0x00000000 /* start of kernel virtual */
97 97
98#define SEGSHIFT 22 /* LOG2(NBSEG) */ 98#define SEGSHIFT 22 /* LOG2(NBSEG) */
99#if defined(M68030) && !defined(M68040) && !defined(M68060) 99#if defined(M68030) && !defined(M68040) && !defined(M68060)
100#define NBSEG (1 << SEGSHIFT) /* bytes/segment */ 100#define NBSEG (1 << SEGSHIFT) /* bytes/segment */
101#elif (defined(M68040) || defined(M68060)) && !defined(M68030) 101#elif (defined(M68040) || defined(M68060)) && !defined(M68030)
102#define NBSEG (32 * (1 << PGSHIFT)) 102#define NBSEG (1 << 18 /* SG4_SHIFT2 */)
103#else 103#else
104#define NBSEG ((mmutype == MMU_68040) ? \ 104#define NBSEG ((mmutype == MMU_68040) ? \
105 (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 105 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
106#endif 106#endif
107#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 107#define SEGOFSET (NBSEG-1) /* byte offset into segment */
108 108
109#define UPAGES 2 /* pages of u-area */ 109#define UPAGES 2 /* pages of u-area */
110 110
111#include <m68k/param.h> 111#include <m68k/param.h>
112 112
113#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 113#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
114 114
115/* 115/*
116 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 116 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
117 * logical pages. 117 * logical pages.
118 */ 118 */
cvs diff -r1.12 -r1.13 src/sys/arch/news68k/include/param.h (expand / switch to unified diff)

--- src/sys/arch/news68k/include/param.h 2007/12/31 13:38:52 1.12
+++ src/sys/arch/news68k/include/param.h 2009/12/09 12:21:58 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.12 2007/12/31 13:38:52 ad Exp $ */ 1/* $NetBSD: param.h,v 1.13 2009/12/09 12:21:58 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
@@ -80,33 +80,34 @@ @@ -80,33 +80,34 @@
80#define _NEWS68K_PARAM_H_ 80#define _NEWS68K_PARAM_H_
81 81
82/* 82/*
83 * Machine dependent constants for m68k NEWS. 83 * Machine dependent constants for m68k NEWS.
84 */ 84 */
85#define _MACHINE news68k 85#define _MACHINE news68k
86#define MACHINE "news68k" 86#define MACHINE "news68k"
87 87
88 88
89#define PGSHIFT 12 /* LOG2(NBPG) */ 89#define PGSHIFT 12 /* LOG2(NBPG) */
90#define KERNBASE 0x00000000 /* start of kernel virtual */ 90#define KERNBASE 0x00000000 /* start of kernel virtual */
91 91
92#define SEGSHIFT 22 /* LOG2(NBSEG) */ 92#define SEGSHIFT 22 /* LOG2(NBSEG) */
 93
93#if defined(M68030) && !defined(M68040) && !defined(M68060) 94#if defined(M68030) && !defined(M68040) && !defined(M68060)
94#define NBSEG (1 << SEGSHIFT) /* bytes/segment */ 95#define NBSEG (1 << SEGSHIFT) /* bytes/segment */
95#elif (defined(M68040) || defined(M68060)) && !defined(M68030) 96#elif (defined(M68040) || defined(M68060)) && !defined(M68030)
96#define NBSEG (32 * (1 << PGSHIFT)) 97#define NBSEG (1 << 18 /* SG4_SHIFT2 */)
97#else 98#else
98#define NBSEG ((mmutype == MMU_68040) ? \ 99#define NBSEG ((mmutype == MMU_68040) ? \
99 (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 100 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
100#endif 101#endif
101#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 102#define SEGOFSET (NBSEG-1) /* byte offset into segment */
102 103
103#define UPAGES 2 /* pages of u-area */ 104#define UPAGES 2 /* pages of u-area */
104 105
105#include <m68k/param.h> 106#include <m68k/param.h>
106 107
107#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 108#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
108 109
109/* 110/*
110 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized 111 * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
111 * logical pages. 112 * logical pages.
112 */ 113 */
cvs diff -r1.8 -r1.9 src/sys/arch/next68k/include/param.h (expand / switch to unified diff)

--- src/sys/arch/next68k/include/param.h 2005/12/11 12:18:25 1.8
+++ src/sys/arch/next68k/include/param.h 2009/12/09 12:21:59 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.8 2005/12/11 12:18:25 christos Exp $ */ 1/* $NetBSD: param.h,v 1.9 2009/12/09 12:21:59 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
@@ -82,30 +82,30 @@ @@ -82,30 +82,30 @@
82/* 82/*
83 * Machine dependent constants for NeXT machines 83 * Machine dependent constants for NeXT machines
84 */ 84 */
85#define _MACHINE next68k 85#define _MACHINE next68k
86#define MACHINE "next68k" 86#define MACHINE "next68k"
87 87
88#define PGSHIFT 12 /* LOG2(NBPG) */ 88#define PGSHIFT 12 /* LOG2(NBPG) */
89#define KERNBASE 0x00000000 /* start of kernel virtual */ 89#define KERNBASE 0x00000000 /* start of kernel virtual */
90 90
91#define SEGSHIFT 22 /* LOG2(NBSEG) */ 91#define SEGSHIFT 22 /* LOG2(NBSEG) */
92#if defined(M68030) && !defined(M68040) && !defined(M68060) 92#if defined(M68030) && !defined(M68040) && !defined(M68060)
93#define NBSEG (1 << SEGSHIFT) /* bytes/segment */ 93#define NBSEG (1 << SEGSHIFT) /* bytes/segment */
94#elif (defined(M68040) || defined(M68060)) && !defined(M68030) 94#elif (defined(M68040) || defined(M68060)) && !defined(M68030)
95#define NBSEG (32 * (1 << PGSHIFT)) 95#define NBSEG (1 << 18 /* SG4_SHIFT2 */)
96#else 96#else
97#define NBSEG ((mmutype == MMU_68040) ? \ 97#define NBSEG ((mmutype == MMU_68040) ? \
98 (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 98 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
99#endif 99#endif
100#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 100#define SEGOFSET (NBSEG-1) /* byte offset into segment */
101 101
102#define UPAGES 3 /* pages of u-area */ 102#define UPAGES 3 /* pages of u-area */
103 103
104#include <m68k/param.h> 104#include <m68k/param.h>
105 105
106#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 106#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
107 107
108#ifdef _KERNEL 108#ifdef _KERNEL
109#include <machine/intr.h> 109#include <machine/intr.h>
110 110
111/* 111/*
cvs diff -r1.24 -r1.25 src/sys/arch/x68k/include/param.h (expand / switch to unified diff)

--- src/sys/arch/x68k/include/param.h 2007/12/31 13:38:53 1.24
+++ src/sys/arch/x68k/include/param.h 2009/12/09 12:21:59 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.24 2007/12/31 13:38:53 ad Exp $ */ 1/* $NetBSD: param.h,v 1.25 2009/12/09 12:21:59 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
@@ -82,30 +82,30 @@ @@ -82,30 +82,30 @@
82/* 82/*
83 * Machine dependent constants for x68k 83 * Machine dependent constants for x68k
84 */ 84 */
85#define _MACHINE x68k 85#define _MACHINE x68k
86#define MACHINE "x68k" 86#define MACHINE "x68k"
87 87
88#define PGSHIFT 12 /* LOG2(NBPG) */ 88#define PGSHIFT 12 /* LOG2(NBPG) */
89#define KERNBASE 0x00000000 /* start of kernel virtual */ 89#define KERNBASE 0x00000000 /* start of kernel virtual */
90 90
91#define SEGSHIFT 22 /* LOG2(NBSEG) */ 91#define SEGSHIFT 22 /* LOG2(NBSEG) */
92#if defined(M68030) && !defined(M68040) && !defined(M68060) 92#if defined(M68030) && !defined(M68040) && !defined(M68060)
93#define NBSEG (1 << SEGSHIFT) /* bytes/segment */ 93#define NBSEG (1 << SEGSHIFT) /* bytes/segment */
94#elif (defined(M68040) || defined(M68060)) && !defined(M68030) 94#elif (defined(M68040) || defined(M68060)) && !defined(M68030)
95#define NBSEG (32 * (1 << PGSHIFT)) 95#define NBSEG (1 << 18 /* SG4_SHIFT2 */)
96#else 96#else
97#define NBSEG ((mmutype == MMU_68040) ? \ 97#define NBSEG ((mmutype == MMU_68040) ? \
98 (32 * (1 << PGSHIFT)) : (256 * (1 << PGSHIFT))) 98 (1 << 18 /* SG4_SHIFT2 */) : (1 << SEGSHIFT))
99#endif 99#endif
100#define SEGOFSET (NBSEG-1) /* byte offset into segment */ 100#define SEGOFSET (NBSEG-1) /* byte offset into segment */
101 101
102#define UPAGES 2 /* pages of u-area */ 102#define UPAGES 2 /* pages of u-area */
103 103
104#include <m68k/param.h> 104#include <m68k/param.h>
105 105
106#define NPTEPG (NBPG/(sizeof (pt_entry_t))) 106#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
107 107
108#ifndef MSGBUFSIZE 108#ifndef MSGBUFSIZE
109#define MSGBUFSIZE NBPG /* default message buffer size */ 109#define MSGBUFSIZE NBPG /* default message buffer size */
110#endif 110#endif
111 111