[GIT PULL] Lockup detector build fixes

[Frederic Weisbecker]

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

Thanks,
	Frederic
---

Frederic Weisbecker (3):
      lockup_detector: Update some config
      lockup_detector: Adapt CONFIG_PERF_EVENT_NMI to other archs
      lockup_detector: Introduce CONFIG_HARDLOCKUP_DETECTOR

Don Zickus (1):
      lockup_detector: Cross arch compile fixes


 arch/Kconfig                  |    7 +++++++
 arch/x86/Kconfig              |    2 +-
 arch/x86/kernel/apic/Makefile |    4 ++--
 include/linux/nmi.h           |    2 +-
 init/Kconfig                  |    8 --------
 kernel/watchdog.c             |   21 ++++++++++++---------
 lib/Kconfig.debug             |   28 ++++++----------------------
 7 files changed, 29 insertions(+), 43 deletions(-)
--
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/