diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2011-11-06 18:31:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2011-11-06 18:31:36 -0800 |
| commit | 06d381484fe8fb1ba2996c22e89595a273e3634c (patch) | |
| tree | 0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0 /drivers/block/xen-blkback/common.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | net: xen-netback: use API provided by xenbus module to map rings (diff) | |
| download | linux-06d381484fe8fb1ba2996c22e89595a273e3634c.tar.gz linux-06d381484fe8fb1ba2996c22e89595a273e3634c.tar.bz2 linux-06d381484fe8fb1ba2996c22e89595a273e3634c.zip | |
Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/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()
Diffstat (limited to 'drivers/block/xen-blkback/common.h')
| -rw-r--r-- | drivers/block/xen-blkback/common.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h index de09f525d6c1..dfb1b3a43a5d 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -170,7 +170,7 @@ struct xen_blkif { 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. */ @@ -198,9 +198,6 @@ struct xen_blkif { int st_wr_sect; wait_queue_head_t waiting_to_free; - - grant_handle_t shmem_handle; - grant_ref_t shmem_ref; }; |