[src/trunk]: src/sys/arch Don't export USER_SR if _MODULE is defined.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Don't export USER_SR if _MODULE is defined.
From: matt <matt%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:38:22 +0000

details:   https://anonhg.NetBSD.org/src/rev/0d98de03113a
branches:  trunk
changeset: 766287:0d98de03113a
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 20 08:01:13 2011 +0000

description:
Don't export USER_SR if _MODULE is defined.
Add a common <powerpc/vmparam.h> like we have for <powerpc/pmap.h>

diffstat:

 sys/arch/amigappc/include/vmparam.h  |   4 ++--
 sys/arch/bebox/include/vmparam.h     |   7 +++++--
 sys/arch/evbppc/include/vmparam.h    |  14 ++------------
 sys/arch/ibmnws/include/vmparam.h    |   7 +++++--
 sys/arch/macppc/include/vmparam.h    |   4 ++--
 sys/arch/mvmeppc/include/vmparam.h   |   6 ++++--
 sys/arch/ofppc/include/vmparam.h     |   8 +++++---
 sys/arch/powerpc/include/vmparam.h   |  15 +++++++++++++++
 sys/arch/prep/include/vmparam.h      |   6 ++++--
 sys/arch/rs6000/include/vmparam.h    |   6 ++++--
 sys/arch/sandpoint/include/vmparam.h |   4 ++--
 11 files changed, 50 insertions(+), 31 deletions(-)

diffs (149 lines):

diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/amigappc/include/vmparam.h
--- a/sys/arch/amigappc/include/vmparam.h       Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/amigappc/include/vmparam.h       Mon Jun 20 08:01:13 2011 +0000
@@ -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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/bebox/include/vmparam.h
--- a/sys/arch/bebox/include/vmparam.h  Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/bebox/include/vmparam.h  Mon Jun 20 08:01:13 2011 +0000
@@ -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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/evbppc/include/vmparam.h
--- a/sys/arch/evbppc/include/vmparam.h Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/evbppc/include/vmparam.h Mon Jun 20 08:01:13 2011 +0000
@@ -1,13 +1,3 @@
-/*     $NetBSD: vmparam.h,v 1.4 2011/01/18 01:10:25 matt Exp $ */
-
-#ifdef _KERNEL_OPT
-#include "opt_ppcarch.h"
-#endif
+/*     $NetBSD: vmparam.h,v 1.5 2011/06/20 08:01:13 matt Exp $ */
 
-#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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/ibmnws/include/vmparam.h
--- a/sys/arch/ibmnws/include/vmparam.h Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/ibmnws/include/vmparam.h Mon Jun 20 08:01:13 2011 +0000
@@ -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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/macppc/include/vmparam.h
--- a/sys/arch/macppc/include/vmparam.h Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/macppc/include/vmparam.h Mon Jun 20 08:01:13 2011 +0000
@@ -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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/mvmeppc/include/vmparam.h
--- a/sys/arch/mvmeppc/include/vmparam.h        Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/mvmeppc/include/vmparam.h        Mon Jun 20 08:01:13 2011 +0000
@@ -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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/ofppc/include/vmparam.h
--- a/sys/arch/ofppc/include/vmparam.h  Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/ofppc/include/vmparam.h  Mon Jun 20 08:01:13 2011 +0000
@@ -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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/powerpc/include/vmparam.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/powerpc/include/vmparam.h        Mon Jun 20 08:01:13 2011 +0000
@@ -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
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/prep/include/vmparam.h
--- a/sys/arch/prep/include/vmparam.h   Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/prep/include/vmparam.h   Mon Jun 20 08:01:13 2011 +0000
@@ -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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/rs6000/include/vmparam.h
--- a/sys/arch/rs6000/include/vmparam.h Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/rs6000/include/vmparam.h Mon Jun 20 08:01:13 2011 +0000
@@ -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>
diff -r 9ed77608d5c2 -r 0d98de03113a sys/arch/sandpoint/include/vmparam.h
--- a/sys/arch/sandpoint/include/vmparam.h      Mon Jun 20 07:43:56 2011 +0000
+++ b/sys/arch/sandpoint/include/vmparam.h      Mon Jun 20 08:01:13 2011 +0000
@@ -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>

Prev by Date: [src/trunk]: src/sys/arch Fixup PSL handling to be tolerant of modules. Move...
Next by Date: [src/trunk]: src remove most of the remaining HAVE_GCC tests that are always ...
Previous by Thread: [src/trunk]: src/sys/arch Fixup PSL handling to be tolerant of modules. Move...
Next by Thread: [src/trunk]: src remove most of the remaining HAVE_GCC tests that are always ...
Indexes:

Home | Main Index | Thread Index | Old Index