timer fixes for 2.6.31
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
------------------>
Heiko Carstens (1):
timer stats: fix quick check optimization
Thomas Gleixner (2):
hrtimer: migration: do not check expiry time on current CPU
hrtimer: Fix migration expiry check
include/linux/clockchips.h | 9 ---- include/linux/hrtimer.h | 2 +- kernel/hrtimer.c | 110 +++++++++++++++++++++++++------------------ kernel/time/clockevents.c | 11 ---- 4 files changed, 65 insertions(+), 67 deletions(-)
include/linux/clockchips.h +0 -9
@@ -143,12 +143,3 @@ extern void clockevents_notify(unsigned long reason, void *arg);#endif #endif - -#ifdef CONFIG_GENERIC_CLOCKEVENTS -extern ktime_t clockevents_get_next_event (int cpu); -#else -static inline ktime_t clockevents_get_next_event (int cpu) -{ -return (ktime_t ) { .tv64 =KTIME_MAX }; -} -#endif
include/linux/hrtimer.h +1 -1
@@ -448,7 +448,7 @@ extern void timer_stats_update_stats(void *timer, pid_t pid, void *startf,static inline void timer_stats_account_hrtimer (struct hrtimer *timer) { -if (likely (!timer->start_pid)) +if (likely (!timer->start_site))return ;timer_stats_update_stats (timer, timer->start_pid, timer->start_site, timer->function, timer->start_comm,0 );
kernel/hrtimer.c +64 -46
156 lines not on this page · raw message
kernel/time/clockevents.c +0 -11
@@ -254,15 +254,4 @@ void clockevents_notify(unsigned long reason, void *arg) spin_unlock(&clockevents_lock); }EXPORT_SYMBOL_GPL (clockevents_notify); - -ktime_t clockevents_get_next_event (int cpu) -{ -struct tick_device *td; -struct clock_event_device *dev; - - td = &per_cpu (tick_cpu_device, cpu); - dev = td->evtdev; - -return dev->next_event; -}#endif
Quoted 6 lines · Thomas Gleixner
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.gittimers-fixes-for-linus
Quoted 7 lines
Thanks,
tglx
------------------>
Heiko Carstens (1):
timer stats: fix quick check optimization
hmm... this patch was not pulled.
Quoted 13 lines
include/linux/hrtimer.h +1
-1@@ -448,7 +448,7 @@ extern void timer_stats_update_stats(void *timer, pid_t pid, void *startf,static inline void timer_stats_account_hrtimer (struct hrtimer *timer) { -if (likely (!timer->start_pid)) +if (likely (!timer->start_site))return ;timer_stats_update_stats (timer, timer->start_pid, timer->start_site, timer->function, timer->start_comm,0 );
Quoted 9 lines · Heiko Carstens
Quoted 8 lines · Thomas Gleixner
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.gittimers-fixes-for-linusThanks,
Quoted 7 lines
Quoted 5 lines
tglx
------------------>
Heiko Carstens (1):
timer stats: fix quick check optimizationhmm... this patch was not pulled.
Because a certain moron did not push it out. :(
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
The patch was in the last pull request already, but I did not push it out :(
Thanks,
tglx
------------------>
Heiko Carstens (1):
timer stats: fix quick check optimization
include/linux/hrtimer.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/hrtimer.h +1 -1
@@ -448,7 +448,7 @@ extern void timer_stats_update_stats(void *timer, pid_t pid, void *startf,static inline void timer_stats_account_hrtimer (struct hrtimer *timer) { -if (likely (!timer->start_pid)) +if (likely (!timer->start_site))return ;timer_stats_update_stats (timer, timer->start_pid, timer->start_site, timer->function, timer->start_comm,0 );