diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-04-06 08:17:25 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-04-06 17:29:47 +0200 |
| commit | 4c6e5bc8c05f7d9a8da6da8d1811a7577f3f404b (patch) | |
| tree | 6dde2a793b90f02fda77f9d921bff8ba061617e9 | |
| parent | gdrom: support highmem (diff) | |
| download | linux-4c6e5bc8c05f7d9a8da6da8d1811a7577f3f404b.tar.xz linux-4c6e5bc8c05f7d9a8da6da8d1811a7577f3f404b.zip | |
swim: don't call blk_queue_bounce_limit
m68k doesn't support highmem, so don't bother enabling the block layer
bounce buffer code. Just for safety throw in a depend on !HIGHMEM.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210406061725.811389-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/block/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/block/swim.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 44a3c6e6dac2..63056cfd4b62 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -50,7 +50,7 @@ config MAC_FLOPPY config BLK_DEV_SWIM tristate "Support for SWIM Macintosh floppy" - depends on M68K && MAC + depends on M68K && MAC && !HIGHMEM help You should select this option if you want floppy support and you don't have a II, IIfx, Q900, Q950 or AV series. diff --git a/drivers/block/swim.c b/drivers/block/swim.c index cc6a0bc6c005..2917b21f48ff 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -816,8 +816,6 @@ static int swim_floppy_init(struct swim_priv *swd) } swd->unit[drive].disk->queue = q; - blk_queue_bounce_limit(swd->unit[drive].disk->queue, - BLK_BOUNCE_HIGH); swd->unit[drive].disk->queue->queuedata = &swd->unit[drive]; swd->unit[drive].swd = swd; } |