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>

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 44a3c6e6dac23c0003660d6efcb89fba80eb3ddc..63056cfd4b62c7995daafdb827b1661875321102 100644 (file)
--- 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 cc6a0bc6c005a7be512487c42fecb5388b5788b7..2917b21f48ff2770340a9e662ecbcbeca013bc49 100644 (file)
--- 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;
        }