patch-2.3.99-pre7 linux/arch/sparc64/mm/ultra.S

• Lines: 36
• Date: Mon May 8 22:00:01 2000
• Orig file: v2.3.99-pre6/linux/arch/sparc64/mm/ultra.S
• Orig date: Tue Apr 11 15:09:15 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/arch/sparc64/mm/ultra.S linux/arch/sparc64/mm/ultra.S
@@ -1,9 +1,10 @@
-/* $Id: ultra.S,v 1.41 2000/03/27 10:38:51 davem Exp $
+/* $Id: ultra.S,v 1.42 2000/05/05 18:47:41 davem Exp $
  * ultra.S: Don't expand these all over the place...
  *
  * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com)
  */
 
+#include <linux/config.h>
 #include <asm/asi.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
@@ -38,7 +39,7 @@
 		    */
 #define TLB_MAGIC	207 /* Students, do you know how I calculated this?  -DaveM */
 /*IC3*/	cmp		%o5, %o4
-	be,pt		%xcc, __flush_tlb_page
+	bleu,pt		%xcc, __flush_tlb_page
 	 srlx		%o5, 13, %g5
 	cmp		%g5, TLB_MAGIC
 	bgeu,pn		%icc, __flush_tlb_range_constant_time
@@ -242,7 +243,7 @@
 1:	retl
 	 nop
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	/* These are all called by the slaves of a cross call, at
 	 * trap level 1, with interrupts fully disabled.
 	 *
@@ -431,4 +432,4 @@
 	 nop
 	flush		%g6
 	retry
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */