swsusp: use inline functions for changing page flags

Replace direct invocations of SetPageNosave(), SetPageNosaveFree() etc.  with
calls to inline functions that can be changed in subsequent patches without
modifying the code calling them.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 36d713e216e8..59164313167f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -775,8 +775,8 @@ void mark_free_pages(struct zone *zone)
                 if (pfn_valid(pfn)) {
                         struct page *page = pfn_to_page(pfn);
 
-                        if (!PageNosave(page))
-                                ClearPageNosaveFree(page);
+                        if (!swsusp_page_is_forbidden(page))
+                                swsusp_unset_page_free(page);
                 }
 
         for (order = MAX_ORDER - 1; order >= 0; --order)
@@ -785,7 +785,7 @@ void mark_free_pages(struct zone *zone)
 
                         pfn = page_to_pfn(list_entry(curr, struct page, lru));
                         for (i = 0; i < (1UL << order); i++)
-                                SetPageNosaveFree(pfn_to_page(pfn + i));
+                                swsusp_set_page_free(pfn_to_page(pfn + i));
                 }
 
         spin_unlock_irqrestore(&zone->lock, flags);