From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 15 Jan 2013 21:05:05 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-3.8' into linux-next
X-Git-Tag: next-20130218~34^2~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5003d602aafbbfa3399690bd911d0b5736314898;p=karo-tx-linux.git

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
---

5003d602aafbbfa3399690bd911d0b5736314898
diff --cc drivers/xen/grant-table.c
index a4982a3649c5,95ce9d02ceca..4f833452dcf7
--- a/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;