Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2011-05-20 13:38:28 -07:00
commit 102dc1bae1
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MAINTAINERS
View file

@ -5431,6 +5431,7 @@ F: include/linux/timex.h
F: kernel/time/clocksource.c F: kernel/time/clocksource.c
F: kernel/time/time*.c F: kernel/time/time*.c
F: kernel/time/ntp.c F: kernel/time/ntp.c
F: drivers/clocksource
TLG2300 VIDEO4LINUX-2 DRIVER TLG2300 VIDEO4LINUX-2 DRIVER
M: Huang Shijie <shijie8@gmail.com> M: Huang Shijie <shijie8@gmail.com>

2
kernel/time/clockevents.c
View file

@ -197,7 +197,7 @@ EXPORT_SYMBOL_GPL(clockevents_register_device);
static void clockevents_config(struct clock_event_device *dev, static void clockevents_config(struct clock_event_device *dev,
u32 freq) u32 freq)
{ {
unsigned long sec; u64 sec;
if (!(dev->features & CLOCK_EVT_FEAT_ONESHOT)) if (!(dev->features & CLOCK_EVT_FEAT_ONESHOT))
return; return;

2
kernel/time/clocksource.c
View file

@ -639,7 +639,7 @@ static void clocksource_enqueue(struct clocksource *cs)
*/ */
void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) 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 * Calc the maximum number of seconds which we can run before