The patch titled highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode tweak has been removed from the -mm tree. Its filename was highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode-tweak.patch This patch was dropped because it was folded into highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode.patch ------------------------------------------------------ Subject: highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode tweak From: Andres Salomon <dilinger@xxxxxxxxxx> And an additional request, just to make it explicit that we should not have any NO_SOFTIRQ callbacks in the tree; warn if we encounter such a thing. Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx> Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/hrtimer.c | 1 + 1 file changed, 1 insertion(+) diff -puN kernel/hrtimer.c~highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode-tweak kernel/hrtimer.c --- a/kernel/hrtimer.c~highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode-tweak +++ a/kernel/hrtimer.c @@ -1131,6 +1131,7 @@ static inline void run_hrtimer_queue(str if (base->softirq_time.tv64 <= timer->expires.tv64) break; + WARN_ON_ONCE(timer->cb_mode == HRTIMER_CB_IRQSAFE_NO_SOFTIRQ); timer_stats_account_hrtimer(timer); fn = timer->function; _ Patches currently in -mm which might be from dilinger@xxxxxxxxxx are i386-make-x86_64-tsc-header-require-i386-rather-than-vice-versa.patch hrtimers-fix-hrtimer_cb_irqsafe_no_softirq-description.patch hrtimers-hrtimer_clock_base-description-typo.patch highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode.patch highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode-tweak.patch highres-do-not-run-the-timer_softirq-after-switching-to-highres-mode-tweak-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html