Merge branch 'drm-nouveau-destage' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / kernel / power / snapshot.c

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 6a768e537001ce653e61c080baec76fbc5570da0..0de28576807df9e7dc5be5f05d75a0faa937caf2 100644 (file)
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -711,9 +711,10 @@ static void mark_nosave_pages(struct memory_bitmap *bm)
        list_for_each_entry(region, &nosave_regions, list) {
                unsigned long pfn;
 
-               pr_debug("PM: Marking nosave pages: %016lx - %016lx\n",
-                               region->start_pfn << PAGE_SHIFT,
-                               region->end_pfn << PAGE_SHIFT);
+               pr_debug("PM: Marking nosave pages: [mem %#010llx-%#010llx]\n",
+                        (unsigned long long) region->start_pfn << PAGE_SHIFT,
+                        ((unsigned long long) region->end_pfn << PAGE_SHIFT)
+                               - 1);
 
                for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++)
                        if (pfn_valid(pfn)) {
@@ -1000,20 +1001,20 @@ static void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
        s_page = pfn_to_page(src_pfn);
        d_page = pfn_to_page(dst_pfn);
        if (PageHighMem(s_page)) {
-               src = kmap_atomic(s_page, KM_USER0);
-               dst = kmap_atomic(d_page, KM_USER1);
+               src = kmap_atomic(s_page);
+               dst = kmap_atomic(d_page);
                do_copy_page(dst, src);
-               kunmap_atomic(dst, KM_USER1);
-               kunmap_atomic(src, KM_USER0);
+               kunmap_atomic(dst);
+               kunmap_atomic(src);
        } else {
                if (PageHighMem(d_page)) {
                        /* Page pointed to by src may contain some kernel
                         * data modified by kmap_atomic()
                         */
                        safe_copy_page(buffer, s_page);
-                       dst = kmap_atomic(d_page, KM_USER0);
+                       dst = kmap_atomic(d_page);
                        copy_page(dst, buffer);
-                       kunmap_atomic(dst, KM_USER0);
+                       kunmap_atomic(dst);
                } else {
                        safe_copy_page(page_address(d_page), s_page);
                }
@@ -1728,9 +1729,9 @@ int snapshot_read_next(struct snapshot_handle *handle)
                         */
                        void *kaddr;
 
-                       kaddr = kmap_atomic(page, KM_USER0);
+                       kaddr = kmap_atomic(page);
                        copy_page(buffer, kaddr);
-                       kunmap_atomic(kaddr, KM_USER0);
+                       kunmap_atomic(kaddr);
                        handle->buffer = buffer;
                } else {
                        handle->buffer = page_address(page);
@@ -2014,9 +2015,9 @@ static void copy_last_highmem_page(void)
        if (last_highmem_page) {
                void *dst;
 
-               dst = kmap_atomic(last_highmem_page, KM_USER0);
+               dst = kmap_atomic(last_highmem_page);
                copy_page(dst, buffer);
-               kunmap_atomic(dst, KM_USER0);
+               kunmap_atomic(dst);
                last_highmem_page = NULL;
        }
 }
@@ -2309,13 +2310,13 @@ swap_two_pages_data(struct page *p1, struct page *p2, void *buf)
 {
        void *kaddr1, *kaddr2;
 
-       kaddr1 = kmap_atomic(p1, KM_USER0);
-       kaddr2 = kmap_atomic(p2, KM_USER1);
+       kaddr1 = kmap_atomic(p1);
+       kaddr2 = kmap_atomic(p2);
        copy_page(buf, kaddr1);
        copy_page(kaddr1, kaddr2);
        copy_page(kaddr2, buf);
-       kunmap_atomic(kaddr2, KM_USER1);
-       kunmap_atomic(kaddr1, KM_USER0);
+       kunmap_atomic(kaddr2);
+       kunmap_atomic(kaddr1);
 }
 
 /**