5 files changed, 8 insertions, 8 deletions

diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c
index 0ec1fb69d4ea..518c22bd9562 100644
--- a/crypto/async_tx/async_memcpy.c
+++ b/crypto/async_tx/async_memcpy.c
@@ -83,8 +83,8 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
 
                 memcpy(dest_buf, src_buf, len);
 
-                kunmap_atomic(dest_buf, KM_USER0);
                 kunmap_atomic(src_buf, KM_USER1);
+                kunmap_atomic(dest_buf, KM_USER0);
 
                 async_tx_sync_epilog(submit);
         }
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 90d26c91f4e9..7a7219266e3c 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -89,9 +89,9 @@ static inline unsigned int blkcipher_done_fast(struct blkcipher_walk *walk,
                 memcpy(walk->dst.virt.addr, walk->page, n);
                 blkcipher_unmap_dst(walk);
         } else if (!(walk->flags & BLKCIPHER_WALK_PHYS)) {
-                blkcipher_unmap_src(walk);
                 if (walk->flags & BLKCIPHER_WALK_DIFF)
                         blkcipher_unmap_dst(walk);
+                blkcipher_unmap_src(walk);
         }
 
         scatterwalk_advance(&walk->in, n);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 6c48b3545f84..450c958b514f 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -101,8 +101,8 @@ static int transfer_none(struct loop_device *lo, int cmd,
         else
                 memcpy(raw_buf, loop_buf, size);
 
-        kunmap_atomic(raw_buf, KM_USER0);
         kunmap_atomic(loop_buf, KM_USER1);
+        kunmap_atomic(raw_buf, KM_USER0);
         cond_resched();
         return 0;
 }
@@ -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(raw_buf, KM_USER0);
         kunmap_atomic(loop_buf, KM_USER1);
+        kunmap_atomic(raw_buf, KM_USER0);
         cond_resched();
         return 0;
 }
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index e3060ef85b6d..283cd47bb34c 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -201,8 +201,8 @@ static inline void copy_user_highpage(struct page *to, struct page *from,
         vfrom = kmap_atomic(from, KM_USER0);
         vto = kmap_atomic(to, KM_USER1);
         copy_user_page(vto, vfrom, vaddr, to);
-        kunmap_atomic(vfrom, KM_USER0);
         kunmap_atomic(vto, KM_USER1);
+        kunmap_atomic(vfrom, KM_USER0);
 }
 
 #endif
@@ -214,8 +214,8 @@ static inline void copy_highpage(struct page *to, struct page *from)
         vfrom = kmap_atomic(from, KM_USER0);
         vto = kmap_atomic(to, KM_USER1);
         copy_page(vto, vfrom);
-        kunmap_atomic(vfrom, KM_USER0);
         kunmap_atomic(vto, KM_USER1);
+        kunmap_atomic(vfrom, KM_USER0);
 }
 
 #endif /* _LINUX_HIGHMEM_H */
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index ac7eb109f196..9e3581f4619a 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -984,8 +984,8 @@ static void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
                 src = kmap_atomic(s_page, KM_USER0);
                 dst = kmap_atomic(d_page, KM_USER1);
                 do_copy_page(dst, src);
-                kunmap_atomic(src, KM_USER0);
                 kunmap_atomic(dst, KM_USER1);
+                kunmap_atomic(src, KM_USER0);
         } else {
                 if (PageHighMem(d_page)) {
                         /* Page pointed to by src may contain some kernel
@@ -2273,8 +2273,8 @@ swap_two_pages_data(struct page *p1, struct page *p2, void *buf)
         memcpy(buf, kaddr1, PAGE_SIZE);
         memcpy(kaddr1, kaddr2, PAGE_SIZE);
         memcpy(kaddr2, buf, PAGE_SIZE);
-        kunmap_atomic(kaddr1, KM_USER0);
         kunmap_atomic(kaddr2, KM_USER1);
+        kunmap_atomic(kaddr1, KM_USER0);
 }
 
 /**