Re: [GIT PULL] Unified lockup detector

[Ingo Molnar]

* Frederic Weisbecker <fweisbec@xxxxxxxxx> wrote:

> Ingo,
> 
> Please pull the perf/nmi branch that can be found at:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> 	perf/nmi
> 
> There is also a merge of v2.6.34-rc7 to catch up with latest
> softlockup changes and prevent from conflicts.
> 
> Thanks,
> 	Frederic
> ---
> 
> Don Zickus (7):
>       lockup_detector: Combine nmi_watchdog and softlockup detector
>       lockup_detector: Touch_softlockup cleanups and softlockup_tick removal
>       lockup_detector: Remove old softlockup code
>       lockup_detector: Remove nmi_watchdog.c file
>       x86: Move trigger_all_cpu_backtrace to its own die_notifier
>       x86: Cleanup hw_nmi.c cruft
>       lockup_detector: Separate touch_nmi_watchdog code path from touch_watchdog
> 
> Frederic Weisbecker (2):
>       lockup_detector: Make BOOTPARAM_SOFTLOCKUP_PANIC depend on LOCKUP_DETECTOR
>       lockup_detector: Fix forgotten config conversion
> 
> 
>  Documentation/kernel-parameters.txt |    2 +
>  arch/x86/include/asm/nmi.h          |    2 +-
>  arch/x86/kernel/apic/Makefile       |    4 +-
>  arch/x86/kernel/apic/hw_nmi.c       |  119 +++-----
>  arch/x86/kernel/traps.c             |    4 +-
>  include/linux/nmi.h                 |    8 +-
>  include/linux/sched.h               |   12 +-
>  init/Kconfig                        |    5 +-
>  kernel/Makefile                     |    3 +-
>  kernel/nmi_watchdog.c               |  259 ----------------
>  kernel/softlockup.c                 |  293 ------------------
>  kernel/sysctl.c                     |   52 ++--
>  kernel/timer.c                      |    1 -
>  kernel/watchdog.c                   |  564 +++++++++++++++++++++++++++++++++++
>  lib/Kconfig.debug                   |   32 ++-
>  15 files changed, 679 insertions(+), 681 deletions(-)

Pulled, thanks a lot guys! Was a long process, but the end result looks pretty 
nifty IMO.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/