summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTero Kristo <tero.kristo@nokia.com>2009-10-26 15:10:40 +0200
committerKevin Hilman <khilman@deeprootsystems.com>2010-01-20 18:16:02 -0800
commitafbcf6197d78aed814e90bad6099ecfbeb756ec1 (patch)
treed84a99a5f61eca7dd15eae6e4b67f181815ef7de /arch/arm
parenta174e609b5b9b3bc1c5859402be8d8d88f6e098c (diff)
downloadlinux-3.10-afbcf6197d78aed814e90bad6099ecfbeb756ec1.tar.gz
linux-3.10-afbcf6197d78aed814e90bad6099ecfbeb756ec1.tar.bz2
linux-3.10-afbcf6197d78aed814e90bad6099ecfbeb756ec1.zip
OMAP3: CPUidle: Fixed timer resolution
Previously used u32 as temporary data storage that wraps around at 4.294s. Signed-off-by: Tero Kristo <tero.kristo@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/cpuidle34xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index a26d6a08ae3..12f0cbfc289 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -137,7 +137,7 @@ return_sleep_time:
local_irq_enable();
local_fiq_enable();
- return (u32)timespec_to_ns(&ts_idle)/1000;
+ return ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * USEC_PER_SEC;
}
/**