[src/trunk]: src/sys/arch/powerpc Add #error for unknown PPC variant

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/147b29ecf67a
branches:  trunk
changeset: 766288:147b29ecf67a
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 20 08:07:03 2011 +0000

description:
Add #error for unknown PPC variant
Now that oea calls cpu_fixup_stubs, we don't need pmap_fixup_stubs.

diffstat:

 sys/arch/powerpc/include/oea/pmap.h |  10 ++++------
 sys/arch/powerpc/include/pmap.h     |   3 ++-
 sys/arch/powerpc/oea/pmap_kernel.c  |  17 +++--------------
 3 files changed, 9 insertions(+), 21 deletions(-)

diffs (90 lines):

diff -r 0d98de03113a -r 147b29ecf67a sys/arch/powerpc/include/oea/pmap.h
--- a/sys/arch/powerpc/include/oea/pmap.h       Mon Jun 20 08:01:13 2011 +0000
+++ b/sys/arch/powerpc/include/oea/pmap.h       Mon Jun 20 08:07:03 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.22 2011/02/15 19:39:12 macallan Exp $       */
+/*     $NetBSD: pmap.h,v 1.23 2011/06/20 08:07:03 matt Exp $   */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -181,24 +181,22 @@
 extern const struct pmap_ops pmap64_ops;
 extern const struct pmap_ops pmap64bridge_ops;
 
-void   pmap_fixup_stubs(const struct pmap_ops *);
-
 static inline void
 pmap_setup32(void)
 {
-       pmap_fixup_stubs(&pmap32_ops);
+       pmapops = &pmap32_ops;
 }
 
 static inline void
 pmap_setup64(void)
 {
-       pmap_fixup_stubs(&pmap64_ops);
+       pmapops = &pmap64_ops;
 }
 
 static inline void
 pmap_setup64bridge(void)
 {
-       pmap_fixup_stubs(&pmap64bridge_ops);
+       pmapops = &pmap64bridge_ops;
 }
 #endif
 
diff -r 0d98de03113a -r 147b29ecf67a sys/arch/powerpc/include/pmap.h
--- a/sys/arch/powerpc/include/pmap.h   Mon Jun 20 08:01:13 2011 +0000
+++ b/sys/arch/powerpc/include/pmap.h   Mon Jun 20 08:07:03 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.35 2010/03/09 22:40:06 matt Exp $   */
+/*     $NetBSD: pmap.h,v 1.36 2011/06/20 08:07:03 matt Exp $   */
 
 #ifdef _KERNEL_OPT
 #include "opt_ppcarch.h"
@@ -11,4 +11,5 @@
 #elif defined(PPC_OEA) || defined (PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
 #include <powerpc/oea/pmap.h>
 #else
+#error unknown PPC variant
 #endif
diff -r 0d98de03113a -r 147b29ecf67a sys/arch/powerpc/oea/pmap_kernel.c
--- a/sys/arch/powerpc/oea/pmap_kernel.c        Mon Jun 20 08:01:13 2011 +0000
+++ b/sys/arch/powerpc/oea/pmap_kernel.c        Mon Jun 20 08:07:03 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_kernel.c,v 1.7 2011/02/27 09:01:56 rjs Exp $      */
+/*     $NetBSD: pmap_kernel.c,v 1.8 2011/06/20 08:07:03 matt Exp $     */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.7 2011/02/27 09:01:56 rjs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.8 2011/06/20 08:07:03 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap.h"
@@ -58,18 +58,7 @@
 
 const struct pmap_ops *pmapops;
 
-void
-pmap_fixup_stubs(const struct pmap_ops *ops)
-{
-       extern uint32_t _ftext[], _etext[];
-       extern uint32_t __stub_pmap_start[], __stub_pmap_end[];
-
-       pmapops = ops;
-
-       powerpc_fixup_stubs(_ftext, _etext, __stub_pmap_start, __stub_pmap_end);
-}
-
-#define        __stub  __section(".stub.pmap") __noprofile
+#define        __stub  __section(".stub") __noprofile
 
 int    pmap_pte_spill(struct pmap *, vaddr_t, bool)            __stub;
 void   pmap_real_memory(paddr_t *, psize_t *)                  __stub;