patch-2.4.4 linux/arch/ia64/sn/sn1/smp.c

Next file: linux/arch/ia64/sn/sn1/sn1_asm.S
Previous file: linux/arch/ia64/sn/sn1/setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.3/linux/arch/ia64/sn/sn1/smp.c linux/arch/ia64/sn/sn1/smp.c
@@ -124,10 +124,10 @@
 
 #ifdef CONFIG_SMP
 
+#ifdef PTC_NOTYET
 static void __init
 process_sal_ptc_domain_info(ia64_sal_ptc_domain_info_t *di, int domain)
 {
-#ifdef PTC_NOTYET
 	ia64_sal_ptc_domain_proc_entry_t	*pe;
 	int 					i, sapicid, cpuid;
 
@@ -138,7 +138,6 @@
 		sn_sapicid_info[cpuid].domain = domain;
 		sn_sapicid_info[cpuid].sapicid = sapicid;
 	}
-#endif
 }
 
 
@@ -153,6 +152,7 @@
 		process_sal_ptc_domain_info(di, i);	
 	}
 }
+#endif
 
 
 void __init
@@ -179,7 +179,7 @@
 {
 
 #ifdef PTC_NOTYET
-	sn_sapicid_info[0].sapicid = hard_processor_sapicid();
+	sn_sapicid_info[0].sapicid = hard_smp_processor_id();
 #endif
 }
 

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