Module Name: src
Committed By: matt
Date: Mon Jun 20 08:01:14 UTC 2011
Modified Files:
src/sys/arch/amigappc/include: vmparam.h
src/sys/arch/bebox/include: vmparam.h
src/sys/arch/evbppc/include: vmparam.h
src/sys/arch/ibmnws/include: vmparam.h
src/sys/arch/macppc/include: vmparam.h
src/sys/arch/mvmeppc/include: vmparam.h
src/sys/arch/ofppc/include: vmparam.h
src/sys/arch/prep/include: vmparam.h
src/sys/arch/rs6000/include: vmparam.h
src/sys/arch/sandpoint/include: vmparam.h
Added Files:
src/sys/arch/powerpc/include: vmparam.h
Log Message:
Don't export USER_SR if _MODULE is defined.
Add a common <powerpc/vmparam.h> like we have for <powerpc/pmap.h>
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amigappc/include/vmparam.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/bebox/include/vmparam.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/include/vmparam.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ibmnws/include/vmparam.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/macppc/include/vmparam.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvmeppc/include/vmparam.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/ofppc/include/vmparam.h
cvs rdiff -u -r0 -r1.14 src/sys/arch/powerpc/include/vmparam.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/prep/include/vmparam.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/include/vmparam.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sandpoint/include/vmparam.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/amigappc/include/vmparam.h
diff -u src/sys/arch/amigappc/include/vmparam.h:1.6 src/sys/arch/amigappc/include/vmparam.h:1.7
--- src/sys/arch/amigappc/include/vmparam.h:1.6 Mon Feb 3 17:09:54 2003
+++ src/sys/arch/amigappc/include/vmparam.h Mon Jun 20 08:01:13 2011
@@ -1,3 +1,3 @@
-/* $NetBSD: vmparam.h,v 1.6 2003/02/03 17:09:54 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.7 2011/06/20 08:01:13 matt Exp $ */
-#include <powerpc/oea/vmparam.h>
+#include <powerpc/vmparam.h>
Index: src/sys/arch/bebox/include/vmparam.h
diff -u src/sys/arch/bebox/include/vmparam.h:1.15 src/sys/arch/bebox/include/vmparam.h:1.16
--- src/sys/arch/bebox/include/vmparam.h:1.15 Sun Feb 17 03:57:15 2008
+++ src/sys/arch/bebox/include/vmparam.h Mon Jun 20 08:01:13 2011
@@ -1,4 +1,7 @@
-/* $NetBSD: vmparam.h,v 1.15 2008/02/17 03:57:15 kiyohara Exp $ */
+/* $NetBSD: vmparam.h,v 1.16 2011/06/20 08:01:13 matt Exp $ */
+#if !defined(_MODULE)
#define USER_SR 10
-#include <powerpc/oea/vmparam.h>
+#endif
+
+#include <powerpc/vmparam.h>
Index: src/sys/arch/evbppc/include/vmparam.h
diff -u src/sys/arch/evbppc/include/vmparam.h:1.4 src/sys/arch/evbppc/include/vmparam.h:1.5
--- src/sys/arch/evbppc/include/vmparam.h:1.4 Tue Jan 18 01:10:25 2011
+++ src/sys/arch/evbppc/include/vmparam.h Mon Jun 20 08:01:13 2011
@@ -1,13 +1,3 @@
-/* $NetBSD: vmparam.h,v 1.4 2011/01/18 01:10:25 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.5 2011/06/20 08:01:13 matt Exp $ */
-#ifdef _KERNEL_OPT
-#include "opt_ppcarch.h"
-#endif
-
-#ifdef PPC_IBM4XX
-#include <powerpc/ibm4xx/vmparam.h>
-#elif defined(PPC_OEA)
-#include <powerpc/oea/vmparam.h>
-#elif defined(PPC_BOOKE)
-#include <powerpc/booke/vmparam.h>
-#endif
+#include <powerpc/vmparam.h>
Index: src/sys/arch/ibmnws/include/vmparam.h
diff -u src/sys/arch/ibmnws/include/vmparam.h:1.2 src/sys/arch/ibmnws/include/vmparam.h:1.3
--- src/sys/arch/ibmnws/include/vmparam.h:1.2 Sun Dec 11 12:17:51 2005
+++ src/sys/arch/ibmnws/include/vmparam.h Mon Jun 20 08:01:14 2011
@@ -1,4 +1,7 @@
-/* $NetBSD: vmparam.h,v 1.2 2005/12/11 12:17:51 christos Exp $ */
+/* $NetBSD: vmparam.h,v 1.3 2011/06/20 08:01:14 matt Exp $ */
+#if !defined(_MODULE)
#define USER_SR 11
-#include <powerpc/oea/vmparam.h>
+#endif
+
+#include <powerpc/vmparam.h>
Index: src/sys/arch/macppc/include/vmparam.h
diff -u src/sys/arch/macppc/include/vmparam.h:1.23 src/sys/arch/macppc/include/vmparam.h:1.24
--- src/sys/arch/macppc/include/vmparam.h:1.23 Mon Feb 3 17:09:56 2003
+++ src/sys/arch/macppc/include/vmparam.h Mon Jun 20 08:01:14 2011
@@ -1,3 +1,3 @@
-/* $NetBSD: vmparam.h,v 1.23 2003/02/03 17:09:56 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.24 2011/06/20 08:01:14 matt Exp $ */
-#include <powerpc/oea/vmparam.h>
+#include <powerpc/vmparam.h>
Index: src/sys/arch/mvmeppc/include/vmparam.h
diff -u src/sys/arch/mvmeppc/include/vmparam.h:1.3 src/sys/arch/mvmeppc/include/vmparam.h:1.4
--- src/sys/arch/mvmeppc/include/vmparam.h:1.3 Mon Feb 3 17:09:58 2003
+++ src/sys/arch/mvmeppc/include/vmparam.h Mon Jun 20 08:01:14 2011
@@ -1,4 +1,6 @@
-/* $NetBSD: vmparam.h,v 1.3 2003/02/03 17:09:58 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.4 2011/06/20 08:01:14 matt Exp $ */
+#if !defined(_MODULE)
#define USER_SR 15
-#include <powerpc/oea/vmparam.h>
+#endif
+#include <powerpc/vmparam.h>
Index: src/sys/arch/ofppc/include/vmparam.h
diff -u src/sys/arch/ofppc/include/vmparam.h:1.22 src/sys/arch/ofppc/include/vmparam.h:1.23
--- src/sys/arch/ofppc/include/vmparam.h:1.22 Wed Nov 14 18:34:12 2007
+++ src/sys/arch/ofppc/include/vmparam.h Mon Jun 20 08:01:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.22 2007/11/14 18:34:12 garbled Exp $ */
+/* $NetBSD: vmparam.h,v 1.23 2011/06/20 08:01:14 matt Exp $ */
/*
* These are based on the segments that are least commonly used, and when
@@ -7,8 +7,10 @@
* uses all, or some of the segments after 0x8.
*/
-#define USER_SR 0xe
+#if !defined(_MODULE)
#define KERNEL_SR 0xa
#define KERNEL2_SR 0xb
+#define USER_SR 0xe
+#endif
-#include <powerpc/oea/vmparam.h>
+#include <powerpc/vmparam.h>
Index: src/sys/arch/prep/include/vmparam.h
diff -u src/sys/arch/prep/include/vmparam.h:1.13 src/sys/arch/prep/include/vmparam.h:1.14
--- src/sys/arch/prep/include/vmparam.h:1.13 Thu May 25 02:11:13 2006
+++ src/sys/arch/prep/include/vmparam.h Mon Jun 20 08:01:14 2011
@@ -1,4 +1,6 @@
-/* $NetBSD: vmparam.h,v 1.13 2006/05/25 02:11:13 garbled Exp $ */
+/* $NetBSD: vmparam.h,v 1.14 2011/06/20 08:01:14 matt Exp $ */
+#if !defined(_MODULE)
#define USER_SR 10
-#include <powerpc/oea/vmparam.h>
+#endif
+#include <powerpc/vmparam.h>
Index: src/sys/arch/rs6000/include/vmparam.h
diff -u src/sys/arch/rs6000/include/vmparam.h:1.1 src/sys/arch/rs6000/include/vmparam.h:1.2
--- src/sys/arch/rs6000/include/vmparam.h:1.1 Mon Dec 17 19:09:37 2007
+++ src/sys/arch/rs6000/include/vmparam.h Mon Jun 20 08:01:14 2011
@@ -1,4 +1,6 @@
-/* $NetBSD: vmparam.h,v 1.1 2007/12/17 19:09:37 garbled Exp $ */
+/* $NetBSD: vmparam.h,v 1.2 2011/06/20 08:01:14 matt Exp $ */
+#if !defined(_MODULE)
#define USER_SR 10
-#include <powerpc/oea/vmparam.h>
+#endif
+#include <powerpc/vmparam.h>
Index: src/sys/arch/sandpoint/include/vmparam.h
diff -u src/sys/arch/sandpoint/include/vmparam.h:1.11 src/sys/arch/sandpoint/include/vmparam.h:1.12
--- src/sys/arch/sandpoint/include/vmparam.h:1.11 Mon Feb 3 17:10:13 2003
+++ src/sys/arch/sandpoint/include/vmparam.h Mon Jun 20 08:01:14 2011
@@ -1,3 +1,3 @@
-/* $NetBSD: vmparam.h,v 1.11 2003/02/03 17:10:13 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.12 2011/06/20 08:01:14 matt Exp $ */
-#include <powerpc/oea/vmparam.h>
+#include <powerpc/vmparam.h>
Added files:
Index: src/sys/arch/powerpc/include/vmparam.h
diff -u /dev/null src/sys/arch/powerpc/include/vmparam.h:1.14
--- /dev/null Mon Jun 20 08:01:15 2011
+++ src/sys/arch/powerpc/include/vmparam.h Mon Jun 20 08:01:14 2011
@@ -0,0 +1,15 @@
+/* $NetBSD: vmparam.h,v 1.14 2011/06/20 08:01:14 matt Exp $ */
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
+#if defined(PPC_BOOKE)
+#include <powerpc/booke/vmparam.h>
+#elif defined(PPC_IBM4XX)
+#include <powerpc/ibm4xx/vmparam.h>
+#elif defined(PPC_OEA) || defined (PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
+#include <powerpc/oea/vmparam.h>
+#else
+#error unknown PPC variant
+#endif
