Skip to contentSkip to conversation

Suspend2 Merge: Supress various actions/errors while suspending [5/5]

PATCH New Nigel Cunningham 1 participant 1 message Sep 16, 2004 Memory management

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Suspend2 Merge: Supress various actions/errors while suspending [5/5]

Hi again.

Patch 5: Disable slab reaping during suspend.

Regards,

Nigel

mm/slab.c +8 -1
diff -ruN 505-disable-cache-reaping-during-suspend-old/mm/slab.c 505-disable-cache-reaping-during-suspend-new/mm/slab.c
@@ -92,6 +92,7 @@
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
 #include	<linux/rcupdate.h>
+#include	<linux/suspend.h>
 
 #include	<asm/uaccess.h>
 #include	<asm/cacheflush.h>
@@ -2733,7 +2734,13 @@
 {
 	struct list_head *walk;
 
-	if (down_trylock(&cache_chain_sem)) {
+#ifdef CONFIG_SOFTWARE_SUSPEND2
+	if ((software_suspend_state & SOFTWARE_SUSPEND_RUNNING) ||
+		(down_trylock(&cache_chain_sem))) 
+#else
+	if (down_trylock(&cache_chain_sem))
+#endif
+	{
 		/* Give up. Setup the next iteration. */
 		schedule_delayed_work(&__get_cpu_var(reap_work), REAPTIMEOUT_CPUC + smp_processor_id());
 		return;
Signature · 7 lines
Nigel Cunningham
Pastoral Worker
Christian Reformed Church of Tuggeranong
PO Box 1004, Tuggeranong, ACT 2901

Many today claim to be tolerant. True tolerance, however, can cope with others
being intolerant.