From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 27 Nov 2012 16:43:32 +0000 (-0500)
Subject: Merge commit 'v3.7-rc7' into linux-next
X-Git-Tag: next-20121205~35^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6844241158dd5bdef5ee20793aefcef6fc2446f2;p=karo-tx-linux.git

Merge commit 'v3.7-rc7' into linux-next

* commit 'v3.7-rc7': (459 commits)
  Linux 3.7-rc7
  powerpc/eeh: Do not invalidate PE properly
  ALSA: hda - Fix build without CONFIG_PM
  of/address: sparc: Declare of_iomap as an extern function for sparc again
  PM / QoS: fix wrong error-checking condition
  bnx2x: remove redundant warning log
  vxlan: fix command usage in its doc
  8139cp: revert "set ring address before enabling receiver"
  MPI: Fix compilation on MIPS with GCC 4.4 and newer
  MIPS: Fix crash that occurs when function tracing is enabled
  MIPS: Merge overlapping bootmem ranges
  block: Don't access request after it might be freed
  mtip32xx: Fix padding issue
  aoe: avoid running request handler on plugged queue
  mtip32xx: fix potential NULL pointer dereference in mtip_timeout_function()
  mtip32xx: fix shift larger than type warning
  mtip32xx: Fix incorrect mask used for erase mode
  mtip32xx: Fix to make lba address correct in big-endian systems
  mtip32xx: fix potential crash on SEC_ERASE_UNIT
  dm: fix deadlock with request based dm and queue request_fn recursion
  ...
---

6844241158dd5bdef5ee20793aefcef6fc2446f2
diff --cc drivers/xen/privcmd.c
index b9d08987a5a5,71f5c459b088..0bbbccbb1f12
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@@ -412,15 -367,9 +411,16 @@@ static long privcmd_ioctl_mmap_batch(vo
  	    ((m.addr + (nr_pages << PAGE_SHIFT)) != vma->vm_end) ||
  	    !privcmd_enforce_singleshot_mapping(vma)) {
  		up_write(&mm->mmap_sem);
+ 		ret = -EINVAL;
  		goto out;
  	}
 +	if (xen_feature(XENFEAT_auto_translated_physmap)) {
 +		ret = alloc_empty_pages(vma, m.num);
 +		if (ret < 0) {
 +			up_write(&mm->mmap_sem);
 +			goto out;
 +		}
 +	}
  
  	state.domain        = m.dom;
  	state.vma           = vma;