Fix all of our calls to gnttab_end_foreign_access{,_ref} to not give

the readonly parameter, now its disappeared from the grant_table.h
prototype.

diff --git a/drivers/net/xen-netchannel2/bypassee.c b/drivers/net/xen-netchannel2/bypassee.c
index e0b273fdd49c1352f9ca61844036bc152f88fc31..b196d8dde30c71b12d29ba6c2f9ac3ca6ff3c911 100644 (file)
--- a/drivers/net/xen-netchannel2/bypassee.c
+++ b/drivers/net/xen-netchannel2/bypassee.c
@@ -105,7 +105,7 @@ static void schedule_disable(struct nc2_bypass_endpoint *ep)
 
 static void grant_end(grant_ref_t *gref)
 {
-        if (*gref && gnttab_end_foreign_access_ref(*gref, 0)) {
+        if (*gref && gnttab_end_foreign_access_ref(*gref)) {
                 gnttab_free_grant_reference(*gref);
                 *gref = 0;
         }

diff --git a/drivers/net/xen-netchannel2/netchannel2_core.h b/drivers/net/xen-netchannel2/netchannel2_core.h
index 4aaa77ed7979a9dafcb36b2d0eec0d10c05ad489..b9b2d11d33cf176bd171c2339665d7bdfbfbd310 100644 (file)
--- a/drivers/net/xen-netchannel2/netchannel2_core.h
+++ b/drivers/net/xen-netchannel2/netchannel2_core.h
@@ -1099,19 +1099,7 @@ void nc2_start_polling(struct netchannel2_ring_pair *ncrp);
 void nc2_stop_polling(struct netchannel2_ring_pair *ncrp);
 
 /* Compatibility with PV-ops kernels. */
-#ifdef CONFIG_PARAVIRT
 #define nc2_end_foreign_access_ref gnttab_end_foreign_access_ref
 #define nc2_end_foreign_access gnttab_end_foreign_access
-#else
-static inline int nc2_end_foreign_access_ref(grant_ref_t gref, int readonly)
-{
-        return gnttab_end_foreign_access_ref(gref);
-}
-static inline void nc2_end_foreign_access(grant_ref_t gref, int readonly,
-                                         unsigned long page)
-{
-        gnttab_end_foreign_access(gref, page);
-}
-#endif
 
 #endif /* !NETCHANNEL2_CORE_H__ */

diff --git a/drivers/net/xen-netchannel2/netfront2.c b/drivers/net/xen-netchannel2/netfront2.c
index 57997b7eb07a9b78701fa093b488aa2e1d6e43b2..07ccdd4cfe30d7939abc0d705660d7784935a840 100644 (file)
--- a/drivers/net/xen-netchannel2/netfront2.c
+++ b/drivers/net/xen-netchannel2/netfront2.c
@@ -71,7 +71,7 @@ static int ungrant_access_to_ring(struct netfront2 *nf,
 
         for (i = 0; i < nr_pages; i++) {
                 if (grefs[i]) {
-                        succ = nc2_end_foreign_access_ref(grefs[i], 0);
+                        succ = nc2_end_foreign_access_ref(grefs[i]);
                         if (!succ) {
                                 /* XXX we can't recover when this
                                  * happens.  Try to do something

diff --git a/drivers/net/xen-netchannel2/posted_buffers.c b/drivers/net/xen-netchannel2/posted_buffers.c
index 1d13f1ad351e06ba4a8bb66043325a83dbef40b9..035181da000cc10c56e49a32c3961fc3e10969bf 100644 (file)
--- a/drivers/net/xen-netchannel2/posted_buffers.c
+++ b/drivers/net/xen-netchannel2/posted_buffers.c
@@ -217,7 +217,7 @@ struct sk_buff *handle_pre_posted_packet(struct netchannel2 *nc,
                     frag.size <= PAGE_SIZE &&
                     frag.off < PAGE_SIZE &&
                     frag.size + frag.off <= POSTED_BUFFER_SIZE &&
-                    nc2_end_foreign_access_ref(rxb->gref, 0)) {
+                    nc2_end_foreign_access_ref(rxb->gref)) {
                         gnttab_free_grant_reference(rxb->gref);
                         attach_buffer_to_skb(cur_skb, rxb, frag.size,
                                              frag.off);
@@ -225,7 +225,6 @@ struct sk_buff *handle_pre_posted_packet(struct netchannel2 *nc,
                 } else {
                         is_bad = 1;
                         nc2_end_foreign_access(rxb->gref,
-                                               0,
                                                (unsigned long)rxb->buffer);
                 }
                 rxb->gref = 0;
@@ -262,7 +261,6 @@ static void release_rx_buffer(struct netchannel2 *nc,
 {
         rxb->is_posted = 0;
         nc2_end_foreign_access(rxb->gref,
-                               0,
                                (unsigned long)rxb->buffer);
         nc->nr_rx_buffers--;
         list_move(&rxb->list, &nc->unused_rx_buffers);

diff --git a/drivers/net/xen-netchannel2/util.c b/drivers/net/xen-netchannel2/util.c
index 6f69a2e6ff745e1d1137db730b3c3085f5c49884..4ff7aed21903ec5b59c23aa9aee4398891a38f81 100644 (file)
--- a/drivers/net/xen-netchannel2/util.c
+++ b/drivers/net/xen-netchannel2/util.c
@@ -326,7 +326,7 @@ void release_tx_packet(struct netchannel2_ring_pair *ncrp,
                         /* It's a subpage grant reference, so Xen
                            guarantees to release it quickly.  Sit and
                            wait for it to do so. */
-                        while (!nc2_end_foreign_access_ref(gref, 1)) {
+                        while (!nc2_end_foreign_access_ref(gref)) {
                                 cpu_relax();
                         }
                         gnttab_free_grant_reference(gref);
@@ -337,7 +337,7 @@ void release_tx_packet(struct netchannel2_ring_pair *ncrp,
                         if (r == -ENOSPC)
                                 break;
                         gref = (grant_ref_t)r;
-                        r = nc2_end_foreign_access_ref(gref, 1);
+                        r = nc2_end_foreign_access_ref(gref);
                         if (r == 0) {
                                 printk(KERN_WARNING "Failed to end remote access to packet memory.\n");
                         } else {