Module Name: src
Committed By: cliff
Date: Sat Feb 5 06:31:07 UTC 2011
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: intr.h pmap.h vmparam.h
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_cpucorevar.h
rmixl_intr.h
src/sys/sys [matt-nb5-mips64]: lwp.h
Log Message:
- protect option includes ("opt_multiprocessor.h") with #ifdef _KERNEL_OPT
To generate a diff of this commit:
cvs rdiff -u -r1.3.96.15 -r1.3.96.16 src/sys/arch/mips/include/intr.h
cvs rdiff -u -r1.54.26.16 -r1.54.26.17 src/sys/arch/mips/include/pmap.h
cvs rdiff -u -r1.41.28.18 -r1.41.28.19 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_cpucorevar.h \
src/sys/arch/mips/rmi/rmixl_intr.h
cvs rdiff -u -r1.114.4.1.4.1 -r1.114.4.1.4.2 src/sys/sys/lwp.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/mips/include/intr.h
diff -u src/sys/arch/mips/include/intr.h:1.3.96.15 src/sys/arch/mips/include/intr.h:1.3.96.16
--- src/sys/arch/mips/include/intr.h:1.3.96.15 Sat Feb 5 06:05:35 2011
+++ src/sys/arch/mips/include/intr.h Sat Feb 5 06:31:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.3.96.15 2011/02/05 06:05:35 cliff Exp $ */
+/* $NetBSD: intr.h,v 1.3.96.16 2011/02/05 06:31:05 cliff Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,7 +31,9 @@
#ifndef _MIPS_INTR_H_
#define _MIPS_INTR_H_
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
/*
* This is a common <machine/intr.h> for all MIPS platforms.
Index: src/sys/arch/mips/include/pmap.h
diff -u src/sys/arch/mips/include/pmap.h:1.54.26.16 src/sys/arch/mips/include/pmap.h:1.54.26.17
--- src/sys/arch/mips/include/pmap.h:1.54.26.16 Sat Feb 5 06:00:12 2011
+++ src/sys/arch/mips/include/pmap.h Sat Feb 5 06:31:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.54.26.16 2011/02/05 06:00:12 cliff Exp $ */
+/* $NetBSD: pmap.h,v 1.54.26.17 2011/02/05 06:31:05 cliff Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -74,7 +74,9 @@
#ifndef _MIPS_PMAP_H_
#define _MIPS_PMAP_H_
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
#include <mips/cpuregs.h> /* for KSEG0 below */
//#include <mips/pte.h>
Index: src/sys/arch/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.41.28.18 src/sys/arch/mips/include/vmparam.h:1.41.28.19
--- src/sys/arch/mips/include/vmparam.h:1.41.28.18 Sat Feb 5 06:00:12 2011
+++ src/sys/arch/mips/include/vmparam.h Sat Feb 5 06:31:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.41.28.18 2011/02/05 06:00:12 cliff Exp $ */
+/* $NetBSD: vmparam.h,v 1.41.28.19 2011/02/05 06:31:05 cliff Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -79,7 +79,9 @@
#ifndef _MIPS_VMPARAM_H_
#define _MIPS_VMPARAM_H_
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
/*
* Machine dependent VM constants for MIPS.
Index: src/sys/arch/mips/rmi/rmixl_cpucorevar.h
diff -u src/sys/arch/mips/rmi/rmixl_cpucorevar.h:1.1.2.5 src/sys/arch/mips/rmi/rmixl_cpucorevar.h:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_cpucorevar.h:1.1.2.5 Sat Feb 5 06:00:13 2011
+++ src/sys/arch/mips/rmi/rmixl_cpucorevar.h Sat Feb 5 06:31:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpucorevar.h,v 1.1.2.5 2011/02/05 06:00:13 cliff Exp $ */
+/* $NetBSD: rmixl_cpucorevar.h,v 1.1.2.6 2011/02/05 06:31:05 cliff Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,7 +31,9 @@
#ifndef _ARCH_MIPS_RMI_RMIXL_CPUCOREVAR_H_
#define _ARCH_MIPS_RMI_RMIXL_CPUCOREVAR_H_
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
struct cpucore_softc {
device_t sc_dev;
Index: src/sys/arch/mips/rmi/rmixl_intr.h
diff -u src/sys/arch/mips/rmi/rmixl_intr.h:1.1.2.5 src/sys/arch/mips/rmi/rmixl_intr.h:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_intr.h:1.1.2.5 Sat Feb 5 06:12:42 2011
+++ src/sys/arch/mips/rmi/rmixl_intr.h Sat Feb 5 06:31:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_intr.h,v 1.1.2.5 2011/02/05 06:12:42 cliff Exp $ */
+/* $NetBSD: rmixl_intr.h,v 1.1.2.6 2011/02/05 06:31:06 cliff Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,7 +31,9 @@
#ifndef _MIPS_RMI_RMIXL_INTR_H_
#define _MIPS_RMI_RMIXL_INTR_H_
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
/*
* A 'vector' is bit number in EIRR/EIMR
Index: src/sys/sys/lwp.h
diff -u src/sys/sys/lwp.h:1.114.4.1.4.1 src/sys/sys/lwp.h:1.114.4.1.4.2
--- src/sys/sys/lwp.h:1.114.4.1.4.1 Sat Feb 5 06:00:15 2011
+++ src/sys/sys/lwp.h Sat Feb 5 06:31:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lwp.h,v 1.114.4.1.4.1 2011/02/05 06:00:15 cliff Exp $ */
+/* $NetBSD: lwp.h,v 1.114.4.1.4.2 2011/02/05 06:31:06 cliff Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -32,7 +32,9 @@
#ifndef _SYS_LWP_H_
#define _SYS_LWP_H_
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
#include <sys/time.h>
#include <sys/queue.h>
