From 37b6de7d37580c45d86d0756c125aeb13fd82158 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 16 Oct 2008 23:55:41 +0800 Subject: [PATCH] --- yaml --- r: 115171 b: refs/heads/master c: 1390da4ee75168b6e4d8354e93e3b5f0a0291f2f h: refs/heads/master i: 115169: d8bff7fc9eccf6cd7bf86f3fabea654a88878319 115167: 0f6852e12e8041fbcf58b4ea5cf19c0806f566da v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/timex.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27de731d5ada..bb1dfea3ad21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed061b7ac8afb1181c6195aa502a8a7ef7ac3015 +refs/heads/master: 1390da4ee75168b6e4d8354e93e3b5f0a0291f2f diff --git a/trunk/arch/blackfin/include/asm/timex.h b/trunk/arch/blackfin/include/asm/timex.h index 22b0806161bb..248aeb066805 100644 --- a/trunk/arch/blackfin/include/asm/timex.h +++ b/trunk/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); }