x86: move watchdog declarations from config.h to nmi.h

They don't belong into the former.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index 4fd6711e82e545cbb7eb7fec1cef29fca168afa1..c93812f0f956e2cc566ef2b1ed61e7e94bc70440 100644 (file)
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -18,6 +18,7 @@
 #include <xen/lib.h>
 #include <xen/mm.h>
 #include <xen/irq.h>
+#include <xen/nmi.h>
 #include <xen/delay.h>
 #include <xen/time.h>
 #include <xen/sched.h>

diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 7b124df2320e49be411c403c644c6b6343414366..252420cdfc2f8d1e3932fd5034fdd37595663b02 100644 (file)
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -12,6 +12,7 @@
 #include <xen/delay.h>
 #include <xen/dmi.h>
 #include <xen/irq.h>
+#include <xen/nmi.h>
 #include <xen/console.h>
 #include <xen/shutdown.h>
 #include <xen/acpi.h>

diff --git a/xen/common/gdbstub.c b/xen/common/gdbstub.c
index 09c61987420af0dab74e557a2df9d14ae91d26d5..737be8c8ea5ef2eeec8c7cd0407d095d4fc2acdc 100644 (file)
--- a/xen/common/gdbstub.c
+++ b/xen/common/gdbstub.c
@@ -38,6 +38,7 @@
 #include <xen/spinlock.h>
 #include <xen/serial.h>
 #include <xen/irq.h>
+#include <xen/nmi.h>
 #include <asm/debugger.h>
 #include <xen/init.h>
 #include <xen/smp.h>

diff --git a/xen/common/kexec.c b/xen/common/kexec.c
index 6dd20c65dd49f7dce3f3566929a8da662bfa8232..a6581a052d76cf37a9a71b6391b632f48a3d6dbe 100644 (file)
--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -12,6 +12,7 @@
 #include <xen/ctype.h>
 #include <xen/errno.h>
 #include <xen/guest_access.h>
+#include <xen/nmi.h>
 #include <xen/sched.h>
 #include <xen/types.h>
 #include <xen/kexec.h>

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 2c5c2301651384e13613b3876a39e5eb2a22f221..98a2c7fe26c24dc4a401432b3b00b52f29c53a8d 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -16,6 +16,7 @@
 #include <xen/ctype.h>
 #include <xen/perfc.h>
 #include <xen/mm.h>
+#include <xen/nmi.h>
 #include <xen/init.h>
 #include <asm/debugger.h>
 #include <asm/div64.h>

diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c
index b18ef5de6c0352cd64a350db071c022ed9aa6745..73a7d7b2a603966661fcc7dc47b0567682e2b159 100644 (file)
--- a/xen/common/shutdown.c
+++ b/xen/common/shutdown.c
@@ -4,6 +4,7 @@
 #include <xen/sched.h>
 #include <xen/domain.h>
 #include <xen/delay.h>
+#include <xen/nmi.h>
 #include <xen/shutdown.h>
 #include <xen/console.h>
 #ifdef CONFIG_KEXEC

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 8d081c3d7ba3e6452ad1af3c25e2e8a64bc00c7f..21d8eb472b1065d5b15a2aa72a8b42d891fd2e0d 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -20,6 +20,7 @@
 #include <xen/keyhandler.h>
 #include <xen/delay.h>
 #include <xen/guest_access.h>
+#include <xen/nmi.h>
 #include <xen/shutdown.h>
 #include <xen/video.h>
 #include <xen/kexec.h>

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index aae64c1009a2eabd5573f18ec4e4d87f584086ed..202fda158b635ca1c1552fa01fe5d4fa137fbbad 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -318,10 +318,4 @@ extern unsigned long xen_phys_start;
 
 #define ARCH_CRASH_SAVE_VMCOREINFO
 
-#ifndef __ASSEMBLY__
-extern void watchdog_disable(void);
-extern void watchdog_enable(void);
-extern void watchdog_setup(void);
-#endif
-
 #endif /* __X86_CONFIG_H__ */

diff --git a/xen/include/asm-x86/nmi.h b/xen/include/asm-x86/nmi.h
index 98b5e04341bf0e047ef2c7f8179e84c80126c3db..e9faa72f390cabb2a5720763289d001e630047ea 100644 (file)
--- a/xen/include/asm-x86/nmi.h
+++ b/xen/include/asm-x86/nmi.h
@@ -41,4 +41,8 @@ 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 */