diff options
| author | Andrew Cooper <andrew.cooper3@citrix.com> | 2013-08-13 14:29:00 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-08-13 14:29:00 +0200 |
| commit | c8177e691f0f611240853326712d43482ec949bf (patch) | |
| tree | c2063ee306f0c6a9c0927b2e3b114fe053193878 /xen/include/asm-x86 | |
| parent | 910daaf5aaa837624099c0fc5c373bea7202ff43 (diff) | |
| download | xen-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/include/asm-x86')
| -rw-r--r-- | xen/include/asm-x86/config.h | 1 | ||||
| -rw-r--r-- | xen/include/asm-x86/nmi.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 0044edb060..cb7b2e4a05 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -49,6 +49,7 @@ #define CONFIG_XENOPROF 1 #define CONFIG_KEXEC 1 +#define CONFIG_WATCHDOG 1 #define HZ 100 diff --git a/xen/include/asm-x86/nmi.h b/xen/include/asm-x86/nmi.h index e9faa72f39..98b5e04341 100644 --- a/xen/include/asm-x86/nmi.h +++ b/xen/include/asm-x86/nmi.h @@ -41,8 +41,4 @@ long register_guest_nmi_callback(unsigned long address); */ long unregister_guest_nmi_callback(void); -void watchdog_disable(void); -void watchdog_enable(void); -void watchdog_setup(void); - #endif /* ASM_NMI_H */ |