Module Name:    src
Committed By:   joerg
Date:           Sun Aug 10 17:49:04 UTC 2014

Modified Files:
        src/sys/arch/powerpc/oea: pmap.c

Log Message:
Update conditions on mfsrin definition to match use.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/powerpc/oea/pmap.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.91 src/sys/arch/powerpc/oea/pmap.c:1.92
--- src/sys/arch/powerpc/oea/pmap.c:1.91	Mon Mar  3 15:36:36 2014
+++ src/sys/arch/powerpc/oea/pmap.c	Sun Aug 10 17:49:04 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.91 2014/03/03 15:36:36 macallan Exp $	*/
+/*	$NetBSD: pmap.c,v 1.92 2014/08/10 17:49:04 joerg 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.91 2014/03/03 15:36:36 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.92 2014/08/10 17:49:04 joerg Exp $");
 
 #define	PMAP_NOOPNAMES
 
@@ -504,7 +504,7 @@ extern struct evcnt pmap_evcnt_idlezeroe
 #define	MFSRIN(va)	mfsrin(va)
 #define	MFTB()		mfrtcltbl()
 
-#if defined (PMAP_OEA) || defined (PMAP_OEA64_BRIDGE)
+#if defined(DDB) && !defined(PMAP_OEA64)
 static inline register_t
 mfsrin(vaddr_t va)
 {
@@ -512,7 +512,7 @@ mfsrin(vaddr_t va)
 	__asm volatile ("mfsrin %0,%1" : "=r"(sr) : "r"(va));
 	return sr;
 }
-#endif	/* PMAP_OEA*/
+#endif	/* DDB && !PMAP_OEA64 */
 
 #if defined (PMAP_OEA64_BRIDGE)
 extern void mfmsr64 (register64_t *result);

Reply via email to