Skip to contentSkip to conversation

swim: don't call blk_queue_bounce_limit

PATCH Applied Christoph Hellwig 2 participants 2 messages Apr 6, 2021 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/block/Kconfig | 2 +-
 drivers/block/swim.c  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/block/Kconfig +1 -1
index fd236158f32d99..cbc9f7a18c99e9 100644
@@ -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.
drivers/block/swim.c +0 -2
index cc6a0bc6c005a7..2917b21f48ff27 100644
@@ -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;
 	}
Signature · 1 line
2.30.1
maintainer Applied
#1 lore raw
Quoted 3 lines · Christoph Hellwig

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.

Applied, thanks.

Signature · 1 line
Jens Axboe