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

* stable/for-linus-3.8:
  xen/gntdev: remove erronous use of copy_to_user
  xen/gntdev: correctly unmap unlinked maps in mmu notifier
  xen/gntdev: fix unsafe vma access
  xen/privcmd: Fix mmap batch ioctl.
  Xen: properly bound buffer access when parsing cpu/*/availability
  xen/grant-table: correctly initialize grant table version 1
  x86/xen : Fix the wrong check in pciback
  xen/privcmd: Relax access control in privcmd_ioctl_mmap

Conflicts:
	arch/arm/xen/enlighten.c

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

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

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

diff --cc drivers/xen/grant-table.c
index a4982a3649c5c9fd2799646c2a85d00aacee4d72,95ce9d02cecaabfb3246252941adcacdd01d015e..4f833452dcf72083492686262ac901572b57d010
--- 1/drivers/xen/grant-table.c
--- 2/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@@ -1086,12 -1135,10 +1088,11 @@@ static void gnttab_request_version(void
                grant_table_version);
  }
  
- int gnttab_resume(void)
+ static int gnttab_setup(void)
  {
        unsigned int max_nr_gframes;
 +      char *kmsg = "Failed to kmalloc pages for pv in hvm grant frames\n";
  
-       gnttab_request_version();
        max_nr_gframes = gnttab_max_grant_frames();
        if (max_nr_gframes < nr_grant_frames)
                return -ENOSYS;

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