Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[mirror_ubuntu-artful-kernel.git] / drivers / block / umem.c

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index be90e15854ed5bf4078e8b9caa25d6d997231366..c141cc3be22bddc12079e3195c93dea225aafb9b 100644 (file)
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -54,7 +54,7 @@
 
 #include "umem.h"
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/io.h>
 
 #define MM_MAXCARDS 4
@@ -535,7 +535,7 @@ static blk_qc_t mm_make_request(struct request_queue *q, struct bio *bio)
        *card->biotail = bio;
        bio->bi_next = NULL;
        card->biotail = &bio->bi_next;
-       if (bio->bi_opf & REQ_SYNC || !mm_check_plugged(card))
+       if (op_is_sync(bio->bi_opf) || !mm_check_plugged(card))
                activate(card);
        spin_unlock_irq(&card->lock);