Commit-ID: c0e299b1a91cbdb21ae08e382a4176200398bc36
Gitweb: http://git.kernel.org/tip/c0e299b1a91cbdb21ae08e382a4176200398bc36
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Fri, 20 May 2011 10:50:52 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Fri, 20 May 2011 10:50:52 +0200
clockevents/source: Use u64 to make 32bit happy
unsigned long is not 64bit on 32bit machine.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
kernel/time/clockevents.c | 2 +-
kernel/time/clocksource.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 22a9da9..c027d4f 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 d9d5f8c..1c95fd6 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
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|