On Fri, Apr 23, 2010 at 12:13:28PM -0400, Don Zickus wrote:
quoted text
> 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.


Thanks,

I'll review it soon!



quoted text
> 
> Don Zickus (8):
>   [watchdog] combine nmi_watchdog and softlockup
>   [watchdog] convert touch_softlockup_watchdog to touch_watchdog
>   [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/ia64/kernel/time.c             |    2 +-
>  arch/ia64/kernel/uncached.c         |    2 +-
>  arch/ia64/xen/time.c                |    2 +-
>  arch/mn10300/kernel/gdb-stub.c      |    2 +-
>  arch/powerpc/kernel/swsusp_64.c     |    2 +-
>  arch/sparc/kernel/nmi.c             |    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/apic/nmi.c          |    2 +-
>  arch/x86/kernel/traps.c             |    4 +-
>  arch/x86/xen/smp.c                  |    2 +-
>  drivers/ide/ide-iops.c              |    2 +-
>  drivers/ide/ide-taskfile.c          |    2 +-
>  drivers/mtd/nand/nand_base.c        |    4 +-
>  drivers/video/nvidia/nv_accel.c     |    2 +-
>  include/linux/nmi.h                 |   13 +-
>  include/linux/sched.h               |   20 +-
>  init/Kconfig                        |    5 +-
>  kernel/Makefile                     |    3 +-
>  kernel/kgdb.c                       |    6 +-
>  kernel/nmi_watchdog.c               |  259 ----------------
>  kernel/panic.c                      |    2 +-
>  kernel/power/hibernate.c            |    2 +-
>  kernel/sched.c                      |    2 +-
>  kernel/sched_clock.c                |    2 +-
>  kernel/softlockup.c                 |  278 -----------------
>  kernel/sysctl.c                     |   52 ++--
>  kernel/time/tick-sched.c            |    8 +-
>  kernel/time/timekeeping.c           |    2 +-
>  kernel/timer.c                      |    1 -
>  kernel/watchdog.c                   |  568 +++++++++++++++++++++++++++++++++++
>  lib/Kconfig.debug                   |   30 ++-
>  34 files changed, 713 insertions(+), 697 deletions(-)
>  delete mode 100644 kernel/nmi_watchdog.c
>  delete mode 100644 kernel/softlockup.c
>  create mode 100644 kernel/watchdog.c
> 

--
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/