patch-2.2.17 linux/arch/s390/kernel/time.c

Next file: linux/arch/s390/lib/delay.c
Previous file: linux/arch/s390/kernel/smp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.16/arch/s390/kernel/time.c linux/arch/s390/kernel/time.c
@@ -145,7 +145,7 @@
  * as well as call the "do_timer()" routine every clocktick
  */
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 extern __u16 boot_cpu_addr;
 #endif
 
@@ -160,7 +160,7 @@
  
         save_flags(flags);
         cli();
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	if(S390_lowcore.cpu_data.cpu_addr==boot_cpu_addr) {
 		write_lock(&xtime_lock);
 		last_timer_cc = S390_lowcore.jiffy_timer_cc;
@@ -177,7 +177,7 @@
  * profiling, except when we simulate SMP mode on a uniprocessor
  * system, in that case we have to call the local interrupt handler.
  */
-#ifdef __SMP__
+#ifdef CONFIG_SMP
         /* when SMP, do smp_local_timer_interrupt for *all* CPUs,
            but only do the rest for the boot CPU */
         smp_local_timer_interrupt(regs);
@@ -186,12 +186,12 @@
                 s390_do_profile(regs->psw.addr);
 #endif
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	if(S390_lowcore.cpu_data.cpu_addr==boot_cpu_addr)
 #endif
 	{
 		do_timer(regs);
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 		write_unlock(&xtime_lock);
 #endif
 	}

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