The patch titled dynticks: core, NMI watchdog fix, #2 has been removed from the -mm tree. Its filename is dynticks-core-nmi-watchdog-fix-2.patch This patch was dropped because an updated version was merged ------------------------------------------------------ Subject: dynticks: core, NMI watchdog fix, #2 From: Ingo Molnar <mingo@xxxxxxx> A partial fix of the NMI watchdog bug sneaked into yesterday night's queue - this patch removes that extra in_interrupt() condition. (One effect of this bug is a 'slow' serial console on NO_HZ, because we never update jiffies and the serial console's timeouts get confused by it.) Signed-off-by: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- kernel/softirq.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/softirq.c~dynticks-core-nmi-watchdog-fix-2 kernel/softirq.c --- a/kernel/softirq.c~dynticks-core-nmi-watchdog-fix-2 +++ a/kernel/softirq.c @@ -280,7 +280,7 @@ void irq_enter(void) { __irq_enter(); #ifdef CONFIG_NO_HZ - if (idle_cpu(smp_processor_id()) && !in_interrupt()) + if (idle_cpu(smp_processor_id())) hrtimer_update_jiffies(); #endif } _ Patches currently in -mm which might be from mingo@xxxxxxx are forcedeth-hardirq-lockdep-warning.patch bonding-lockdep-annotation.patch spinlock-debug-all-cpu-backtrace.patch spinlock-debug-all-cpu-backtrace-fix.patch spinlock-debug-all-cpu-backtrace-fix-2.patch spinlock-debug-all-cpu-backtrace-fix-3.patch remove-the-old-bd_mutex-lockdep-annotation.patch new-bd_mutex-lockdep-annotation.patch sched-add-above-background-load-function.patch mm-implement-swap-prefetching.patch sched-cleanup-remove-task_t-convert-to-struct-task_struct-prefetch.patch dynticks-core-nmi-watchdog-fix-2.patch dynticks-core-fix-idle-time-accounting.patch dyntick-add-nohz-stats-to-proc-stat.patch dynticks-i386-arch-code.patch high-res-timers-dynticks-enable-i386-support.patch debugging-feature-timer-stats.patch debugging-feature-timer-stats-fix.patch detect-atomic-counter-underflows.patch debug-shared-irqs.patch make-frame_pointer-default=y.patch mutex-subsystem-synchro-test-module.patch vdso-print-fatal-signals.patch vdso-improve-print_fatal_signals-support-by-adding-memory-maps.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