On Wed, Oct 20, 2010 at 09:28:36AM -0700, Randy Dunlap wrote: > On Wed, 20 Oct 2010 16:20:53 +1100 Stephen Rothwell wrote: > > > Hi all, > > > > Changes since 20101019: > > > > > > The swiotlb-xen tree gained a conflict against the pci tree. > > > linux-next-20101020/drivers/xen/biomerge.c: In function 'xen_biovec_phys_mergeable': > linux-next-20101020/drivers/xen/biomerge.c:8: error: dereferencing pointer to incomplete type > linux-next-20101020/drivers/xen/biomerge.c:9: error: dereferencing pointer to incomplete type > linux-next-20101020/drivers/xen/biomerge.c:11: error: implicit declaration of function '__BIOVEC_PHYS_MERGEABLE' Ok, this patch fixes it. I am sticking it in my tree: >From 2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Date: Wed, 20 Oct 2010 13:04:13 -0400 Subject: [PATCH] xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c Without this dependency we get these compile errors: linux-next-20101020/drivers/xen/biomerge.c: In function 'xen_biovec_phys_mergeable': linux-next-20101020/drivers/xen/biomerge.c:8: error: dereferencing pointer to incomplete type linux-next-20101020/drivers/xen/biomerge.c:9: error: dereferencing pointer to incomplete type linux-next-20101020/drivers/xen/biomerge.c:11: error: implicit declaration of function '__BIOVEC_PHYS_MERGEABLE' Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> --- drivers/xen/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index b47f5da..b978645 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,9 +1,10 @@ -obj-y += grant-table.o features.o events.o manage.o biomerge.o +obj-y += grant-table.o features.o events.o manage.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) CFLAGS_features.o := $(nostackp) +obj-$(CONFIG_BLOCK) += biomerge.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += balloon.o -- 1.7.1 > > > config is attached. > > --- > ~Randy > *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
