From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Nov 2011 02:31:36 +0000 (-0800)
Subject: Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: upstream/snapshot3+hdmi~8790
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06d381484fe8fb1ba2996c22e89595a273e3634c;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'stable/vmalloc-3.2' of git://git./linux/kernel/git/konrad/xen

* 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  net: xen-netback: use API provided by xenbus module to map rings
  block: xen-blkback: use API provided by xenbus module to map rings
  xen: use generic functions instead of xen_{alloc, free}_vm_area()
---

06d381484fe8fb1ba2996c22e89595a273e3634c
diff --cc drivers/block/xen-blkback/common.h
index de09f52,7ec0e88..dfb1b3a
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@@ -168,9 -138,8 +168,9 @@@ struct xen_blkif 
  	unsigned int		irq;
  	/* Comms information. */
  	enum blkif_protocol	blk_protocol;
 +	enum blkif_backend_type blk_backend_type;
  	union blkif_back_rings	blk_rings;
- 	struct vm_struct	*blk_ring_area;
+ 	void			*blk_ring;
  	/* The VBD attached to this interface. */
  	struct xen_vbd		vbd;
  	/* Back pointer to the backend_info. */