]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h
authorGuenter Roeck <linux@roeck-us.net>
Fri, 4 Sep 2015 22:45:12 +0000 (15:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Sep 2015 23:54:41 +0000 (16:54 -0700)
commitaacfbe6a9724bb6d66a656a5abcc681d5649ed92
tree988577d42c81b31aec1ab1c0c0282e12b0b9703d
parent314b08ff5205420d956d14657e16d92c460a6f21
kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h

The kernel's NMI watchdog has nothing to do with the watchdog subsystem.
Its header declarations should be in linux/nmi.h, not linux/watchdog.h.

The code provided two sets of dummy functions if HARDLOCKUP_DETECTOR is
not configured, one in the include file and one in kernel/watchdog.c.
Remove the dummy functions from kernel/watchdog.c and use those from the
include file.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: Stephane Eranian <eranian@google.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Don Zickus <dzickus@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/cpu/perf_event_intel.c
include/linux/nmi.h
include/linux/watchdog.h
kernel/watchdog.c