Module Name: src
Committed By: matt
Date: Mon Jun 20 08:07:03 UTC 2011
Modified Files:
src/sys/arch/powerpc/include: pmap.h
src/sys/arch/powerpc/include/oea: pmap.h
src/sys/arch/powerpc/oea: pmap_kernel.c
Log Message:
Add #error for unknown PPC variant
Now that oea calls cpu_fixup_stubs, we don't need pmap_fixup_stubs.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/powerpc/include/pmap.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/oea/pmap.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/oea/pmap_kernel.c
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/powerpc/include/pmap.h
diff -u src/sys/arch/powerpc/include/pmap.h:1.35 src/sys/arch/powerpc/include/pmap.h:1.36
--- src/sys/arch/powerpc/include/pmap.h:1.35 Tue Mar 9 22:40:06 2010
+++ src/sys/arch/powerpc/include/pmap.h Mon Jun 20 08:07:03 2011
@@ -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
Index: src/sys/arch/powerpc/include/oea/pmap.h
diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.22 src/sys/arch/powerpc/include/oea/pmap.h:1.23
--- src/sys/arch/powerpc/include/oea/pmap.h:1.22 Tue Feb 15 19:39:12 2011
+++ src/sys/arch/powerpc/include/oea/pmap.h Mon Jun 20 08:07:03 2011
@@ -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
Index: src/sys/arch/powerpc/oea/pmap_kernel.c
diff -u src/sys/arch/powerpc/oea/pmap_kernel.c:1.7 src/sys/arch/powerpc/oea/pmap_kernel.c:1.8
--- src/sys/arch/powerpc/oea/pmap_kernel.c:1.7 Sun Feb 27 09:01:56 2011
+++ src/sys/arch/powerpc/oea/pmap_kernel.c Mon Jun 20 08:07:03 2011
@@ -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;
