Module Name: src
Committed By: matt
Date: Fri Feb 18 16:40:51 UTC 2011
Modified Files:
src/sys/arch/powerpc/oea: pmap.c pmap_kernel.c
Log Message:
Move powerpc_mmap_flags since pmap.c can get compiled multiple time resulting
in multiple defintions of powerpc_mmap_flags.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.3 -r1.4 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/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.77 src/sys/arch/powerpc/oea/pmap.c:1.78
--- src/sys/arch/powerpc/oea/pmap.c:1.77 Tue Feb 15 19:39:12 2011
+++ src/sys/arch/powerpc/oea/pmap.c Fri Feb 18 16:40:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.77 2011/02/15 19:39:12 macallan Exp $ */
+/* $NetBSD: pmap.c,v 1.78 2011/02/18 16:40:50 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.77 2011/02/15 19:39:12 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.78 2011/02/18 16:40:50 matt Exp $");
#define PMAP_NOOPNAMES
@@ -3520,16 +3520,3 @@
}
#endif
}
-
-u_int
-powerpc_mmap_flags(paddr_t pa)
-{
- u_int flags = PMAP_MD_NOCACHE;
-
- if (pa & POWERPC_MMAP_FLAG_PREFETCHABLE)
- flags |= PMAP_MD_PREFETCHABLE;
- if (pa & POWERPC_MMAP_FLAG_CACHEABLE)
- flags &= ~PMAP_MD_NOCACHE;
- return flags;
-}
-
Index: src/sys/arch/powerpc/oea/pmap_kernel.c
diff -u src/sys/arch/powerpc/oea/pmap_kernel.c:1.3 src/sys/arch/powerpc/oea/pmap_kernel.c:1.4
--- src/sys/arch/powerpc/oea/pmap_kernel.c:1.3 Sat Feb 12 18:23:10 2011
+++ src/sys/arch/powerpc/oea/pmap_kernel.c Fri Feb 18 16:40:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_kernel.c,v 1.3 2011/02/12 18:23:10 matt Exp $ */
+/* $NetBSD: pmap_kernel.c,v 1.4 2011/02/18 16:40:50 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.3 2011/02/12 18:23:10 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.4 2011/02/18 16:40:50 matt Exp $");
#include "opt_ddb.h"
#include "opt_pmap.h"
@@ -41,6 +41,18 @@
extern struct pmap kernel_pmap_;
struct pmap *const kernel_pmap_ptr = &kernel_pmap_;
+u_int
+powerpc_mmap_flags(paddr_t pa)
+{
+ u_int flags = PMAP_MD_NOCACHE;
+
+ if (pa & POWERPC_MMAP_FLAG_PREFETCHABLE)
+ flags |= PMAP_MD_PREFETCHABLE;
+ if (pa & POWERPC_MMAP_FLAG_CACHEABLE)
+ flags &= ~PMAP_MD_NOCACHE;
+ return flags;
+}
+
#ifdef PMAP_NEEDS_FIXUP
#include <powerpc/instr.h>
