Fix s4 in 2.5.54

From: Pavel Machek (pavel@ucw.cz)
Date: Mon Jan 06 2003 - 17:35:51 EST


Hi!

Andrew's drain_local_pages support enables swsusp to work again,
please apply,
                                                        Pavel

--- clean/kernel/suspend.c 2002-12-18 22:21:13.000000000 +0100
+++ linux-swsusp/kernel/suspend.c 2002-12-23 18:58:51.000000000 +0100
@@ -680,6 +680,8 @@
         struct sysinfo i;
         unsigned int nr_needed_pages = 0;
 
+ drain_local_pages();
+
         pagedir_nosave = NULL;
         printk( "/critical section: Counting pages to copy" );
         nr_copy_pages = count_and_copy_data_pages(NULL);
@@ -714,6 +716,7 @@
         nr_copy_pages_check = nr_copy_pages;
         pagedir_order_check = pagedir_order;
 
+ drain_local_pages(); /* During allocating of suspend pagedir, new cold pages may appear. Kill them */
         if (nr_copy_pages != count_and_copy_data_pages(pagedir_nosave)) /* copy */
                 BUG();
 

-- 
Worst form of spam? Adding advertisment signatures ala sourceforge.net.
What goes next? Inserting advertisment *into* email?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue Jan 07 2003 - 22:00:33 EST