From dbc6bb6c65b4f5b82fbada264a3ad1ee7720398a Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 31 May 2010 15:59:03 +0900
Subject: [PATCH] --- yaml --- r: 208230 b: refs/heads/master c:
 bfe172310e58225f0d07f9354b683abacbd6a0d8 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/blkdev.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2b65b2306c32..0b5d78f937f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b375a612ad931264b71cf162d692b4420f2578a9
+refs/heads/master: bfe172310e58225f0d07f9354b683abacbd6a0d8
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index b8224ea4a5de..d7ae241a9e55 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -712,7 +712,7 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn;
 #define BLK_BOUNCE_HIGH		-1ULL
 #endif
 #define BLK_BOUNCE_ANY		(-1ULL)
-#define BLK_BOUNCE_ISA		(ISA_DMA_THRESHOLD)
+#define BLK_BOUNCE_ISA		(DMA_BIT_MASK(24))
 
 /*
  * default timeout for SG_IO if none specified