patch-2.3.99-pre6 linux/arch/ppc/mm/init.c

Next file: linux/arch/sh/defconfig
Previous file: linux/arch/ppc/mm/fault.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre5/linux/arch/ppc/mm/init.c linux/arch/ppc/mm/init.c
@@ -87,7 +87,7 @@
 extern int num_memory;
 extern struct mem_info memory[];
 extern boot_infos_t *boot_infos;
-#ifndef __SMP__
+#ifndef CONFIG_SMP
 struct pgtable_cache_struct quicklists;
 #endif
 
@@ -278,9 +278,9 @@
 	show_buffers();
 	printk("%-8s %3s %8s %8s %8s %9s %8s", "Process", "Pid",
 	       "Ctx", "Ctx<<4", "Last Sys", "pc", "task");
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	printk(" %3s", "CPU");
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 	printk("\n");
 	for_each_task(p)
 	{
@@ -294,7 +294,7 @@
 		       (ulong)p);
 		{
 			int iscur = 0;
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 			printk("%3d ", p->processor);
 			if ( (p->processor != NO_PROC_ID) &&
 			     (p == current_set[p->processor]) )
@@ -315,7 +315,7 @@
 					printk(",");
 				printk("last math");
 			}			
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 			printk("\n");
 		}
 	}
@@ -495,7 +495,7 @@
 {
 	__clear_user(Hash, Hash_size);
 	_tlbia();
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	smp_send_tlb_invalidate(0);
 #endif	
 }
@@ -511,7 +511,7 @@
 	mm->context = NO_CONTEXT;
 	if (mm == current->mm)
 		activate_mm(mm, mm);
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	smp_send_tlb_invalidate(0);
 #endif	
 }
@@ -523,7 +523,7 @@
 		flush_hash_page(vma->vm_mm->context, vmaddr);
 	else
 		flush_hash_page(0, vmaddr);
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	smp_send_tlb_invalidate(0);
 #endif	
 }
@@ -551,7 +551,7 @@
 	{
 		flush_hash_page(mm->context, start);
 	}
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	smp_send_tlb_invalidate(0);
 #endif	
 }
@@ -575,7 +575,7 @@
 	}
 	read_unlock(&tasklist_lock);
 	flush_hash_segments(0x10, 0xffffff);
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	smp_send_tlb_invalidate(0);
 #endif	
 	atomic_set(&next_mmu_context, 0);
@@ -663,7 +663,7 @@
 }
 
 #define IO_PAGE	(_PAGE_NO_CACHE | _PAGE_GUARDED | _PAGE_RW)
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 #define RAM_PAGE (_PAGE_RW|_PAGE_COHERENT)
 #else
 #define RAM_PAGE (_PAGE_RW)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)