Prev: [PATCH 8/8] [watchdog] separate touch_nmi_watchdog code path from touch_watchdog
Next: s2ram slow resume - radeon versus no_console_suspend?
From: Don Zickus on 7 May 2010 17:20
This patch series covers mostly the changes necessary for combining the
nmi_watchdog and softlockup code. Also added are the cleanups associated
with the change, like removing the old files.

The changelogs in each patch are more specific to what the changes are.

V2:
reworked patch 2 to not change the touch_softlockup_watchdog api but instead
do some cleanups here and there. This caused patches 7 and 8 to be changed a
bit to handle the new differences.

Don Zickus (8):
[watchdog] combine nmi_watchdog and softlockup
[nmi watchdog] touch_softlockup cleanups and softlockup_tick removal
[watchdog] remove old softlockup code
[watchdog] remove nmi_watchdog.c file
[x86] watchdog: move trigger_all_cpu_backtrace to its own die_notifier
[x86] watchdog: cleanup hw_nmi.c cruft
[watchdog] resolve softlockup.c conflicts
[watchdog] separate touch_nmi_watchdog code path from touch_watchdog

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 | 14 +-
init/Kconfig | 5 +-
kernel/Makefile | 3 +-
kernel/kgdb.c | 6 +-
kernel/nmi_watchdog.c | 259 ----------------
kernel/softlockup.c | 278 -----------------
kernel/sysctl.c | 52 ++--
kernel/timer.c | 1 -
kernel/watchdog.c | 564 +++++++++++++++++++++++++++++++++++
lib/Kconfig.debug | 30 ++-
16 files changed, 684 insertions(+), 667 deletions(-)
delete mode 100644 kernel/nmi_watchdog.c
delete mode 100644 kernel/softlockup.c
create mode 100644 kernel/watchdog.c

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 8/8] [watchdog] separate touch_nmi_watchdog code path from touch_watchdog
Next: s2ram slow resume - radeon versus no_console_suspend?