On Fri, Sep 14, 2012 at 12:13:21PM +0100, Stefano Stabellini wrote: > Signed-off-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com> > Acked-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
So this should go through Jen's tree or at least get his Ack. But doing all of these patches seperatly is painfull - and remembering where they go is a bit of logistical nightmare. Jen, are you OK with this patch? > --- > drivers/block/xen-blkback/blkback.c | 1 + > include/xen/interface/io/protocols.h | 3 +++ > 2 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/block/xen-blkback/blkback.c > b/drivers/block/xen-blkback/blkback.c > index 73f196c..63dd5b9 100644 > --- a/drivers/block/xen-blkback/blkback.c > +++ b/drivers/block/xen-blkback/blkback.c > @@ -42,6 +42,7 @@ > > #include <xen/events.h> > #include <xen/page.h> > +#include <xen/xen.h> > #include <asm/xen/hypervisor.h> > #include <asm/xen/hypercall.h> > #include "common.h" > diff --git a/include/xen/interface/io/protocols.h > b/include/xen/interface/io/protocols.h > index 01fc8ae..0eafaf2 100644 > --- a/include/xen/interface/io/protocols.h > +++ b/include/xen/interface/io/protocols.h > @@ -5,6 +5,7 @@ > #define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" > #define XEN_IO_PROTO_ABI_IA64 "ia64-abi" > #define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" > +#define XEN_IO_PROTO_ABI_ARM "arm-abi" > > #if defined(__i386__) > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 > @@ -14,6 +15,8 @@ > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 > #elif defined(__powerpc64__) > # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 > +#elif defined(__arm__) > +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_ARM > #else > # error arch fixup needed here > #endif > -- > 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
