timer fixes

GIT PULL Thomas Gleixner 1 participant 1 message May 20, 2011

Subsystems (2)

Timekeeping, clocksource core, NTP, alarmtimer High-resolution timers, timer wheel, clockevents

lore

Share & tools

lore

Thomas Gleixner

author

2011-05-20 17:52 UTC #0 lore raw

Linus,

Please pull the latest timers-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-fixes-for-linus

Thanks,

tglx

------------------>
Thomas Gleixner (2):
clockevents/source: Use u64 to make 32bit happy
MAINTAINERS: Add drivers/clocksource to TIMEKEEPING

 MAINTAINERS               |    1 +
 kernel/time/clockevents.c |    2 +-
 kernel/time/clocksource.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

MAINTAINERS +1 -0

index 8df8d2d..e20c974 100644
@@ -5431,6 +5431,7 @@ F:	include/linux/timex.h
 F:	kernel/time/clocksource.c
 F:	kernel/time/time*.c
 F:	kernel/time/ntp.c
+F:	drivers/clocksource
 
 TLG2300 VIDEO4LINUX-2 DRIVER
 M:	Huang Shijie <[email protected]>

kernel/time/clockevents.c +1 -1

index 22a9da9..c027d4f 100644
@@ -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;

kernel/time/clocksource.c +1 -1

index d9d5f8c..1c95fd6 100644
@@ -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