[Xen-devel] [PATCH 04 of 12] blktap2: allow to build as module

[Daniel Stodden <daniel.stodden@xxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1244107954 -3600
# Node ID e6bffb2fc52314d542721c60c65cbb2a7779b4c9
# Parent  4a90fb4644ef8e95cea9e21609b76bd8ce4b4393
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@xxxxxxxxxx>

linux-2.6-pvops:
 * Strip n/a xen_tlb_flush exports
 * Fix obj macro naming in Makefile
 * gpl-export init_mm
 * gpl-export zap_page_range

Signed-off-by: Daniel Stodden <daniel.stodden@xxxxxxxxxx>

diff -r 4a90fb4644ef -r e6bffb2fc523 drivers/xen/blktap/Makefile
--- a/drivers/xen/blktap/Makefile       Fri May 29 09:16:37 2009 +0100
+++ b/drivers/xen/blktap/Makefile       Thu Jun 04 10:32:34 2009 +0100
@@ -1,3 +1,3 @@
-obj-y := blktap.o
+obj-$(CONFIG_XEN_BLKDEV_TAP) := blktap.o
 
 blktap-objs := control.o ring.o wait_queue.o device.o request.o sysfs.o
diff -r 4a90fb4644ef -r e6bffb2fc523 drivers/xen/blktap/device.c
--- a/drivers/xen/blktap/device.c       Fri May 29 09:16:37 2009 +0100
+++ b/drivers/xen/blktap/device.c       Thu Jun 04 10:32:34 2009 +0100
@@ -17,7 +17,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 { };
diff -r 4a90fb4644ef -r e6bffb2fc523 mm/init-mm.c
--- a/mm/init-mm.c      Fri May 29 09:16:37 2009 +0100
+++ b/mm/init-mm.c      Thu Jun 04 10:32:34 2009 +0100
@@ -4,6 +4,7 @@
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/cpumask.h>
+#include <linux/module.h>
 
 #include <asm/atomic.h>
 #include <asm/pgtable.h>
@@ -18,3 +19,4 @@
        .mmlist         = LIST_HEAD_INIT(init_mm.mmlist),
        .cpu_vm_mask    = CPU_MASK_ALL,
 };
+EXPORT_SYMBOL_GPL(init_mm);
diff -r 4a90fb4644ef -r e6bffb2fc523 mm/memory.c
--- a/mm/memory.c       Fri May 29 09:16:37 2009 +0100
+++ b/mm/memory.c       Thu Jun 04 10:32:34 2009 +0100
@@ -1075,6 +1075,7 @@
                tlb_finish_mmu(tlb, address, end);
        return end;
 }
+EXPORT_SYMBOL_GPL(zap_page_range);
 
 /**
  * zap_vma_ptes - remove ptes mapping the vma

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel