From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 15 Feb 2013 08:47:17 +0000 (+0100)
Subject: x86: move watchdog declarations from config.h to nmi.h
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7289
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8ce2e609236cc951bfbaa460a8778b16cccb0fcd;p=xen.git

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 4fd6711e82..c93812f0f9 100644
--- 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 7b124df232..252420cdfc 100644
--- 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 09c6198742..737be8c8ea 100644
--- 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 6dd20c65dd..a6581a052d 100644
--- 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 2c5c230165..98a2c7fe26 100644
--- 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 b18ef5de6c..73a7d7b2a6 100644
--- 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 8d081c3d7b..21d8eb472b 100644
--- 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 aae64c1009..202fda158b 100644
--- 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 98b5e04341..e9faa72f39 100644
--- 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 */