Merge signal handler branch

[powerpc.git] / kernel / power / swsusp.c

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index f9238fa..f0ee4e7 100644 (file)
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -62,16 +62,6 @@ 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 int save_highmem(void) { return 0; }
-static int restore_highmem(void) { return 0; }
-static 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.
@@ -192,14 +182,16 @@ int swsusp_shrink_memory(void)
 
        printk("Shrinking memory...  ");
        do {
-               size = 2 * count_highmem_pages();
+               size = 2 * count_special_pages();
                size += size / 50 + count_data_pages();
                size += (size + PBES_PER_PAGE - 1) / PBES_PER_PAGE +
                        PAGES_FOR_IO;
                tmp = size;
                for_each_zone (zone)
-                       if (!is_highmem(zone))
+                       if (!is_highmem(zone) && populated_zone(zone)) {
                                tmp -= zone->free_pages;
+                               tmp += zone->lowmem_reserve[ZONE_NORMAL];
+                       }
                if (tmp > 0) {
                        tmp = __shrink_memory(tmp);
                        if (!tmp)
@@ -234,7 +226,7 @@ int swsusp_suspend(void)
                goto Enable_irqs;
        }
 
-       if ((error = save_highmem())) {
+       if ((error = save_special_mem())) {
                printk(KERN_ERR "swsusp: Not enough free pages for highmem\n");
                goto Restore_highmem;
        }
@@ -245,7 +237,7 @@ int swsusp_suspend(void)
        /* Restore control flow magically appears here */
        restore_processor_state();
 Restore_highmem:
-       restore_highmem();
+       restore_special_mem();
        device_power_up();
 Enable_irqs:
        local_irq_enable();
@@ -271,7 +263,7 @@ int swsusp_resume(void)
         */
        swsusp_free();
        restore_processor_state();
-       restore_highmem();
+       restore_special_mem();
        touch_softlockup_watchdog();
        device_power_up();
        local_irq_enable();