1 files changed, 14 insertions, 4 deletions

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index f0ee4e7780d6..17f669c83012 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -62,6 +62,16 @@ unsigned long image_size = 500 * 1024 * 1024;
 
 int in_suspend __nosavedata = 0;
 
+#ifdef CONFIG_HIGHMEM
+unsigned int count_highmem_pages(void);
+int save_highmem(void);
+int restore_highmem(void);
+#else
+static inline int save_highmem(void) { return 0; }
+static inline int restore_highmem(void) { return 0; }
+static inline unsigned int count_highmem_pages(void) { return 0; }
+#endif
+
 /**
  *      The following functions are used for tracing the allocated
  *      swap pages, so that they can be freed in case of an error.
@@ -182,7 +192,7 @@ int swsusp_shrink_memory(void)
 
         printk("Shrinking memory...  ");
         do {
-                size = 2 * count_special_pages();
+                size = 2 * count_highmem_pages();
                 size += size / 50 + count_data_pages();
                 size += (size + PBES_PER_PAGE - 1) / PBES_PER_PAGE +
                         PAGES_FOR_IO;
@@ -226,7 +236,7 @@ int swsusp_suspend(void)
                 goto Enable_irqs;
         }
 
-        if ((error = save_special_mem())) {
+        if ((error = save_highmem())) {
                 printk(KERN_ERR "swsusp: Not enough free pages for highmem\n");
                 goto Restore_highmem;
         }
@@ -237,7 +247,7 @@ int swsusp_suspend(void)
         /* Restore control flow magically appears here */
         restore_processor_state();
 Restore_highmem:
-        restore_special_mem();
+        restore_highmem();
         device_power_up();
 Enable_irqs:
         local_irq_enable();
@@ -263,7 +273,7 @@ int swsusp_resume(void)
          */
         swsusp_free();
         restore_processor_state();
-        restore_special_mem();
+        restore_highmem();
         touch_softlockup_watchdog();
         device_power_up();
         local_irq_enable();