clocksource: Skip watchdog check for large watchdog intervals

[platform/kernel/linux-starfive.git] / kernel / power / snapshot.c

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 0f12e0a..50a1540 100644 (file)
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -2545,8 +2545,9 @@ static void *get_highmem_page_buffer(struct page *page,
                pbe->copy_page = tmp;
        } else {
                /* Copy of the page will be stored in normal memory */
                pbe->copy_page = tmp;
        } else {
                /* Copy of the page will be stored in normal memory */

-               kaddr = safe_pages_list;
-               safe_pages_list = safe_pages_list->next;
+               kaddr = __get_safe_page(ca->gfp_mask);
+               if (!kaddr)
+                       return ERR_PTR(-ENOMEM);

                pbe->copy_page = virt_to_page(kaddr);
        }
        pbe->next = highmem_pblist;
                pbe->copy_page = virt_to_page(kaddr);
        }
        pbe->next = highmem_pblist;


@@ -2750,8 +2751,9 @@ static void *get_buffer(struct memory_bitmap *bm, struct chain_allocator *ca)
                return ERR_PTR(-ENOMEM);
        }
        pbe->orig_address = page_address(page);
                return ERR_PTR(-ENOMEM);
        }
        pbe->orig_address = page_address(page);

-       pbe->address = safe_pages_list;
-       safe_pages_list = safe_pages_list->next;
+       pbe->address = __get_safe_page(ca->gfp_mask);
+       if (!pbe->address)
+               return ERR_PTR(-ENOMEM);

        pbe->next = restore_pblist;
        restore_pblist = pbe;
        return pbe->address;
        pbe->next = restore_pblist;
        restore_pblist = pbe;
        return pbe->address;


@@ -2783,8 +2785,6 @@ next:
        if (handle->cur > 1 && handle->cur > nr_meta_pages + nr_copy_pages + nr_zero_pages)
                return 0;
 
        if (handle->cur > 1 && handle->cur > nr_meta_pages + nr_copy_pages + nr_zero_pages)
                return 0;
 

-       handle->sync_read = 1;
-

        if (!handle->cur) {
                if (!buffer)
                        /* This makes the buffer be freed by swsusp_free() */
        if (!handle->cur) {
                if (!buffer)
                        /* This makes the buffer be freed by swsusp_free() */


@@ -2827,7 +2827,6 @@ next:
                        memory_bm_position_reset(&zero_bm);
                        restore_pblist = NULL;
                        handle->buffer = get_buffer(&orig_bm, &ca);
                        memory_bm_position_reset(&zero_bm);
                        restore_pblist = NULL;
                        handle->buffer = get_buffer(&orig_bm, &ca);

-                       handle->sync_read = 0;

                        if (IS_ERR(handle->buffer))
                                return PTR_ERR(handle->buffer);
                }
                        if (IS_ERR(handle->buffer))
                                return PTR_ERR(handle->buffer);
                }


@@ -2837,9 +2836,8 @@ next:
                handle->buffer = get_buffer(&orig_bm, &ca);
                if (IS_ERR(handle->buffer))
                        return PTR_ERR(handle->buffer);
                handle->buffer = get_buffer(&orig_bm, &ca);
                if (IS_ERR(handle->buffer))
                        return PTR_ERR(handle->buffer);

-               if (handle->buffer != buffer)
-                       handle->sync_read = 0;

        }
        }

+       handle->sync_read = (handle->buffer == buffer);

        handle->cur++;
 
        /* Zero pages were not included in the image, memset it and move on. */
        handle->cur++;
 
        /* Zero pages were not included in the image, memset it and move on. */