All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
To: gregkh@suse.de
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	sfr@canb.auug.org.au, akpm@linux-foundation.org,
	rientjes@google.com
Subject: [PATCH] linux-next: 20090929 - android driver build breaks
Date: Tue, 29 Sep 2009 20:50:27 +0530	[thread overview]
Message-ID: <20090929152027.GC4373@linux.vnet.ibm.com> (raw)
In-Reply-To: <20090929140404.dfb2c5f5.sfr@canb.auug.org.au>

Hi Greg,

	next-20090929 randconfig build breaks with
CONFIG_ANDROID_LOW_MEMORY_KILLER=y

drivers/staging/android/lowmemorykiller.c: In function 'lowmem_shrink':
drivers/staging/android/lowmemorykiller.c:111: error: 'struct mm_struct' has no member named 'oom_adj'
make[3]: *** [drivers/staging/android/lowmemorykiller.o] Error 1

Commit 0753ba01e126020bf0f8150934903b48935b697d was reverted back,
which moves back oom_adj from mm_struct to task_struct and commit 
28b83c5193e7ab951e402252278f2cc79dc4d298 moved the oomkilladj
from task_struct to signal_struct. 

Following patch reverts the changes introduced by commit 
a6a9f81ccc9f5c86ccc22bbed1960a57d0316e8b to
drivers/staging/android/lowmemorykiller.c 

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
 drivers/staging/android/lowmemorykiller.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 935d281..63ef837 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -99,21 +99,19 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
 
 	read_lock(&tasklist_lock);
 	for_each_process(p) {
-		struct mm_struct *mm;
 		int oom_adj;
 
 		task_lock(p);
-		mm = p->mm;
-		if (!mm) {
+		if (!p->mm) {
 			task_unlock(p);
 			continue;
 		}
-		oom_adj = mm->oom_adj;
+		oom_adj = p->signal->oom_adj;
 		if (oom_adj < min_adj) {
 			task_unlock(p);
 			continue;
 		}
-		tasksize = get_mm_rss(mm);
+		tasksize = get_mm_rss(p->mm);
 		task_unlock(p);
 		if (tasksize <= 0)
 			continue;
			
			Kamalesh

  reply	other threads:[~2009-09-29 15:20 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-29  4:04 linux-next: Tree for September 29 Stephen Rothwell
2009-09-29 15:20 ` Kamalesh Babulal [this message]
2009-09-29 15:33   ` [PATCH] linux-next: 20090929 - android driver build breaks Greg KH
2009-10-08 22:47   ` Greg KH
2009-10-08 23:24     ` David Rientjes
2009-10-08 23:28       ` Greg KH
2009-10-08 23:48         ` David Rientjes
2009-10-09  0:22           ` Greg KH
2009-10-11  9:05         ` Pavel Machek

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=20090929152027.GC4373@linux.vnet.ibm.com \
    --to=kamalesh@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rientjes@google.com \
    --cc=sfr@canb.auug.org.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.