lkml.org 
[lkml]   [2012]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 23/25] xen: missing includes
    Date
    Note: this patch should be already in Konrad's tree, it is here just for
    convenience.

    Changes in v3:
    - add missing pvclock-abi.h include to ia64 header files.

    Changes in v2:
    - remove pvclock hack;
    - remove include linux/types.h from xen/interface/xen.h.

    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    ---
    arch/ia64/include/asm/xen/interface.h | 2 ++
    arch/x86/include/asm/xen/interface.h | 2 ++
    drivers/tty/hvc/hvc_xen.c | 2 ++
    drivers/xen/grant-table.c | 1 +
    drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
    include/xen/interface/xen.h | 1 -
    include/xen/privcmd.h | 1 +
    7 files changed, 9 insertions(+), 1 deletions(-)

    diff --git a/arch/ia64/include/asm/xen/interface.h b/arch/ia64/include/asm/xen/interface.h
    index 7c83445..e88c5de 100644
    --- a/arch/ia64/include/asm/xen/interface.h
    +++ b/arch/ia64/include/asm/xen/interface.h
    @@ -269,6 +269,8 @@ typedef struct xen_callback xen_callback_t;

    #endif /* !__ASSEMBLY__ */

    +#include <asm/pvclock-abi.h>
    +
    /* Size of the shared_info area (this is not related to page size). */
    #define XSI_SHIFT 14
    #define XSI_SIZE (1 << XSI_SHIFT)
    diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h
    index 25cc8df..28fc621 100644
    --- a/arch/x86/include/asm/xen/interface.h
    +++ b/arch/x86/include/asm/xen/interface.h
    @@ -127,6 +127,8 @@ struct arch_shared_info {
    #include "interface_64.h"
    #endif

    +#include <asm/pvclock-abi.h>
    +
    #ifndef __ASSEMBLY__
    /*
    * The following is all CPU context. Note that the fpu_ctxt block is filled
    diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
    index 944eaeb..dc07f56 100644
    --- a/drivers/tty/hvc/hvc_xen.c
    +++ b/drivers/tty/hvc/hvc_xen.c
    @@ -21,6 +21,7 @@
    #include <linux/console.h>
    #include <linux/delay.h>
    #include <linux/err.h>
    +#include <linux/irq.h>
    #include <linux/init.h>
    #include <linux/types.h>
    #include <linux/list.h>
    @@ -35,6 +36,7 @@
    #include <xen/page.h>
    #include <xen/events.h>
    #include <xen/interface/io/console.h>
    +#include <xen/interface/sched.h>
    #include <xen/hvc-console.h>
    #include <xen/xenbus.h>

    diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
    index 0bfc1ef..1d0d95e 100644
    --- a/drivers/xen/grant-table.c
    +++ b/drivers/xen/grant-table.c
    @@ -47,6 +47,7 @@
    #include <xen/interface/memory.h>
    #include <xen/hvc-console.h>
    #include <asm/xen/hypercall.h>
    +#include <asm/xen/interface.h>

    #include <asm/pgtable.h>
    #include <asm/sync_bitops.h>
    diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c
    index a31b54d..3159a37 100644
    --- a/drivers/xen/xenbus/xenbus_probe_frontend.c
    +++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
    @@ -21,6 +21,7 @@
    #include <xen/xenbus.h>
    #include <xen/events.h>
    #include <xen/page.h>
    +#include <xen/xen.h>

    #include <xen/platform_pci.h>

    diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
    index f6b8965..42834a3 100644
    --- a/include/xen/interface/xen.h
    +++ b/include/xen/interface/xen.h
    @@ -10,7 +10,6 @@
    #define __XEN_PUBLIC_XEN_H__

    #include <asm/xen/interface.h>
    -#include <asm/pvclock-abi.h>

    /*
    * XEN "SYSTEM CALLS" (a.k.a. HYPERCALLS).
    diff --git a/include/xen/privcmd.h b/include/xen/privcmd.h
    index 59f1bd8..45c1aa1 100644
    --- a/include/xen/privcmd.h
    +++ b/include/xen/privcmd.h
    @@ -35,6 +35,7 @@

    #include <linux/types.h>
    #include <linux/compiler.h>
    +#include <xen/interface/xen.h>

    struct privcmd_hypercall {
    __u64 op;
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2012-08-16 19:42    [W:2.989 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site