--- zzzz-none-000/linux-2.6.28.10/arch/arm/include/asm/timex.h	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/arm/include/asm/timex.h	2009-10-22 15:52:24.000000000 +0000
@@ -16,9 +16,19 @@
 
 typedef unsigned long cycles_t;
 
+#if defined(CONFIG_ARCH_PUMA5) && defined(CONFIG_HIGH_RES_TIMERS)
+
+extern cycles_t get_puma_cpu_cycles(void);
+
+static inline cycles_t get_cycles(void) {
+	return get_puma_cpu_cycles();
+}
+
+#else
 static inline cycles_t get_cycles (void)
 {
 	return 0;
 }
+#endif
 
 #endif