From mboxrd@z Thu Jan 1 00:00:00 1970 From: konrad.wilk@oracle.com (Konrad Rzeszutek Wilk) Date: Fri, 14 Sep 2012 09:12:42 -0400 Subject: [PATCH v4 19/24] xen/arm: compile blkfront and blkback In-Reply-To: <1347621207-11294-19-git-send-email-stefano.stabellini@eu.citrix.com> References: <1347621207-11294-19-git-send-email-stefano.stabellini@eu.citrix.com> Message-ID: <20120914131242.GN25249@phenom.dumpdata.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Sep 14, 2012 at 12:13:21PM +0100, Stefano Stabellini wrote: > Signed-off-by: Stefano Stabellini > Acked-by: Konrad Rzeszutek Wilk 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 > #include > +#include > #include > #include > #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