patch-2.4.0-test8 linux/arch/sparc/kernel/smp.c

• Lines: 120
• Date: Thu Sep 7 08:32:00 2000
• Orig file: v2.4.0-test7/linux/arch/sparc/kernel/smp.c
• Orig date: Fri Jul 14 12:12:07 2000

diff -u --recursive --new-file v2.4.0-test7/linux/arch/sparc/kernel/smp.c linux/arch/sparc/kernel/smp.c
@@ -145,35 +145,33 @@
 void smp_flush_cache_all(void)
 {
 	xc0((smpfunc_t) BTFIXUP_CALL(local_flush_cache_all));
-	local_flush_cache_all();
 }
 
 void smp_flush_tlb_all(void)
 {
 	xc0((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_all));
-	local_flush_tlb_all();
 }
 
 void smp_flush_cache_mm(struct mm_struct *mm)
 {
 	if(mm->context != NO_CONTEXT) {
-		if(mm->cpu_vm_mask != (1 << smp_processor_id()))
+		if(mm->cpu_vm_mask == (1 << smp_processor_id()))
+			local_flush_cache_mm(mm);
+		else
 			xc1((smpfunc_t) BTFIXUP_CALL(local_flush_cache_mm), (unsigned long) mm);
-
-		local_flush_cache_mm(mm);
 	}
 }
 
 void smp_flush_tlb_mm(struct mm_struct *mm)
 {
 	if(mm->context != NO_CONTEXT) {
-		if(mm->cpu_vm_mask != (1 << smp_processor_id())) {
+		if(mm->cpu_vm_mask == (1 << smp_processor_id())) {
+			local_flush_tlb_mm(mm);
+		} else {
 			xc1((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_mm), (unsigned long) mm);
 			if(atomic_read(&mm->mm_users) == 1 && current->active_mm == mm)
 				mm->cpu_vm_mask = (1 << smp_processor_id());
 		}
-
-		local_flush_tlb_mm(mm);
 	}
 }
 
@@ -181,10 +179,10 @@
 			   unsigned long end)
 {
 	if(mm->context != NO_CONTEXT) {
-		if(mm->cpu_vm_mask != (1 << smp_processor_id()))
+		if(mm->cpu_vm_mask == (1 << smp_processor_id()))
+			local_flush_cache_range(mm, start, end);
+		else
 			xc3((smpfunc_t) BTFIXUP_CALL(local_flush_cache_range), (unsigned long) mm, start, end);
-
-		local_flush_cache_range(mm, start, end);
 	}
 }
 
@@ -192,10 +190,10 @@
 			 unsigned long end)
 {
 	if(mm->context != NO_CONTEXT) {
-		if(mm->cpu_vm_mask != (1 << smp_processor_id()))
+		if(mm->cpu_vm_mask == (1 << smp_processor_id()))
+				local_flush_tlb_range(mm, start, end);
+		else
 			xc3((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_range), (unsigned long) mm, start, end);
-
-		local_flush_tlb_range(mm, start, end);
 	}
 }
 
@@ -204,10 +202,10 @@
 	struct mm_struct *mm = vma->vm_mm;
 
 	if(mm->context != NO_CONTEXT) {
-		if(mm->cpu_vm_mask != (1 << smp_processor_id()))
+		if(mm->cpu_vm_mask == (1 << smp_processor_id()))
+			local_flush_cache_page(vma, page);
+		else
 			xc2((smpfunc_t) BTFIXUP_CALL(local_flush_cache_page), (unsigned long) vma, page);
-
-		local_flush_cache_page(vma, page);
 	}
 }
 
@@ -216,10 +214,10 @@
 	struct mm_struct *mm = vma->vm_mm;
 
 	if(mm->context != NO_CONTEXT) {
-		if(mm->cpu_vm_mask != (1 << smp_processor_id()))
+		if(mm->cpu_vm_mask == (1 << smp_processor_id()))
+			local_flush_tlb_page(vma, page);
+		else
 			xc2((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_page), (unsigned long) vma, page);
-
-		local_flush_tlb_page(vma, page);
 	}
 }
 
@@ -233,7 +231,6 @@
 	 */
 #if 1
 	xc1((smpfunc_t) BTFIXUP_CALL(local_flush_page_to_ram), page);
-	local_flush_page_to_ram(page);
 #else
 	local_flush_page_to_ram(page);
 #endif
@@ -241,10 +238,10 @@
 
 void smp_flush_sig_insns(struct mm_struct *mm, unsigned long insn_addr)
 {
-	if(mm->cpu_vm_mask != (1 << smp_processor_id()))
+	if(mm->cpu_vm_mask == (1 << smp_processor_id()))
+		local_flush_sig_insns(mm, insn_addr);
+	else
 		xc2((smpfunc_t) BTFIXUP_CALL(local_flush_sig_insns), (unsigned long) mm, insn_addr);
-
-	local_flush_sig_insns(mm, insn_addr);
 }
 
 /* Reschedule call back. */