diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 22:38:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 22:38:28 +0200 |
| commit | 102dc1bae12a20214c9ee2d33a7402dc5175e30d (patch) | |
| tree | dbc2364c164db3743bd86ff02557369daac0fac4 /kernel/time/clocksource.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | MAINTAINERS: Add drivers/clocksource to TIMEKEEPING (diff) | |
| download | linux-102dc1bae12a20214c9ee2d33a7402dc5175e30d.tar.xz linux-102dc1bae12a20214c9ee2d33a7402dc5175e30d.zip | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
MAINTAINERS: Add drivers/clocksource to TIMEKEEPING
clockevents/source: Use u64 to make 32bit happy
Diffstat (limited to 'kernel/time/clocksource.c')
| -rw-r--r-- | kernel/time/clocksource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index d9d5f8c885f6..1c95fd677328 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -639,7 +639,7 @@ static void clocksource_enqueue(struct clocksource *cs) */ void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) { - unsigned long sec; + u64 sec; /* * Calc the maximum number of seconds which we can run before |