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>

diff --git a/arch/i386/mm/hypervisor.c b/arch/i386/mm/hypervisor.c
index 5d533e4894de5647a9db8a3c01aeaba0bab7b655..6e54674eab3927bc84ca79ec77c2e8d370e1e75b 100644 (file)
--- a/arch/i386/mm/hypervisor.c
+++ b/arch/i386/mm/hypervisor.c
@@ -122,6 +122,7 @@ void xen_tlb_flush_all(void)
        op.cmd = MMUEXT_TLB_FLUSH_ALL;
        BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
+EXPORT_SYMBOL_GPL(xen_tlb_flush_all);
 
 void xen_tlb_flush_mask(cpumask_t *mask)
 {
@@ -132,6 +133,7 @@ void xen_tlb_flush_mask(cpumask_t *mask)
        set_xen_guest_handle(op.arg2.vcpumask, mask->bits);
        BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
+EXPORT_SYMBOL_GPL(xen_tlb_flush_mask);
 
 void xen_invlpg_all(unsigned long ptr)
 {

diff --git a/drivers/xen/blktap2/device.c b/drivers/xen/blktap2/device.c
index 1e3a2bd1fbf0670c22d7bd23d06008c188957c50..6bedfd409e25519d57f647093a1a519370d0fdd0 100644 (file)
--- a/drivers/xen/blktap2/device.c
+++ b/drivers/xen/blktap2/device.c
@@ -13,7 +13,8 @@
 
 #include "blktap.h"
 
-#ifdef CONFIG_XEN_BLKDEV_BACKEND
+#if defined(CONFIG_XEN_BLKDEV_BACKEND) || \
+    (defined(CONFIG_XEN_BLKDEV_BACKEND_MODULE) && defined(MODULE))
 #include "../blkback/blkback-pagemap.h"
 #else
 struct blkback_pagemap { };