Re: [PATCH v2 06/23] xen: missing includes

Stefano Stabellini
2012-08-08T16:38:43Z

On Tue, 7 Aug 2012, Konrad Rzeszutek Wilk wrote:
> On Mon, Aug 06, 2012 at 03:27:09PM +0100, Stefano Stabellini wrote:
> > Changes in v2:
> > - remove pvclock hack;
> > - remove include linux/types.h from xen/interface/xen.h.
>
> I think I can take in my tree now right by itself right? Or do
> you want to keep this in your patchqueue? If so, Ack from me.

Yep, just go ahead and take the patch, thanks.

> > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > ---
> > 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 +
> > 6 files changed, 7 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h
> > index cbf0c9d..a93db16 100644
> > --- a/arch/x86/include/asm/xen/interface.h
> > +++ b/arch/x86/include/asm/xen/interface.h
> > @@ -121,6 +121,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 a890804..3871e47 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 17857fb..4d58881 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>
> >
> > typedef unsigned long xen_pfn_t;
> >
> > --
> > 1.7.2.5
>