Jan Beulich
2013-Feb-14 17:01 UTC
[PATCH] 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> --- 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> --- 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> --- 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> --- 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> --- 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> --- 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 --- 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> --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -317,10 +317,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__ */ --- a/xen/include/asm-x86/nmi.h +++ b/xen/include/asm-x86/nmi.h @@ -41,4 +41,8 @@ long register_guest_nmi_callback(unsigne */ long unregister_guest_nmi_callback(void); +void watchdog_disable(void); +void watchdog_enable(void); +void watchdog_setup(void); + #endif /* ASM_NMI_H */ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Keir Fraser
2013-Feb-14 20:53 UTC
Re: [PATCH] x86: move watchdog declarations from config.h to nmi.h
On 14/02/2013 17:01, "Jan Beulich" <JBeulich@suse.com> wrote:> They don''t belong into the former. > > Signed-off-by: Jan Beulich <jbeulich@suse.com>Acked-by: Keir Fraser <keir@xen.org>> --- 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> > --- 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> > --- 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> > --- 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> > --- 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> > --- 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 > --- 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> > --- a/xen/include/asm-x86/config.h > +++ b/xen/include/asm-x86/config.h > @@ -317,10 +317,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__ */ > --- a/xen/include/asm-x86/nmi.h > +++ b/xen/include/asm-x86/nmi.h > @@ -41,4 +41,8 @@ long register_guest_nmi_callback(unsigne > */ > long unregister_guest_nmi_callback(void); > > +void watchdog_disable(void); > +void watchdog_enable(void); > +void watchdog_setup(void); > + > #endif /* ASM_NMI_H */ > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel