Skip to content

x86: Remove old nmi_watchdog

Don Zickus lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 5 repliesIn review
  2. v12 patches 7 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3x86, NMI: Remove do_nmi_callback logicarch/x86/kernel/apic/hw_nmi.c arch/x86/kernel/apic/nmi.c arch/x86/kernel/traps.c+11 -330 replies
2/3x86, nmi_watchdog: remove the old nmi_watchdogDocumentation/kernel-parameters.txt arch/x86/include/asm/nmi.h arch/x86/kernel/apic/Makefile +6 more+16 -5773 replies
3/3x86, nmi_watchdog: remove all stub function calls from old nmi_watchdogarch/x86/include/asm/nmi.h arch/x86/include/asm/smpboot_hooks.h arch/x86/include/asm/timer.h +12 more+2 -8230 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH 0/3 v2] x86: Remove old nmi_watchdog

Ingo asked me to remove the old nmi_watchdog to minimize the amount of code duplication we have to do for recent fixes. All the functionality needed by the old nmi watchdog should be available in perf now.

This is done in two parts. The first part is simply remove the old code and leave stubs for the functions that were removed. This mimics the behaviour of the new nmi watchdog.

The second parts removes all the stub functions, which is probably a little more intrusive, but basically dead code anyway.

The only small piece left is the perf counter reservation code. That can't be removed until oprofile is modified to sit on top of perf (if that is possible).

Compile tested for 32/64 bit with the lockup detector turned on and off. Tested on 32/64 bit machines to make sure they still boot properly.

NOTE: This patch will clash with my nmi rewrite patch series. I don't which patch series will go in first. I can refresh either one once one of them is merged.

Don Zickus (3):
x86, NMI: Remove do_nmi_callback logic
x86, nmi_watchdog: remove the old nmi_watchdog x86, nmi_watchdog: remove all stub function calls from old
nmi_watchdog

 Documentation/kernel-parameters.txt    |   10 +-
 arch/x86/include/asm/nmi.h             |   51 ---
 arch/x86/include/asm/smpboot_hooks.h   |    1 -
 arch/x86/include/asm/timer.h           |    6 -
 arch/x86/kernel/apic/Makefile          |    5 +-
 arch/x86/kernel/apic/apic.c            |   15 +-
 arch/x86/kernel/apic/hw_nmi.c          |   27 +-
 arch/x86/kernel/apic/io_apic.c         |   46 ---
 arch/x86/kernel/apic/nmi.c             |  567 ----------------------------
 arch/x86/kernel/cpu/perf_event.c       |    9 -
 arch/x86/kernel/cpu/perfctr-watchdog.c |  642 --------------------------------
 arch/x86/kernel/smpboot.c              |   11 -
 arch/x86/kernel/time.c                 |   18 -
 arch/x86/kernel/traps.c                |   26 +-
 arch/x86/oprofile/nmi_timer_int.c      |    3 -
 drivers/acpi/acpica/nsinit.c           |    2 -
 drivers/watchdog/hpwdt.c               |    7 +-
 include/linux/nmi.h                    |    4 -
 kernel/sysctl.c                        |    9 +-
 kernel/sysctl_binary.c                 |    1 -
 kernel/watchdog.c                      |    2 +
 21 files changed, 29 insertions(+), 1433 deletions(-)
 delete mode 100644 arch/x86/kernel/apic/nmi.c
Signature · 1 line
1.7.3.2