Mon Jul 19 10:28:58 2021 UTC ()
Remove definitions for CACHE_LINE_SIZE and COHERENCY_UNIT which are the same
as the default.


(christos)
diff -r1.49 -r1.50 src/sys/arch/alpha/include/param.h
diff -r1.23 -r1.24 src/sys/arch/arm/include/param.h
diff -r1.5 -r1.6 src/sys/arch/riscv/include/param.h
cvs diff -r1.49 -r1.50 src/sys/arch/alpha/include/param.h (expand / switch to unified diff)

--- src/sys/arch/alpha/include/param.h 2021/07/06 12:20:52 1.49
+++ src/sys/arch/alpha/include/param.h 2021/07/19 10:28:58 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.49 2021/07/06 12:20:52 thorpej Exp $ */ 1/* $NetBSD: param.h,v 1.50 2021/07/19 10:28:58 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988 University of Utah. 4 * Copyright (c) 1988 University of Utah.
5 * Copyright (c) 1992, 1993 5 * Copyright (c) 1992, 1993
6 * The Regents of the University of California. All rights reserved. 6 * The Regents of the University of California. All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to Berkeley by 8 * This code is derived from software contributed to Berkeley by
9 * the Systems Programming Group of the University of Utah Computer 9 * the Systems Programming Group of the University of Utah Computer
10 * Science Department and Ralph Campbell. 10 * Science Department and Ralph Campbell.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -74,28 +74,26 @@ @@ -74,28 +74,26 @@
74#define SINCR 1 /* increment of stack/NBPG */ 74#define SINCR 1 /* increment of stack/NBPG */
75 75
76#define UPAGES 2 /* pages of u-area */ 76#define UPAGES 2 /* pages of u-area */
77#define USPACE (UPAGES * NBPG) /* total size of u-area */ 77#define USPACE (UPAGES * NBPG) /* total size of u-area */
78 78
79#ifndef MSGBUFSIZE 79#ifndef MSGBUFSIZE
80#define MSGBUFSIZE NBPG /* default message buffer size */ 80#define MSGBUFSIZE NBPG /* default message buffer size */
81#endif 81#endif
82 82
83/* 83/*
84 * EV4 (21064) and EV5 (21164) have a 32-byte cache line size. 84 * EV4 (21064) and EV5 (21164) have a 32-byte cache line size.
85 * EV6 (21264) and EV7 (21364) have a 64-byte cache line size. 85 * EV6 (21264) and EV7 (21364) have a 64-byte cache line size.
86 */ 86 */
87#define COHERENCY_UNIT 64 
88#define CACHE_LINE_SIZE 64 
89 87
90/* 88/*
91 * Constants related to network buffer management. 89 * Constants related to network buffer management.
92 * MCLBYTES must be no larger than NBPG (the software page size), and, 90 * MCLBYTES must be no larger than NBPG (the software page size), and,
93 * on machines that exchange pages of input or output buffers with mbuf 91 * on machines that exchange pages of input or output buffers with mbuf
94 * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple 92 * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
95 * of the hardware page size. 93 * of the hardware page size.
96 */ 94 */
97#define MSIZE 256 /* size of an mbuf */ 95#define MSIZE 256 /* size of an mbuf */
98 96
99#ifndef MCLSHIFT 97#ifndef MCLSHIFT
100#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ 98#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
101 /* 2K cluster can hold Ether frame */ 99 /* 2K cluster can hold Ether frame */
cvs diff -r1.23 -r1.24 src/sys/arch/arm/include/param.h (expand / switch to unified diff)

--- src/sys/arch/arm/include/param.h 2020/08/16 09:37:30 1.23
+++ src/sys/arch/arm/include/param.h 2021/07/19 10:28:58 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.23 2020/08/16 09:37:30 skrll Exp $ */ 1/* $NetBSD: param.h,v 1.24 2021/07/19 10:28:58 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1994,1995 Mark Brinicombe. 4 * Copyright (c) 1994,1995 Mark Brinicombe.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -176,17 +176,14 @@ @@ -176,17 +176,14 @@
176#ifndef NMBCLUSTERS_MAX 176#ifndef NMBCLUSTERS_MAX
177#define NMBCLUSTERS_MAX (0x4000000 / MCLBYTES) /* Limit to 64MB for clusters */ 177#define NMBCLUSTERS_MAX (0x4000000 / MCLBYTES) /* Limit to 64MB for clusters */
178#endif 178#endif
179 179
180/* 180/*
181 * Compatibility /dev/zero mapping. 181 * Compatibility /dev/zero mapping.
182 */ 182 */
183#ifdef _KERNEL 183#ifdef _KERNEL
184#ifdef COMPAT_16 184#ifdef COMPAT_16
185#define COMPAT_ZERODEV(x) (x == makedev(0, _DEV_ZERO_oARM)) 185#define COMPAT_ZERODEV(x) (x == makedev(0, _DEV_ZERO_oARM))
186#endif 186#endif
187#endif /* _KERNEL */ 187#endif /* _KERNEL */
188 188
189#define COHERENCY_UNIT 64 
190#define CACHE_LINE_SIZE 64 
191 
192#endif /* _ARM_PARAM_H_ */ 189#endif /* _ARM_PARAM_H_ */
cvs diff -r1.5 -r1.6 src/sys/arch/riscv/include/param.h (expand / switch to unified diff)

--- src/sys/arch/riscv/include/param.h 2021/05/31 14:38:57 1.5
+++ src/sys/arch/riscv/include/param.h 2021/07/19 10:28:58 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.5 2021/05/31 14:38:57 simonb Exp $ */ 1/* $NetBSD: param.h,v 1.6 2021/07/19 10:28:58 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2014 The NetBSD Foundation, Inc. 4 * Copyright (c) 2014 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Matt Thomas of 3am Software Foundry. 8 * by Matt Thomas of 3am Software Foundry.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -86,24 +86,21 @@ @@ -86,24 +86,21 @@
86#define MSIZE 512 /* size of an mbuf */ 86#define MSIZE 512 /* size of an mbuf */
87 87
88#ifndef MCLSHIFT 88#ifndef MCLSHIFT
89#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ 89#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
90 /* 2K cluster can hold Ether frame */ 90 /* 2K cluster can hold Ether frame */
91#endif /* MCLSHIFT */ 91#endif /* MCLSHIFT */
92 92
93#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ 93#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
94 94
95#ifndef MSGBUFSIZE 95#ifndef MSGBUFSIZE
96#define MSGBUFSIZE 65536 /* default message buffer size */ 96#define MSGBUFSIZE 65536 /* default message buffer size */
97#endif 97#endif
98 98
99#define COHERENCY_UNIT 64 
100#define CACHE_LINE_SIZE 64 
101 
102#define MAXCPUS 32 99#define MAXCPUS 32
103 100
104#ifdef _KERNEL 101#ifdef _KERNEL
105void delay(unsigned long); 102void delay(unsigned long);
106#define DELAY(x) delay(x) 103#define DELAY(x) delay(x)
107#endif 104#endif
108 105
109#endif /* _RISCV_PARAM_H_ */ 106#endif /* _RISCV_PARAM_H_ */