Merge branch 'stable/for-linus-3.7' into linux-next

* stable/for-linus-3.7:
  xen/gndev: Xen backend support for paged out grant targets V4.

diff --cc drivers/xen/grant-table.c
Simple merge

diff --cc include/xen/grant_table.h
index f19fff8650e93075aae1717034f29898f1199646,ba0d77529a29c2268554eeed5c136fcc51da943c..aecee9d112cbe6aea2532652c8c3f768bb829cce
--- 1/include/xen/grant_table.h
--- 2/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@@ -187,7 -187,18 +187,19 @@@ int gnttab_map_refs(struct gnttab_map_g
                    struct gnttab_map_grant_ref *kmap_ops,
                    struct page **pages, unsigned int count);
  int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
 -                    struct page **pages, unsigned int count, bool clear_pte);
 +                    struct gnttab_map_grant_ref *kunmap_ops,
 +                    struct page **pages, unsigned int count);
  
+ /* Perform a batch of grant map/copy operations. Retry every batch slot
+  * for which the hypervisor returns GNTST_eagain. This is typically due
+  * to paged out target frames.
+  *
+  * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
+  *
+  * Return value in each iand every status field of the batch guaranteed
+  * to not be GNTST_eagain.
+  */
+ void gnttab_batch_map(struct gnttab_map_grant_ref *batch, unsigned count);
+ void gnttab_batch_copy(struct gnttab_copy *batch, unsigned count);
+ 
  #endif /* __ASM_GNTTAB_H__ */