diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-11-08 07:58:53 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-11-23 14:32:55 +0100 |
| commit | 7c5d62388e88729775b10a1748f2810e413f1e51 (patch) | |
| tree | 4d4d2cf8252a32f75a0c8b672ad921e161fa4cc1 | |
| parent | mtip32xx: Fix incorrect mask used for erase mode (diff) | |
| download | linux-7c5d62388e88729775b10a1748f2810e413f1e51.tar.xz linux-7c5d62388e88729775b10a1748f2810e413f1e51.zip | |
mtip32xx: fix shift larger than type warning
If we're building a 32-bit kernel and CONFIG_LBADF isn't set,
sector_t is 32-bits wide. The shifts by 32 and 40 are thus
larger than we support.
Cast the sector offset to a u64 to avoid these warnings.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index df46b5a3f56f..faa5591b579f 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -2439,7 +2439,7 @@ static int mtip_hw_ioctl(struct driver_data *dd, unsigned int cmd, * return value * None */ -static void mtip_hw_submit_io(struct driver_data *dd, sector_t start, +static void mtip_hw_submit_io(struct driver_data *dd, sector_t sector, int nsect, int nents, int tag, void *callback, void *data, int dir) { @@ -2447,6 +2447,7 @@ static void mtip_hw_submit_io(struct driver_data *dd, sector_t start, struct mtip_port *port = dd->port; struct mtip_cmd *command = &port->commands[tag]; int dma_dir = (dir == READ) ? DMA_FROM_DEVICE : DMA_TO_DEVICE; + u64 start = sector; /* Map the scatter list for DMA access */ nents = dma_map_sg(&dd->pdev->dev, command->sg, nents, dma_dir); |