aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-05-20 04:50:52 -0400
committerThomas Gleixner <tglx@linutronix.de>2011-05-20 04:50:52 -0400
commitc0e299b1a91cbdb21ae08e382a4176200398bc36 (patch)
tree096a6b082fcf1bd816d78654057d11af823361c5 /kernel/time
parent257313b2a87795e07a0bdf58d0fffbdba8b31051 (diff)
clockevents/source: Use u64 to make 32bit happy
unsigned long is not 64bit on 32bit machine. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/clockevents.c2
-rw-r--r--kernel/time/clocksource.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 22a9da9a9c96..c027d4f602f1 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -197,7 +197,7 @@ EXPORT_SYMBOL_GPL(clockevents_register_device);
197static void clockevents_config(struct clock_event_device *dev, 197static void clockevents_config(struct clock_event_device *dev,
198 u32 freq) 198 u32 freq)
199{ 199{
200 unsigned long sec; 200 u64 sec;
201 201
202 if (!(dev->features & CLOCK_EVT_FEAT_ONESHOT)) 202 if (!(dev->features & CLOCK_EVT_FEAT_ONESHOT))
203 return; 203 return;
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)
639 */ 639 */
640void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) 640void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq)
641{ 641{
642 unsigned long sec; 642 u64 sec;
643 643
644 /* 644 /*
645 * Calc the maximum number of seconds which we can run before 645 * Calc the maximum number of seconds which we can run before