summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-05-20 10:50:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2011-05-20 10:50:52 +0200
commitc0e299b1a91cbdb21ae08e382a4176200398bc36 (patch)
tree096a6b082fcf1bd816d78654057d11af823361c5 /kernel
parent257313b2a87795e07a0bdf58d0fffbdba8b31051 (diff)
downloadkernel-common-c0e299b1a91cbdb21ae08e382a4176200398bc36.tar.gz
kernel-common-c0e299b1a91cbdb21ae08e382a4176200398bc36.tar.bz2
kernel-common-c0e299b1a91cbdb21ae08e382a4176200398bc36.zip
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')
-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);
static void clockevents_config(struct clock_event_device *dev,
u32 freq)
{
- unsigned long sec;
+ u64 sec;
if (!(dev->features & CLOCK_EVT_FEAT_ONESHOT))
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)
*/
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