summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2008-10-16 17:55:41 +0200
committerBryan Wu <cooloney@kernel.org>2008-10-16 17:55:41 +0200
commit1390da4ee75168b6e4d8354e93e3b5f0a0291f2f (patch)
treebd6aa0036949693e73b1f78d409d1ed9e300980b /arch/blackfin
parentBlackfin arch: disable CONFIG_HW_RANDOM and CONFIG_DAB in defconfig files (diff)
downloadlinux-1390da4ee75168b6e4d8354e93e3b5f0a0291f2f.tar.xz
linux-1390da4ee75168b6e4d8354e93e3b5f0a0291f2f.zip
Blackfin arch: make sure cycles is marked as volatile so gcc doesnt reorder on us
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/include/asm/timex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/timex.h b/arch/blackfin/include/asm/timex.h
index 22b0806161bb..248aeb066805 100644
--- 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);
}