From: Christoph Hellwig <hch@lst.de>
Date: Fri, 30 Dec 2022 17:00:28 +0000 (-1000)
Subject: paride: depend on !HIGHMEM
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d473990d93798de084582ebcf3f181da25baef2c;p=users%2Fhch%2Fblock.git

paride: depend on !HIGHMEM

Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index a2184b428493..c100ab1800ed 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -105,7 +105,7 @@ config GDROM
 
 config PARIDE
 	tristate "Parallel port IDE device support"
-	depends on PARPORT_PC
+	depends on PARPORT_PC && !HIGHMEM
 	help
 	  There are many external CD-ROM and disk devices that connect through
 	  your computer's parallel port. Most of them are actually IDE devices
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index a5ab40784119..e456682b3d11 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -908,7 +908,6 @@ static int pcd_init_unit(struct pcd_unit *cd, bool autoprobe, int port,
 	}
 
 	INIT_LIST_HEAD(&cd->rq_list);
-	blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);
 	cd->disk = disk;
 	cd->pi = &cd->pia;
 	cd->present = 0;
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index f8a75bc90f70..cb8a5e7615d8 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -926,7 +926,6 @@ static int pd_probe_drive(struct pd_unit *disk, int autoprobe, int port,
 	p->events = DISK_EVENT_MEDIA_CHANGE;
 	p->private_data = disk;
 	blk_queue_max_hw_sectors(p->queue, cluster);
-	blk_queue_bounce_limit(p->queue, BLK_BOUNCE_HIGH);
 
 	if (disk->drive == -1) {
 		for (disk->drive = 0; disk->drive <= 1; disk->drive++) {
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index eec1b9fde245..35ad024d4084 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -947,7 +947,6 @@ static int __init pf_init_unit(struct pf_unit *pf, bool autoprobe, int port,
 	disk->private_data = pf;
 
 	blk_queue_max_segments(disk->queue, cluster);
-	blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);
 
 	INIT_LIST_HEAD(&pf->rq_list);
 	pf->disk = disk;