Module Name: src
Committed By: skrll
Date: Sat Mar 6 21:22:43 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: locore.S
src/sys/arch/hp700/include: cpu.h
src/sys/arch/hppa/hppa: pmap.c
src/sys/arch/hppa/include: pmap.h
Log Message:
Add #include "opt_cputype.h" where necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hp700/hp700/locore.S
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hp700/include/cpu.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hppa/include/pmap.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/hp700/hp700/locore.S
diff -u src/sys/arch/hp700/hp700/locore.S:1.41 src/sys/arch/hp700/hp700/locore.S:1.42
--- src/sys/arch/hp700/hp700/locore.S:1.41 Thu Feb 18 21:38:32 2010
+++ src/sys/arch/hp700/hp700/locore.S Sat Mar 6 21:22:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.41 2010/02/18 21:38:32 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.42 2010/03/06 21:22:42 skrll Exp $ */
/* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */
/*
@@ -57,6 +57,7 @@
* suitability of this software for any purpose.
*/
+#include "opt_cputype.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.37 src/sys/arch/hp700/include/cpu.h:1.38
--- src/sys/arch/hp700/include/cpu.h:1.37 Wed Feb 17 11:33:51 2010
+++ src/sys/arch/hp700/include/cpu.h Sat Mar 6 21:22:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.37 2010/02/17 11:33:51 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.38 2010/03/06 21:22:42 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -53,6 +53,10 @@
#ifndef _MACHINE_CPU_H_
#define _MACHINE_CPU_H_
+#ifdef _KERNEL_OPT
+#include "opt_cputype.h"
+#endif
+
#include <machine/trap.h>
#include <machine/frame.h>
#include <machine/reg.h>
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.69 src/sys/arch/hppa/hppa/pmap.c:1.70
--- src/sys/arch/hppa/hppa/pmap.c:1.69 Wed Feb 24 06:38:53 2010
+++ src/sys/arch/hppa/hppa/pmap.c Sat Mar 6 21:22:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.69 2010/02/24 06:38:53 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.70 2010/03/06 21:22:42 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.69 2010/02/24 06:38:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.70 2010/03/06 21:22:42 skrll Exp $");
+
+#include "opt_cputype.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/hppa/include/pmap.h
diff -u src/sys/arch/hppa/include/pmap.h:1.24 src/sys/arch/hppa/include/pmap.h:1.25
--- src/sys/arch/hppa/include/pmap.h:1.24 Mon Feb 22 21:32:55 2010
+++ src/sys/arch/hppa/include/pmap.h Sat Mar 6 21:22:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.24 2010/02/22 21:32:55 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.25 2010/03/06 21:22:42 skrll Exp $ */
/* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */
@@ -35,6 +35,10 @@
#ifndef _HPPA_PMAP_H_
#define _HPPA_PMAP_H_
+#ifdef _KERNEL_OPT
+#include "opt_cputype.h"
+#endif
+
#include <sys/mutex.h>
#include <machine/pte.h>
#include <machine/cpufunc.h>
