public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Nigel Cunningham <ncunningham@linuxmail.org>
To: Andrew Morton <akpm@digeo.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] Suspend2 Merge: Supress various actions/errors while suspending [1/5]
Date: Fri, 17 Sep 2004 09:51:03 +1000	[thread overview]
Message-ID: <1095378660.5897.98.camel@laptop.cunninghams> (raw)

Patch 1:

Disable the OOM killer while suspend is running.

Regards,

Nigel

diff -ruN linux-2.6.9-rc1/mm/oom_kill.c software-suspend-linux-2.6.9-rc1-rev3/mm/oom_kill.c
--- linux-2.6.9-rc1/mm/oom_kill.c	2004-09-07 21:59:01.000000000 +1000
+++ software-suspend-linux-2.6.9-rc1-rev3/mm/oom_kill.c	2004-09-09 19:36:24.000000000 +1000
@@ -20,6 +20,7 @@
 #include <linux/swap.h>
 #include <linux/timex.h>
 #include <linux/jiffies.h>
+#include <linux/suspend.h>
 
 /* #define DEBUG */
 
@@ -230,6 +231,10 @@
 	static unsigned long first, last, count, lastkill;
 	unsigned long now, since;
 
+#ifdef CONFIG_SOFTWARE_SUSPEND2
+	if (software_suspend_state & SOFTWARE_SUSPEND_RUNNING)
+		return;
+#endif
 	spin_lock(&oom_lock);
 	now = jiffies;
 	since = now - last;

-- 
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.


             reply	other threads:[~2004-09-16 23:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-09-16 23:51 Nigel Cunningham [this message]
2004-09-17  2:03 ` [PATCH] Suspend2 Merge: Supress various actions/errors while suspending [1/5] Adam Kropelin
2004-09-17  6:15   ` Nigel Cunningham

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1095378660.5897.98.camel@laptop.cunninghams \
    --to=ncunningham@linuxmail.org \
    --cc=akpm@digeo.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox