Mon Jun 20 08:01:14 2011 UTC ()
Don't export USER_SR if _MODULE is defined.
Add a common <powerpc/vmparam.h> like we have for <powerpc/pmap.h>


(matt)
diff -r1.6 -r1.7 src/sys/arch/amigappc/include/vmparam.h
diff -r1.15 -r1.16 src/sys/arch/bebox/include/vmparam.h
diff -r1.4 -r1.5 src/sys/arch/evbppc/include/vmparam.h
diff -r1.2 -r1.3 src/sys/arch/ibmnws/include/vmparam.h
diff -r1.23 -r1.24 src/sys/arch/macppc/include/vmparam.h
diff -r1.3 -r1.4 src/sys/arch/mvmeppc/include/vmparam.h
diff -r1.22 -r1.23 src/sys/arch/ofppc/include/vmparam.h
diff -r0 -r1.14 src/sys/arch/powerpc/include/vmparam.h
diff -r1.13 -r1.14 src/sys/arch/prep/include/vmparam.h
diff -r1.1 -r1.2 src/sys/arch/rs6000/include/vmparam.h
diff -r1.11 -r1.12 src/sys/arch/sandpoint/include/vmparam.h
cvs diff -r1.6 -r1.7 src/sys/arch/amigappc/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/amigappc/include/vmparam.h 2003/02/03 17:09:54 1.6
+++ src/sys/arch/amigappc/include/vmparam.h 2011/06/20 08:01:13 1.7
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1/* $NetBSD: vmparam.h,v 1.6 2003/02/03 17:09:54 matt Exp $ */ 1/* $NetBSD: vmparam.h,v 1.7 2011/06/20 08:01:13 matt Exp $ */
2 2
3#include <powerpc/oea/vmparam.h> 3#include <powerpc/vmparam.h>
cvs diff -r1.15 -r1.16 src/sys/arch/bebox/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/bebox/include/vmparam.h 2008/02/17 03:57:15 1.15
+++ src/sys/arch/bebox/include/vmparam.h 2011/06/20 08:01:13 1.16
@@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
1/* $NetBSD: vmparam.h,v 1.15 2008/02/17 03:57:15 kiyohara Exp $ */ 1/* $NetBSD: vmparam.h,v 1.16 2011/06/20 08:01:13 matt Exp $ */
2 2
 3#if !defined(_MODULE)
3#define USER_SR 10 4#define USER_SR 10
4#include <powerpc/oea/vmparam.h> 5#endif
 6
 7#include <powerpc/vmparam.h>
cvs diff -r1.4 -r1.5 src/sys/arch/evbppc/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/evbppc/include/vmparam.h 2011/01/18 01:10:25 1.4
+++ src/sys/arch/evbppc/include/vmparam.h 2011/06/20 08:01:13 1.5
@@ -1,13 +1,3 @@ @@ -1,13 +1,3 @@
1/* $NetBSD: vmparam.h,v 1.4 2011/01/18 01:10:25 matt Exp $ */ 1/* $NetBSD: vmparam.h,v 1.5 2011/06/20 08:01:13 matt Exp $ */
2 2
3#ifdef _KERNEL_OPT 3#include <powerpc/vmparam.h>
4#include "opt_ppcarch.h" 
5#endif 
6 
7#ifdef PPC_IBM4XX 
8#include <powerpc/ibm4xx/vmparam.h> 
9#elif defined(PPC_OEA) 
10#include <powerpc/oea/vmparam.h> 
11#elif defined(PPC_BOOKE) 
12#include <powerpc/booke/vmparam.h> 
13#endif 
cvs diff -r1.2 -r1.3 src/sys/arch/ibmnws/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/ibmnws/include/vmparam.h 2005/12/11 12:17:51 1.2
+++ src/sys/arch/ibmnws/include/vmparam.h 2011/06/20 08:01:14 1.3
@@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
1/* $NetBSD: vmparam.h,v 1.2 2005/12/11 12:17:51 christos Exp $ */ 1/* $NetBSD: vmparam.h,v 1.3 2011/06/20 08:01:14 matt Exp $ */
2 2
 3#if !defined(_MODULE)
3#define USER_SR 11 4#define USER_SR 11
4#include <powerpc/oea/vmparam.h> 5#endif
 6
 7#include <powerpc/vmparam.h>
cvs diff -r1.23 -r1.24 src/sys/arch/macppc/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/macppc/include/vmparam.h 2003/02/03 17:09:56 1.23
+++ src/sys/arch/macppc/include/vmparam.h 2011/06/20 08:01:14 1.24
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1/* $NetBSD: vmparam.h,v 1.23 2003/02/03 17:09:56 matt Exp $ */ 1/* $NetBSD: vmparam.h,v 1.24 2011/06/20 08:01:14 matt Exp $ */
2 2
3#include <powerpc/oea/vmparam.h> 3#include <powerpc/vmparam.h>
cvs diff -r1.3 -r1.4 src/sys/arch/mvmeppc/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/mvmeppc/include/vmparam.h 2003/02/03 17:09:58 1.3
+++ src/sys/arch/mvmeppc/include/vmparam.h 2011/06/20 08:01:14 1.4
@@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
1/* $NetBSD: vmparam.h,v 1.3 2003/02/03 17:09:58 matt Exp $ */ 1/* $NetBSD: vmparam.h,v 1.4 2011/06/20 08:01:14 matt Exp $ */
2 2
 3#if !defined(_MODULE)
3#define USER_SR 15 4#define USER_SR 15
4#include <powerpc/oea/vmparam.h> 5#endif
 6#include <powerpc/vmparam.h>
cvs diff -r1.22 -r1.23 src/sys/arch/ofppc/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/ofppc/include/vmparam.h 2007/11/14 18:34:12 1.22
+++ src/sys/arch/ofppc/include/vmparam.h 2011/06/20 08:01:14 1.23
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1/* $NetBSD: vmparam.h,v 1.22 2007/11/14 18:34:12 garbled Exp $ */ 1/* $NetBSD: vmparam.h,v 1.23 2011/06/20 08:01:14 matt Exp $ */
2 2
3/* 3/*
4 * These are based on the segments that are least commonly used, and when 4 * These are based on the segments that are least commonly used, and when
5 * used, they are less often used as primary PCI's, or PCI's with video or 5 * used, they are less often used as primary PCI's, or PCI's with video or
6 * AGP. There is no unused value for these, as every different machine 6 * AGP. There is no unused value for these, as every different machine
7 * uses all, or some of the segments after 0x8. 7 * uses all, or some of the segments after 0x8.
8 */ 8 */
9 9
10#define USER_SR 0xe 10#if !defined(_MODULE)
11#define KERNEL_SR 0xa 11#define KERNEL_SR 0xa
12#define KERNEL2_SR 0xb 12#define KERNEL2_SR 0xb
 13#define USER_SR 0xe
 14#endif
13 15
14#include <powerpc/oea/vmparam.h> 16#include <powerpc/vmparam.h>
File Added: src/sys/arch/powerpc/include/vmparam.h
/*	$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
cvs diff -r1.13 -r1.14 src/sys/arch/prep/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/prep/include/vmparam.h 2006/05/25 02:11:13 1.13
+++ src/sys/arch/prep/include/vmparam.h 2011/06/20 08:01:14 1.14
@@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
1/* $NetBSD: vmparam.h,v 1.13 2006/05/25 02:11:13 garbled Exp $ */ 1/* $NetBSD: vmparam.h,v 1.14 2011/06/20 08:01:14 matt Exp $ */
2 2
 3#if !defined(_MODULE)
3#define USER_SR 10 4#define USER_SR 10
4#include <powerpc/oea/vmparam.h> 5#endif
 6#include <powerpc/vmparam.h>
cvs diff -r1.1 -r1.2 src/sys/arch/rs6000/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/rs6000/include/vmparam.h 2007/12/17 19:09:37 1.1
+++ src/sys/arch/rs6000/include/vmparam.h 2011/06/20 08:01:14 1.2
@@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
1/* $NetBSD: vmparam.h,v 1.1 2007/12/17 19:09:37 garbled Exp $ */ 1/* $NetBSD: vmparam.h,v 1.2 2011/06/20 08:01:14 matt Exp $ */
2 2
 3#if !defined(_MODULE)
3#define USER_SR 10 4#define USER_SR 10
4#include <powerpc/oea/vmparam.h> 5#endif
 6#include <powerpc/vmparam.h>
cvs diff -r1.11 -r1.12 src/sys/arch/sandpoint/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/sandpoint/include/vmparam.h 2003/02/03 17:10:13 1.11
+++ src/sys/arch/sandpoint/include/vmparam.h 2011/06/20 08:01:14 1.12
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1/* $NetBSD: vmparam.h,v 1.11 2003/02/03 17:10:13 matt Exp $ */ 1/* $NetBSD: vmparam.h,v 1.12 2011/06/20 08:01:14 matt Exp $ */
2 2
3#include <powerpc/oea/vmparam.h> 3#include <powerpc/vmparam.h>