Module Name: src
Committed By: simonb
Date: Mon May 31 14:38:57 UTC 2021
Modified Files:
src/sys/arch/aarch64/include: param.h
src/sys/arch/alpha/include: param.h
src/sys/arch/cats/include: param.h
src/sys/arch/hppa/include: param.h
src/sys/arch/i386/include: param.h
src/sys/arch/ia64/include: param.h
src/sys/arch/m68k/include: param.h
src/sys/arch/macppc/include: param.h
src/sys/arch/mips/include: mips_param.h
src/sys/arch/powerpc/include: param.h
src/sys/arch/powerpc/include/ibm4xx: cpu.h
src/sys/arch/riscv/include: param.h
src/sys/arch/sgimips/include: param.h
src/sys/arch/sh3/include: param.h
src/sys/arch/sparc64/include: param.h
src/sys/arch/sun2/include: param.h
src/sys/arch/sun3/include: param.h
src/sys/arch/vax/include: param.h
src/sys/arch/x68k/include: param.h
Log Message:
Include "opt_param.h" (ifdef _KERNEL_OPT) everywhere that MSGBUFSIZE is
referenced since some sources include <machine/param.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/include/param.h
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/alpha/include/param.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/cats/include/param.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hppa/include/param.h
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/i386/include/param.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/include/param.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/m68k/include/param.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/macppc/include/param.h
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mips/include/mips_param.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/powerpc/include/param.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/include/ibm4xx/cpu.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/param.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sgimips/include/param.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sh3/include/param.h
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sparc64/include/param.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun2/include/param.h
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sun3/include/param.h
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/vax/include/param.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x68k/include/param.h
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/aarch64/include/param.h
diff -u src/sys/arch/aarch64/include/param.h:1.15 src/sys/arch/aarch64/include/param.h:1.16
--- src/sys/arch/aarch64/include/param.h:1.15 Sun Jan 24 12:51:32 2021
+++ src/sys/arch/aarch64/include/param.h Mon May 31 14:38:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.15 2021/01/24 12:51:32 jmcneill Exp $ */
+/* $NetBSD: param.h,v 1.16 2021/05/31 14:38:57 simonb Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
#ifdef _KERNEL_OPT
#include "opt_cputypes.h"
+#include "opt_param.h"
#endif
/*
Index: src/sys/arch/alpha/include/param.h
diff -u src/sys/arch/alpha/include/param.h:1.47 src/sys/arch/alpha/include/param.h:1.48
--- src/sys/arch/alpha/include/param.h:1.47 Sat Oct 10 21:59:03 2020
+++ src/sys/arch/alpha/include/param.h Mon May 31 14:38:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.47 2020/10/10 21:59:03 thorpej Exp $ */
+/* $NetBSD: param.h,v 1.48 2021/05/31 14:38:55 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,6 +38,10 @@
* @(#)param.h 8.1 (Berkeley) 6/10/93
*/
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for the Alpha.
*/
Index: src/sys/arch/cats/include/param.h
diff -u src/sys/arch/cats/include/param.h:1.8 src/sys/arch/cats/include/param.h:1.9
--- src/sys/arch/cats/include/param.h:1.8 Wed Dec 1 06:47:16 2010
+++ src/sys/arch/cats/include/param.h Mon May 31 14:38:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.8 2010/12/01 06:47:16 skrll Exp $ */
+/* $NetBSD: param.h,v 1.9 2021/05/31 14:38:55 simonb Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -35,6 +35,10 @@
#ifndef _CATS_PARAM_H_
#define _CATS_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for ARM6+ processors
*/
Index: src/sys/arch/hppa/include/param.h
diff -u src/sys/arch/hppa/include/param.h:1.28 src/sys/arch/hppa/include/param.h:1.29
--- src/sys/arch/hppa/include/param.h:1.28 Sat May 8 13:10:29 2021
+++ src/sys/arch/hppa/include/param.h Mon May 31 14:38:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.28 2021/05/08 13:10:29 skrll Exp $ */
+/* $NetBSD: param.h,v 1.29 2021/05/31 14:38:55 simonb Exp $ */
/* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */
@@ -27,6 +27,9 @@
#ifdef _KERNEL
#include <machine/cpu.h>
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
#endif
/*
Index: src/sys/arch/i386/include/param.h
diff -u src/sys/arch/i386/include/param.h:1.87 src/sys/arch/i386/include/param.h:1.88
--- src/sys/arch/i386/include/param.h:1.87 Thu Mar 5 15:18:54 2020
+++ src/sys/arch/i386/include/param.h Mon May 31 14:38:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.87 2020/03/05 15:18:54 riastradh Exp $ */
+/* $NetBSD: param.h,v 1.88 2021/05/31 14:38:55 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -37,6 +37,10 @@
#ifndef _I386_PARAM_H_
#define _I386_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for Intel 386.
*/
Index: src/sys/arch/ia64/include/param.h
diff -u src/sys/arch/ia64/include/param.h:1.10 src/sys/arch/ia64/include/param.h:1.11
--- src/sys/arch/ia64/include/param.h:1.10 Mon Jan 7 22:00:31 2019
+++ src/sys/arch/ia64/include/param.h Mon May 31 14:38:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.10 2019/01/07 22:00:31 jdolecek Exp $ */
+/* $NetBSD: param.h,v 1.11 2021/05/31 14:38:55 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -37,6 +37,10 @@
#ifndef _IA64_PARAM_H_
#define _IA64_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for Intel Itanium.
*/
Index: src/sys/arch/m68k/include/param.h
diff -u src/sys/arch/m68k/include/param.h:1.23 src/sys/arch/m68k/include/param.h:1.24
--- src/sys/arch/m68k/include/param.h:1.23 Fri May 1 08:21:27 2020
+++ src/sys/arch/m68k/include/param.h Mon May 31 14:38:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.23 2020/05/01 08:21:27 isaki Exp $ */
+/* $NetBSD: param.h,v 1.24 2021/05/31 14:38:55 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,10 @@
#ifndef _M68K_PARAM_H_
#define _M68K_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine independent constants for m68k
*/
Index: src/sys/arch/macppc/include/param.h
diff -u src/sys/arch/macppc/include/param.h:1.21 src/sys/arch/macppc/include/param.h:1.22
--- src/sys/arch/macppc/include/param.h:1.21 Thu Apr 26 18:33:02 2018
+++ src/sys/arch/macppc/include/param.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.21 2018/04/26 18:33:02 macallan Exp $ */
+/* $NetBSD: param.h,v 1.22 2021/05/31 14:38:56 simonb Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,6 +31,10 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for PowerPC (32-bit only currently)
*/
Index: src/sys/arch/mips/include/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.50 src/sys/arch/mips/include/mips_param.h:1.51
--- src/sys/arch/mips/include/mips_param.h:1.50 Sun May 23 23:24:45 2021
+++ src/sys/arch/mips/include/mips_param.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_param.h,v 1.50 2021/05/23 23:24:45 mrg Exp $ */
+/* $NetBSD: mips_param.h,v 1.51 2021/05/31 14:38:56 simonb Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -25,6 +25,11 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* No reason this can't be common
*/
Index: src/sys/arch/powerpc/include/param.h
diff -u src/sys/arch/powerpc/include/param.h:1.33 src/sys/arch/powerpc/include/param.h:1.34
--- src/sys/arch/powerpc/include/param.h:1.33 Mon Jul 6 09:34:17 2020
+++ src/sys/arch/powerpc/include/param.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.33 2020/07/06 09:34:17 rin Exp $ */
+/* $NetBSD: param.h,v 1.34 2021/05/31 14:38:56 simonb Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -35,6 +35,7 @@
#define _POWERPC_PARAM_H
#ifdef _KERNEL_OPT
+#include "opt_param.h"
#include "opt_ppcarch.h"
#endif
Index: src/sys/arch/powerpc/include/ibm4xx/cpu.h
diff -u src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.25 src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.26
--- src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.25 Tue Mar 30 02:04:44 2021
+++ src/sys/arch/powerpc/include/ibm4xx/cpu.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.25 2021/03/30 02:04:44 rin Exp $ */
+/* $NetBSD: cpu.h,v 1.26 2021/05/31 14:38:56 simonb Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,6 +38,10 @@
#ifndef _IBM4XX_CPU_H_
#define _IBM4XX_CPU_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
#include <powerpc/psl.h>
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
Index: src/sys/arch/riscv/include/param.h
diff -u src/sys/arch/riscv/include/param.h:1.4 src/sys/arch/riscv/include/param.h:1.5
--- src/sys/arch/riscv/include/param.h:1.4 Sat May 1 07:06:54 2021
+++ src/sys/arch/riscv/include/param.h Mon May 31 14:38:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.4 2021/05/01 07:06:54 skrll Exp $ */
+/* $NetBSD: param.h,v 1.5 2021/05/31 14:38:57 simonb Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,6 +32,10 @@
#ifndef _RISCV_PARAM_H_
#define _RISCV_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for all OpenRISC processors
*/
Index: src/sys/arch/sgimips/include/param.h
diff -u src/sys/arch/sgimips/include/param.h:1.17 src/sys/arch/sgimips/include/param.h:1.18
--- src/sys/arch/sgimips/include/param.h:1.17 Mon Jan 7 22:00:32 2019
+++ src/sys/arch/sgimips/include/param.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.17 2019/01/07 22:00:32 jdolecek Exp $ */
+/* $NetBSD: param.h,v 1.18 2021/05/31 14:38:56 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -37,6 +37,10 @@
#ifndef _SGIMIPS_PARAM_H_
#define _SGIMIPS_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
#if !defined(MSGBUFSIZE)
#define MSGBUFSIZE 8192
#endif
Index: src/sys/arch/sh3/include/param.h
diff -u src/sys/arch/sh3/include/param.h:1.25 src/sys/arch/sh3/include/param.h:1.26
--- src/sys/arch/sh3/include/param.h:1.25 Fri May 1 08:21:27 2020
+++ src/sys/arch/sh3/include/param.h Mon May 31 14:38:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.25 2020/05/01 08:21:27 isaki Exp $ */
+/* $NetBSD: param.h,v 1.26 2021/05/31 14:38:55 simonb Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -45,6 +45,9 @@
#if defined(_KERNEL) && !defined(_LOCORE)
#include <machine/cpu.h>
#endif
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
/* NetBSD/sh3 is 4KB page */
#define PGSHIFT 12
Index: src/sys/arch/sparc64/include/param.h
diff -u src/sys/arch/sparc64/include/param.h:1.61 src/sys/arch/sparc64/include/param.h:1.62
--- src/sys/arch/sparc64/include/param.h:1.61 Sat Sep 28 15:11:53 2019
+++ src/sys/arch/sparc64/include/param.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.61 2019/09/28 15:11:53 christos Exp $ */
+/* $NetBSD: param.h,v 1.62 2021/05/31 14:38:56 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -64,6 +64,7 @@
*/
#if defined(_KERNEL_OPT)
+#include "opt_param.h"
#include "opt_sparc_arch.h"
#endif
Index: src/sys/arch/sun2/include/param.h
diff -u src/sys/arch/sun2/include/param.h:1.15 src/sys/arch/sun2/include/param.h:1.16
--- src/sys/arch/sun2/include/param.h:1.15 Sat Aug 11 17:03:26 2012
+++ src/sys/arch/sun2/include/param.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.15 2012/08/11 17:03:26 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.16 2021/05/31 14:38:56 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -40,6 +40,10 @@
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for the Sun2 series.
*/
Index: src/sys/arch/sun3/include/param.h
diff -u src/sys/arch/sun3/include/param.h:1.61 src/sys/arch/sun3/include/param.h:1.62
--- src/sys/arch/sun3/include/param.h:1.61 Sat Aug 11 14:35:33 2012
+++ src/sys/arch/sun3/include/param.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.61 2012/08/11 14:35:33 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.62 2021/05/31 14:38:56 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -40,6 +40,10 @@
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for both the
* Sun3 and Sun3X series.
Index: src/sys/arch/vax/include/param.h
diff -u src/sys/arch/vax/include/param.h:1.63 src/sys/arch/vax/include/param.h:1.64
--- src/sys/arch/vax/include/param.h:1.63 Fri May 1 08:21:27 2020
+++ src/sys/arch/vax/include/param.h Mon May 31 14:38:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.63 2020/05/01 08:21:27 isaki Exp $ */
+/* $NetBSD: param.h,v 1.64 2021/05/31 14:38:56 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -36,6 +36,10 @@
#ifndef _VAX_PARAM_H_
#define _VAX_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for VAX.
*/
Index: src/sys/arch/x68k/include/param.h
diff -u src/sys/arch/x68k/include/param.h:1.29 src/sys/arch/x68k/include/param.h:1.30
--- src/sys/arch/x68k/include/param.h:1.29 Sat Dec 28 11:42:18 2019
+++ src/sys/arch/x68k/include/param.h Mon May 31 14:38:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.29 2019/12/28 11:42:18 isaki Exp $ */
+/* $NetBSD: param.h,v 1.30 2021/05/31 14:38:57 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,10 @@
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
+#ifdef _KERNEL_OPT
+#include "opt_param.h"
+#endif
+
/*
* Machine dependent constants for x68k
*/
