Turn receiver-map support back on. May or may not actually work.

diff --git a/drivers/net/xen-netchannel2/Makefile b/drivers/net/xen-netchannel2/Makefile
index 4ae3d3e2ffe2f77dddc10b2e1316ce99693e6082..eadd1adeb9092bd7d5f1696e6f5b243f95bcf266 100644 (file)
--- a/drivers/net/xen-netchannel2/Makefile
+++ b/drivers/net/xen-netchannel2/Makefile
@@ -18,13 +18,7 @@ ifeq ($(CONFIG_XEN_NETDEV2_AUTOMATIC_BYPASS),y)
 netchannel2-objs += autobypass.o
 endif
 
-ifeq ($(XEN_HVM_GUEST),y)
-netchannel2-objs += hvm_guest_dummy.o
-else ifeq ($(CONFIG_PARAVIRT),y)
-netchannel2-objs += hvm_guest_dummy.o
-else
 netchannel2-objs += receiver_map.o
-endif
 
 ifeq ($(CONFIG_XEN_NETDEV2_BACKEND),y)
 netchannel2-objs += netback2.o

diff --git a/drivers/net/xen-netchannel2/netchannel2_core.h b/drivers/net/xen-netchannel2/netchannel2_core.h
index 315877973a401e2d1b1d8476e64915fa4d531338..4aaa77ed7979a9dafcb36b2d0eec0d10c05ad489 100644 (file)
--- a/drivers/net/xen-netchannel2/netchannel2_core.h
+++ b/drivers/net/xen-netchannel2/netchannel2_core.h
@@ -1114,18 +1114,4 @@ static inline void nc2_end_foreign_access(grant_ref_t gref, int readonly,
 }
 #endif
 
-#ifndef CONFIG_PARAVIRT
-#include <xen/live_maps.h>
-#else
-static inline int page_is_tracked(struct page *p)
-{
-        return 0;
-}
-static inline void lookup_tracker_page(struct page *p, domid_t *domid,
-                                       grant_ref_t *gref)
-{
-        BUG();
-}
-#endif
-
 #endif /* !NETCHANNEL2_CORE_H__ */

diff --git a/drivers/net/xen-netchannel2/posted_buffers.c b/drivers/net/xen-netchannel2/posted_buffers.c
index 97eba89075d3bd248aa5c117def772bc4bed7696..1d13f1ad351e06ba4a8bb66043325a83dbef40b9 100644 (file)
--- a/drivers/net/xen-netchannel2/posted_buffers.c
+++ b/drivers/net/xen-netchannel2/posted_buffers.c
@@ -3,15 +3,11 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#ifdef CONFIG_PARAVIRT
 #include <xen/interface/xen.h>
 #include <xen/grant_table.h>
 #include <xen/events.h>
 #include <xen/page.h>
-#else
-#include <xen/evtchn.h>
-#include <xen/gnttab.h>
-#endif
+#include <xen/live_maps.h>
 #include <xen/xenbus.h>
 #include "netchannel2_endpoint.h"
 #include "netchannel2_core.h"

diff --git a/drivers/net/xen-netchannel2/receiver_map.c b/drivers/net/xen-netchannel2/receiver_map.c
index f92aa0663efdb0647ca6d0202ba0ed6bdddd23b8..eab13b71eab6307a22481e2650130795eca6353f 100644 (file)
--- a/drivers/net/xen-netchannel2/receiver_map.c
+++ b/drivers/net/xen-netchannel2/receiver_map.c
@@ -15,9 +15,10 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <xen/live_maps.h>
-#include <xen/gnttab.h>
+#include <xen/grant_table.h>
 #include <xen/balloon.h>
 #include <xen/evtchn.h>
+#include <asm/xen/page.h>
 #include "netchannel2_core.h"
 
 #define MAX_MAPPED_FRAGS 1024
@@ -154,7 +155,7 @@ static struct rx_map_packet *alloc_rx_packet(struct netchannel2 *nc,
 
 struct grant_unmapper {
         unsigned nr_gops;
-        gnttab_unmap_grant_ref_t gop_queue[32];
+        struct gnttab_unmap_grant_ref gop_queue[32];
 };
 
 static void do_unmaps(struct grant_unmapper *unmapper)
@@ -181,7 +182,7 @@ static void grant_unmap(struct grant_unmapper *unmapper,
                         void *va,
                         int handle)
 {
-        gnttab_unmap_grant_ref_t *gop;
+        struct gnttab_unmap_grant_ref *gop;
         if (unmapper->nr_gops == ARRAY_SIZE(unmapper->gop_queue))
                 do_unmaps(unmapper);
         gop = &unmapper->gop_queue[unmapper->nr_gops];
@@ -558,7 +559,7 @@ static void attach_frag_to_skb(struct sk_buff **_skb,
 struct rx_plan {
         int is_failed;
         unsigned nr_mops;
-        gnttab_map_grant_ref_t mops[8];
+        struct gnttab_map_grant_ref mops[8];
         struct rx_map_fragment *frags[8];
 };
 
@@ -566,7 +567,7 @@ static void flush_grant_operations(struct rx_plan *rp)
 {
         unsigned x;
         int ret;
-        gnttab_map_grant_ref_t *mop;
+        struct gnttab_map_grant_ref *mop;
 
         if (rp->nr_mops == 0)
                 return;
@@ -596,7 +597,7 @@ static void map_fragment(struct rx_plan *rp,
                          struct netchannel2 *nc)
 {
         unsigned idx = fragment_idx(rx_frag);
-        gnttab_map_grant_ref_t *mop;
+        struct gnttab_map_grant_ref *mop;
 
         if (rp->nr_mops == ARRAY_SIZE(rp->mops))
                 flush_grant_operations(rp);

diff --git a/drivers/net/xen-netchannel2/rscb.c b/drivers/net/xen-netchannel2/rscb.c
index 985e4760ad748cb14383c89ba8211664e6d652af..52ae3b475566f250ee58e997c15906bcbb73374d 100644 (file)
--- a/drivers/net/xen-netchannel2/rscb.c
+++ b/drivers/net/xen-netchannel2/rscb.c
@@ -3,12 +3,9 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/version.h>
-#ifdef CONFIG_PARAVIRT
 #include <xen/grant_table.h>
 #include <xen/page.h>
-#else
-#include <xen/gnttab.h>
-#endif
+#include <xen/live_maps.h>
 
 #include "netchannel2_core.h"