ia64/linux-2.6.18-xen.hg

changeset 892:485fe5efa4ff

linux/blktap2: allow to build as module

... and also allow to interact with blkback when that's also built as
a module.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jun 04 10:32:34 2009 +0100 (2009-06-04)
parents 104b6ae6b257
children f994bfe9b93b
files arch/i386/mm/hypervisor.c drivers/xen/blktap2/device.c
line diff
     1.1 --- a/arch/i386/mm/hypervisor.c	Wed Jun 03 11:22:24 2009 +0100
     1.2 +++ b/arch/i386/mm/hypervisor.c	Thu Jun 04 10:32:34 2009 +0100
     1.3 @@ -122,6 +122,7 @@ void xen_tlb_flush_all(void)
     1.4  	op.cmd = MMUEXT_TLB_FLUSH_ALL;
     1.5  	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
     1.6  }
     1.7 +EXPORT_SYMBOL_GPL(xen_tlb_flush_all);
     1.8  
     1.9  void xen_tlb_flush_mask(cpumask_t *mask)
    1.10  {
    1.11 @@ -132,6 +133,7 @@ void xen_tlb_flush_mask(cpumask_t *mask)
    1.12  	set_xen_guest_handle(op.arg2.vcpumask, mask->bits);
    1.13  	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
    1.14  }
    1.15 +EXPORT_SYMBOL_GPL(xen_tlb_flush_mask);
    1.16  
    1.17  void xen_invlpg_all(unsigned long ptr)
    1.18  {
     2.1 --- a/drivers/xen/blktap2/device.c	Wed Jun 03 11:22:24 2009 +0100
     2.2 +++ b/drivers/xen/blktap2/device.c	Thu Jun 04 10:32:34 2009 +0100
     2.3 @@ -13,7 +13,8 @@
     2.4  
     2.5  #include "blktap.h"
     2.6  
     2.7 -#ifdef CONFIG_XEN_BLKDEV_BACKEND
     2.8 +#if defined(CONFIG_XEN_BLKDEV_BACKEND) || \
     2.9 +    (defined(CONFIG_XEN_BLKDEV_BACKEND_MODULE) && defined(MODULE))
    2.10  #include "../blkback/blkback-pagemap.h"
    2.11  #else
    2.12  struct blkback_pagemap { };