diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /drivers/block | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/xen-blkfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index ab735a605cf3..d773397575db 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c | |||
| @@ -71,7 +71,7 @@ struct blk_shadow { | |||
| 71 | 71 | ||
| 72 | static const struct block_device_operations xlvbd_block_fops; | 72 | static const struct block_device_operations xlvbd_block_fops; |
| 73 | 73 | ||
| 74 | #define BLK_RING_SIZE __RING_SIZE((struct blkif_sring *)0, PAGE_SIZE) | 74 | #define BLK_RING_SIZE __CONST_RING_SIZE(blkif, PAGE_SIZE) |
| 75 | 75 | ||
| 76 | /* | 76 | /* |
| 77 | * We have one of these per vbd, whether ide, scsi or 'other'. They | 77 | * We have one of these per vbd, whether ide, scsi or 'other'. They |