Merge tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel...

Pull Xen update from Konrad Rzeszutek Wilk:
 "Features:
   - When hotplugging PCI devices in a PV guest we can allocate
     Xen-SWIOTLB later.
   - Cleanup Xen SWIOTLB.
   - Support pages out grants from HVM domains in the backends.
   - Support wild cards in xen-pciback.hide=(BDF) arguments.
   - Update grant status updates with upstream hypervisor.
   - Boot PV guests with more than 128GB.
   - Cleanup Xen MMU code/add comments.
   - Obtain XENVERS using a preferred method.
   - Lay out generic changes to support Xen ARM.
   - Allow privcmd ioctl for HVM (used to do only PV).
   - Do v2 of mmap_batch for privcmd ioctls.
   - If hypervisor saves the LED keyboard light - we will now instruct
     the kernel about its state.
  Fixes:
   - More fixes to Xen PCI backend for various calls/FLR/etc.
   - With more than 4GB in a 64-bit PV guest disable native SWIOTLB.
   - Fix up smatch warnings.
   - Fix up various return values in privmcmd and mm."

* tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (48 commits)
  xen/pciback: Restore the PCI config space after an FLR.
  xen-pciback: properly clean up after calling pcistub_device_find()
  xen/vga: add the xen EFI video mode support
  xen/x86: retrieve keyboard shift status flags from hypervisor.
  xen/gndev: Xen backend support for paged out grant targets V4.
  xen-pciback: support wild cards in slot specifications
  xen/swiotlb: Fix compile warnings when using plain integer instead of NULL pointer.
  xen/swiotlb: Remove functions not needed anymore.
  xen/pcifront: Use Xen-SWIOTLB when initting if required.
  xen/swiotlb: For early initialization, return zero on success.
  xen/swiotlb: Use the swiotlb_late_init_with_tbl to init Xen-SWIOTLB late when PV PCI is used.
  xen/swiotlb: Move the error strings to its own function.
  xen/swiotlb: Move the nr_tbl determination in its own function.
  xen/arm: compile and run xenbus
  xen: resynchronise grant table status codes with upstream
  xen/privcmd: return -EFAULT on error
  xen/privcmd: Fix mmap batch ioctl error status copy back.
  xen/privcmd: add PRIVCMD_MMAPBATCH_V2 ioctl
  xen/mm: return more precise error from xen_remap_domain_range()
  xen/mmu: If the revector fails, don't attempt to revector anything else.
  ...

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc arch/x86/xen/p2m.c
Simple merge

diff --cc arch/x86/xen/setup.c
Simple merge

diff --cc drivers/pci/xen-pcifront.c
Simple merge

diff --cc drivers/xen/gntdev.c
Simple merge

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

diff --cc drivers/xen/xen-pciback/pci_stub.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__ */