Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 02:31:36 +0000 (18:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 02:31:36 +0000 (18:31 -0800)
* '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()

1  2 
drivers/block/xen-blkback/common.h
drivers/block/xen-blkback/xenbus.c
drivers/net/xen-netback/netback.c
include/xen/grant_table.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. */
Simple merge
Simple merge
Simple merge