diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-08-14 09:47:28 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-15 04:55:46 -0400 |
commit | 0a54419836254a27baecd9037103171bcbabaf67 (patch) | |
tree | ad4dc7ca1fc974a53c7fc2e972558bcb6b786afe /arch/arm/plat-omap | |
parent | 23ce72117c714baab794e66c8daf343bf6a912bf (diff) |
timekeeping: Move NTP adjusted clock multiplier to struct timekeeper
The clocksource structure has two multipliers, the unmodified multiplier
clock->mult_orig and the NTP corrected multiplier clock->mult. The NTP
multiplier is misplaced in the struct clocksource, this is private
information of the timekeeping code. Add the mult field to the struct
timekeeper to contain the NTP corrected value, keep the unmodifed
multiplier in clock->mult and remove clock->mult_orig.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: John Stultz <johnstul@us.ibm.com>
Cc: Daniel Walker <dwalker@fifo99.com>
LKML-Reference: <20090814134810.149047645@de.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/common.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index ebcf006406f9..95587b6c0259 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
@@ -253,11 +253,8 @@ static struct clocksource clocksource_32k = { | |||
253 | */ | 253 | */ |
254 | unsigned long long sched_clock(void) | 254 | unsigned long long sched_clock(void) |
255 | { | 255 | { |
256 | unsigned long long ret; | 256 | return clocksource_cyc2ns(clocksource_32k.read(&clocksource_32k), |
257 | 257 | clocksource_32k.mult, clocksource_32k.shift); | |
258 | ret = (unsigned long long)clocksource_32k.read(&clocksource_32k); | ||
259 | ret = (ret * clocksource_32k.mult_orig) >> clocksource_32k.shift; | ||
260 | return ret; | ||
261 | } | 258 | } |
262 | 259 | ||
263 | static int __init omap_init_clocksource_32k(void) | 260 | static int __init omap_init_clocksource_32k(void) |