# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.634   -> 1.635  
#	drivers/ide24/ide-dma.c	1.1     -> 1.2    
#	include/linux/ide24.h	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/11	axboe@burns.home.kernel.dk	1.635
# reverse hwif->highmem flag, make it ->no_highmem instead.
# --------------------------------------------
#
diff -Nru a/drivers/ide24/ide-dma.c b/drivers/ide24/ide-dma.c
--- a/drivers/ide24/ide-dma.c	Thu Jul 11 11:14:07 2002
+++ b/drivers/ide24/ide-dma.c	Thu Jul 11 11:14:07 2002
@@ -579,13 +579,14 @@
 {
 	u64 addr = BLK_BOUNCE_HIGH;
 
-	if (on && drive->media == ide_disk && HWIF(drive)->highmem) {
+	if (on && drive->media == ide_disk && !HWIF(drive)->no_highmem) {
 		if (!PCI_DMA_BUS_IS_PHYS)
 			addr = BLK_BOUNCE_ANY;
 		else
 			addr = HWIF(drive)->pci_dev->dma_mask;
 	}
 
+	printk("%s: set limit %Lx\n", drive->name, (u64) addr);
 	blk_queue_bounce_limit(&drive->queue, addr);
 }
 
diff -Nru a/include/linux/ide24.h b/include/linux/ide24.h
--- a/include/linux/ide24.h	Thu Jul 11 11:14:07 2002
+++ b/include/linux/ide24.h	Thu Jul 11 11:14:07 2002
@@ -745,7 +745,7 @@
 	unsigned	reset      : 1;	/* reset after probe */
 	unsigned	autodma    : 1;	/* automatically try to enable DMA at boot */
 	unsigned	udma_four  : 1;	/* 1=ATA-66 capable, 0=default */
-	unsigned	highmem    : 1;	/* can do full 32-bit dma */
+	unsigned	no_highmem : 1;	/* always use high i/o bounce */
 	byte		channel;	/* for dual-port chips: 0=primary, 1=secondary */
 #ifdef CONFIG_BLK_DEV_IDEPCI
 	struct pci_dev	*pci_dev;	/* for pci chipsets */