usb: Bind devices to ACPI devices when possible

[~andy/linux] / drivers / block / loop.c

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index cd504353b2785fcaeebb5a58ccc6effe8568c43b..bbca966f8f66a20b04f62ac01ff41cd5ef18c037 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -93,16 +93,16 @@ static int transfer_none(struct loop_device *lo, int cmd,
                         struct page *loop_page, unsigned loop_off,
                         int size, sector_t real_block)
 {
-       char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
-       char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
+       char *raw_buf = kmap_atomic(raw_page) + raw_off;
+       char *loop_buf = kmap_atomic(loop_page) + loop_off;
 
        if (cmd == READ)
                memcpy(loop_buf, raw_buf, size);
        else
                memcpy(raw_buf, loop_buf, size);
 
-       kunmap_atomic(loop_buf, KM_USER1);
-       kunmap_atomic(raw_buf, KM_USER0);
+       kunmap_atomic(loop_buf);
+       kunmap_atomic(raw_buf);
        cond_resched();
        return 0;
 }
@@ -112,8 +112,8 @@ static int transfer_xor(struct loop_device *lo, int cmd,
                        struct page *loop_page, unsigned loop_off,
                        int size, sector_t real_block)
 {
-       char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
-       char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
+       char *raw_buf = kmap_atomic(raw_page) + raw_off;
+       char *loop_buf = kmap_atomic(loop_page) + loop_off;
        char *in, *out, *key;
        int i, keysize;
 
@@ -130,8 +130,8 @@ static int transfer_xor(struct loop_device *lo, int cmd,
        for (i = 0; i < size; i++)
                *out++ = *in++ ^ key[(i & 511) % keysize];
 
-       kunmap_atomic(loop_buf, KM_USER1);
-       kunmap_atomic(raw_buf, KM_USER0);
+       kunmap_atomic(loop_buf);
+       kunmap_atomic(raw_buf);
        cond_resched();
        return 0;
 }