[power] Make swsusp-only mm functions available when CONFIG_PM=y

Calls were moved to the PM core, so they must be compiled in to use them.

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4d2d3ce1d43066e59aab99678e073e75bc2ade62..453f291437ab6a4b52cc596f12e07710c885100e 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -388,7 +388,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
        return allocated;
 }
 
-#ifdef CONFIG_SOFTWARE_SUSPEND
+#ifdef CONFIG_PM
 int is_head_of_free_region(struct page *page)
 {
         struct zone *zone = page_zone(page);
@@ -435,7 +435,7 @@ void drain_local_pages(void)
        }
        local_irq_restore(flags);       
 }
-#endif /* CONFIG_SOFTWARE_SUSPEND */
+#endif /* CONFIG_PM */
 
 /*
  * Free a 0-order page

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 8603689905233fb0713a9a21b9bc562c576b0fbe..48c424295338e72820635a7823170cb3182e08d8 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1068,7 +1068,7 @@ void wakeup_kswapd(struct zone *zone)
        wake_up_interruptible(&zone->zone_pgdat->kswapd_wait);
 }
 
-#ifdef CONFIG_SOFTWARE_SUSPEND
+#ifdef CONFIG_PM
 /*
  * Try to free `nr_pages' of memory, system-wide.  Returns the number of freed
  * pages.