summaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorJames Bottomley <jejb@raven.il.steeleye.com>2003-02-02 22:47:52 -0600
committerJames Bottomley <jejb@raven.il.steeleye.com>2003-02-02 22:47:52 -0600
commit69a9afd53e8756199c9d03d9740ddd6151704e8a (patch)
tree139dcbd7ecce64bce8ec576b47ecbc4697162ea6 /include/linux/blkdev.h
parent888fb5b90a0fbbce2311e7727398c30976bd215d (diff)
parent49a85c6a87f97479c0eb4500a69a54bdda28cafa (diff)
Merge raven.il.steeleye.com:/home/jejb/BK/scsi-combined-2.5
into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 6730edd230e0..90171e65e989 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -287,8 +287,8 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn;
* BLK_BOUNCE_ANY : don't bounce anything
* BLK_BOUNCE_ISA : bounce pages above ISA DMA boundary
*/
-#define BLK_BOUNCE_HIGH (blk_max_low_pfn << PAGE_SHIFT)
-#define BLK_BOUNCE_ANY (blk_max_pfn << PAGE_SHIFT)
+#define BLK_BOUNCE_HIGH ((u64)blk_max_low_pfn << PAGE_SHIFT)
+#define BLK_BOUNCE_ANY ((u64)blk_max_pfn << PAGE_SHIFT)
#define BLK_BOUNCE_ISA (ISA_DMA_THRESHOLD)
extern int init_emergency_isa_pool(void);