--- linux/arch/ia64/kernel/setup.c.macro	Sat Sep  9 17:20:57 2000
+++ linux/arch/ia64/kernel/setup.c	Sat Sep  9 17:21:25 2000
@@ -320,7 +320,7 @@ get_cpuinfo (char *buffer)
 			     features,
 			     c->ppn, c->number, c->proc_freq / 1000000, c->proc_freq % 1000000,
 			     c->itc_freq / 1000000, c->itc_freq % 1000000,
-			     loops_per_sec() / 500000, (loops_per_sec() / 5000) % 100);
+			     ia64_loops_per_sec() / 500000, (ia64_loops_per_sec() / 5000) % 100);
         }
 	return p - buffer;
 }
--- linux/include/asm-ia64/processor.h.macro	Sat Sep  9 17:20:05 2000
+++ linux/include/asm-ia64/processor.h	Sat Sep  9 17:20:27 2000
@@ -253,9 +253,9 @@ struct cpuinfo_ia64 {
 #define my_cpu_data		cpu_data[smp_processor_id()]
 
 #ifdef CONFIG_SMP
-# define loops_per_sec()	my_cpu_data.loops_per_sec
+# define ia64_loops_per_sec()	my_cpu_data.loops_per_sec
 #else
-# define loops_per_sec()	loops_per_sec
+# define ia64_loops_per_sec()	loops_per_sec
 #endif
 
 extern struct cpuinfo_ia64 cpu_data[NR_CPUS];