Module Name:    src
Committed By:   nakayama
Date:           Wed Nov  5 13:50:50 UTC 2014

Modified Files:
        src/sys/arch/sparc64/sparc64: cache.h

Log Message:
Simplify a condition.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc64/sparc64/cache.h

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/sparc64/sparc64/cache.h
diff -u src/sys/arch/sparc64/sparc64/cache.h:1.25 src/sys/arch/sparc64/sparc64/cache.h:1.26
--- src/sys/arch/sparc64/sparc64/cache.h:1.25	Wed Nov  5 13:30:11 2014
+++ src/sys/arch/sparc64/sparc64/cache.h	Wed Nov  5 13:50:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache.h,v 1.25 2014/11/05 13:30:11 nakayama Exp $ */
+/*	$NetBSD: cache.h,v 1.26 2014/11/05 13:50:50 nakayama Exp $ */
 
 /*
  * Copyright (c) 2011 Matthew R. Green
@@ -130,14 +130,12 @@ sp_tlb_flush_pte_sun4v(vaddr_t va, int c
 static __inline__ void
 sp_tlb_flush_pte(vaddr_t va, int ctx)
 {
-	if (CPU_ISSUN4U || CPU_ISSUN4US) {
-		if (CPU_IS_USIII_UP() || CPU_IS_SPARC64_V_UP())
-			sp_tlb_flush_pte_usiii(va, ctx);
-		else
-			sp_tlb_flush_pte_us(va, ctx);
-	}
-	else if (CPU_ISSUN4V)
+	if (CPU_ISSUN4V)
 		sp_tlb_flush_pte_sun4v(va, ctx);
+	else if (CPU_IS_USIII_UP() || CPU_IS_SPARC64_V_UP())
+		sp_tlb_flush_pte_usiii(va, ctx);
+	else
+		sp_tlb_flush_pte_us(va, ctx);
 }
 
 static __inline__ void

Reply via email to