A couple of small fixes to address issues caused by removing the old nmi watchdog

Applied on top of Ingo's latest master branch.

Don Zickus (2):
  lockup detector:  Compile fixes from removing the old x86 nmi
    watchdog
  x86, NMI: add back unknown_nmi_panic and nmi_watchdog sysctls

 Documentation/kernel-parameters.txt |   10 +---------
 arch/x86/kernel/apic/hw_nmi.c       |   12 ++++++++----
 arch/x86/kernel/traps.c             |   16 +++++++++++-----
 include/linux/nmi.h                 |    4 +++-
 kernel/sysctl.c                     |   16 ++++++++++++++++
 kernel/sysctl_binary.c              |    1 -
 kernel/watchdog.c                   |    2 ++
 7 files changed, 41 insertions(+), 20 deletions(-)

-- 
1.7.3.2

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