1.1 --- a/xen/arch/x86/oprofile/nmi_int.c	Fri Apr 21 17:18:53 2006 +0100
     1.2 +++ b/xen/arch/x86/oprofile/nmi_int.c	Fri Apr 21 17:19:19 2006 +0100
     1.3 @@ -15,8 +15,8 @@
     1.4  #include <xen/types.h>
     1.5  #include <xen/errno.h>
     1.6  #include <xen/init.h>
     1.7 +#include <xen/nmi.h>
     1.8  #include <public/xen.h>
     1.9 -#include <asm/nmi.h>
    1.10  #include <asm/msr.h>
    1.11  #include <asm/apic.h>
    1.12  #include <asm/regs.h>

     2.1 --- a/xen/arch/x86/traps.c	Fri Apr 21 17:18:53 2006 +0100
     2.2 +++ b/xen/arch/x86/traps.c	Fri Apr 21 17:19:19 2006 +0100
     2.3 @@ -43,6 +43,7 @@
     2.4  #include <xen/domain_page.h>
     2.5  #include <xen/symbols.h>
     2.6  #include <xen/iocap.h>
     2.7 +#include <xen/nmi.h>
     2.8  #include <asm/shadow.h>
     2.9  #include <asm/system.h>
    2.10  #include <asm/io.h>
    2.11 @@ -56,7 +57,6 @@
    2.12  #include <asm/debugger.h>
    2.13  #include <asm/msr.h>
    2.14  #include <asm/x86_emulate.h>
    2.15 -#include <asm/nmi.h>
    2.16  
    2.17  /*
    2.18   * opt_nmi: one of 'ignore', 'dom0', or 'fatal'.

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xen/include/xen/nmi.h	Fri Apr 21 17:19:19 2006 +0100
     3.3 @@ -0,0 +1,14 @@
     3.4 +/******************************************************************************
     3.5 + * nmi.h
     3.6 + *
     3.7 + * Register and unregister NMI callbacks.
     3.8 + *
     3.9 + * Copyright (c) 2006, Ian Campbell <ian.campbell@xensource.com>
    3.10 + */
    3.11 +
    3.12 +#ifndef __XEN_NMI_H__
    3.13 +#define __XEN_NMI_H__
    3.14 +
    3.15 +#include <asm/nmi.h>
    3.16 +
    3.17 +#endif /* __XEN_NMI_H__ */