From 314b19cb217939a1aa42cdd8c7aab64f71d1fdda Mon Sep 17 00:00:00 2001
From: Muthu Kumar <muthu.lkml@gmail.com>
Date: Mon, 5 Mar 2012 14:59:16 -0800
Subject: [PATCH] --- yaml --- r: 288244 b: refs/heads/master c:
 9354f1b8e6c55c335d1c4fb10d0ae7a041935240 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/block/floppy.c | 2 +-
 trunk/drivers/scsi/sd_dif.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 57e5d79bb724..7b638e977c68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ce70c0240d01309b34712f87eda4fbfba3c3764
+refs/heads/master: 9354f1b8e6c55c335d1c4fb10d0ae7a041935240
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 9baf11e86362..744f078f4dd8 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -3832,7 +3832,7 @@ static int __floppy_read_block_0(struct block_device *bdev)
 	bio.bi_size = size;
 	bio.bi_bdev = bdev;
 	bio.bi_sector = 0;
-	bio.bi_flags = BIO_QUIET;
+	bio.bi_flags = (1 << BIO_QUIET);
 	init_completion(&complete);
 	bio.bi_private = &complete;
 	bio.bi_end_io = floppy_rb0_complete;
diff --git a/trunk/drivers/scsi/sd_dif.c b/trunk/drivers/scsi/sd_dif.c
index 0cb39ff21171..f8fb2d691c0a 100644
--- a/trunk/drivers/scsi/sd_dif.c
+++ b/trunk/drivers/scsi/sd_dif.c
@@ -408,7 +408,7 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s
 			kunmap_atomic(sdt, KM_USER0);
 		}
 
-		bio->bi_flags |= BIO_MAPPED_INTEGRITY;
+		bio->bi_flags |= (1 << BIO_MAPPED_INTEGRITY);
 	}
 
 	return 0;