patch-2.4.14 linux/arch/sparc64/kernel/smp.c

• Lines: 63
• Date: Tue Oct 30 15:08:11 2001
• Orig file: v2.4.13/linux/arch/sparc64/kernel/smp.c
• Orig date: Tue Oct 23 22:48:50 2001

diff -u --recursive --new-file v2.4.13/linux/arch/sparc64/kernel/smp.c linux/arch/sparc64/kernel/smp.c
@@ -585,14 +585,12 @@
 extern unsigned long xcall_flush_dcache_page_cheetah;
 extern unsigned long xcall_flush_dcache_page_spitfire;
 
-static spinlock_t dcache_xcall_lock = SPIN_LOCK_UNLOCKED;
-static struct page *dcache_page;
 #ifdef DCFLUSH_DEBUG
 extern atomic_t dcpage_flushes;
 extern atomic_t dcpage_flushes_xcall;
 #endif
 
-static __inline__ void __smp_flush_dcache_page_client(struct page *page)
+static __inline__ void __local_flush_dcache_page(struct page *page)
 {
 #if (L1DCACHE_SIZE > PAGE_SIZE)
 	__flush_dcache_page(page->virtual,
@@ -605,37 +603,31 @@
 #endif
 }
 
-void smp_flush_dcache_page_client(void)
-{
-	__smp_flush_dcache_page_client(dcache_page);
-	spin_unlock(&dcache_xcall_lock);
-}
-
-void smp_flush_dcache_page_impl(struct page *page)
+void smp_flush_dcache_page_impl(struct page *page, int cpu)
 {
 	if (smp_processors_ready) {
-		int cpu = dcache_dirty_cpu(page);
 		unsigned long mask = 1UL << cpu;
 
 #ifdef DCFLUSH_DEBUG
 		atomic_inc(&dcpage_flushes);
 #endif
 		if (cpu == smp_processor_id()) {
-			__smp_flush_dcache_page_client(page);
+			__local_flush_dcache_page(page);
 		} else if ((cpu_present_map & mask) != 0) {
 			u64 data0;
 
 			if (tlb_type == spitfire) {
-				spin_lock(&dcache_xcall_lock);
-				dcache_page = page;
 				data0 = ((u64)&xcall_flush_dcache_page_spitfire);
-				spitfire_xcall_deliver(data0, 0, 0, mask);
-				/* Target cpu drops dcache_xcall_lock. */
+				if (page->mapping != NULL)
+					data0 |= ((u64)1 << 32);
+				spitfire_xcall_deliver(data0,
+						       __pa(page->virtual),
+						       (u64) page->virtual,
+						       mask);
 			} else {
-				/* Look mom, no locks... */
 				data0 = ((u64)&xcall_flush_dcache_page_cheetah);
 				cheetah_xcall_deliver(data0,
-						      (u64) page->virtual,
+						      __pa(page->virtual),
 						      0, mask);
 			}
 #ifdef DCFLUSH_DEBUG