ia64/linux-2.6.18-xen.hg

diff drivers/xen/blkback/Makefile @ 894:4e5cd2fc45a7

linux: fix blkback/blktap2 interaction

blkback's page map code needs to be accessible to both blkback and
blktap2, irrespective of whether either or both are modules. The
most immediate solution is to break it out into a separate, library-
like component that doesn't need building if either of the two
consumers is configured off, and that gets built as a module if both
consumers are modules.

Also fix the dummy implementation of blkback_pagemap_read(), since
using BUG() there doesn't compile.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jun 04 10:33:52 2009 +0100 (2009-06-04)
parents eba6fe6d8d53
children
line diff
     1.1 --- a/drivers/xen/blkback/Makefile	Thu Jun 04 10:32:57 2009 +0100
     1.2 +++ b/drivers/xen/blkback/Makefile	Thu Jun 04 10:33:52 2009 +0100
     1.3 @@ -1,3 +1,4 @@
     1.4  obj-$(CONFIG_XEN_BLKDEV_BACKEND) := blkbk.o
     1.5 +obj-$(CONFIG_XEN_BLKBACK_PAGEMAP) += blkback-pagemap.o
     1.6  
     1.7 -blkbk-y	:= blkback.o xenbus.o interface.o vbd.o blkback-pagemap.o
     1.8 +blkbk-y	:= blkback.o xenbus.o interface.o vbd.o