aboutsummaryrefslogtreecommitdiffstats
path: root/xen/drivers
diff options
context:
space:
mode:
authorAndrew Cooper <andrew.cooper3@citrix.com>2013-08-13 14:29:00 +0200
committerJan Beulich <jbeulich@suse.com>2013-08-13 14:29:00 +0200
commitc8177e691f0f611240853326712d43482ec949bf (patch)
treec2063ee306f0c6a9c0927b2e3b114fe053193878 /xen/drivers
parent910daaf5aaa837624099c0fc5c373bea7202ff43 (diff)
downloadxen-c8177e691f0f611240853326712d43482ec949bf.tar.gz
xen-c8177e691f0f611240853326712d43482ec949bf.tar.bz2
xen-c8177e691f0f611240853326712d43482ec949bf.zip
watchdog: Move watchdog from being x86 specific to common code
Augment watchdog_setup() to be able to possibly return an error, and introduce watchdog_enabled() as a better alternative to knowing the architectures internal details. This patch does not change the x86 implementaion, beyond making it compile. For header files, some includes of xen/nmi.h were only for the watchdog functions, so are replaced rather than adding an extra include of xen/watchdog.h Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/drivers')
-rw-r--r--xen/drivers/char/console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 8ac32e4f22..52ffa70ec2 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -20,7 +20,7 @@
#include <xen/keyhandler.h>
#include <xen/delay.h>
#include <xen/guest_access.h>
-#include <xen/nmi.h>
+#include <xen/watchdog.h>
#include <xen/shutdown.h>
#include <xen/video.h>
#include <xen/kexec.h>