patch-2.4.21 linux-2.4.21/arch/ia64/kernel/smpboot.c

Next file: linux-2.4.21/arch/ia64/kernel/sys_ia64.c
Previous file: linux-2.4.21/arch/ia64/kernel/smp.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/arch/ia64/kernel/smpboot.c linux-2.4.21/arch/ia64/kernel/smpboot.c
@@ -89,7 +89,7 @@
 struct smp_boot_data smp_boot_data __initdata;
 
 /* Set when the idlers are all forked */
-volatile int smp_threads_ready;
+int smp_threads_ready;
 
 unsigned long ap_wakeup_vector = -1; /* External Int use to wakeup APs */
 
@@ -321,7 +321,7 @@
 	extern void ia64_init_itm(void);
 
 #ifdef CONFIG_PERFMON
-	extern void perfmon_init_percpu(void);
+	extern void pfm_init_percpu(void);
 #endif
 
 	cpuid = smp_processor_id();
@@ -356,7 +356,7 @@
 #endif
 
 #ifdef CONFIG_PERFMON
-	perfmon_init_percpu();
+	pfm_init_percpu();
 #endif
 
 	local_irq_enable();

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