Merge branches 'pm-cpufreq' and 'pm-cpuidle'

[cascardo/linux.git] / arch / blackfin / include / asm / timex.h

diff --git a/arch/blackfin/include/asm/timex.h b/arch/blackfin/include/asm/timex.h
index 22b0806..248aeb0 100644 (file)
--- a/arch/blackfin/include/asm/timex.h
+++ b/arch/blackfin/include/asm/timex.h
@@ -16,7 +16,7 @@ typedef unsigned long long cycles_t;
 static inline cycles_t get_cycles(void)
 {
        unsigned long tmp, tmp2;
-       __asm__("%0 = cycles; %1 = cycles2;" : "=d"(tmp), "=d"(tmp2));
+       __asm__ __volatile__("%0 = cycles; %1 = cycles2;" : "=d"(tmp), "=d"(tmp2));
        return tmp | ((cycles_t)tmp2 << 32);
 }