From: Corentin Chary <corentincj@iksaif.net>
To: Greg Kroah-Hartman <greg@kroah.com>
Cc: Brian Swetland <swetland@google.com>,
Chih-Wei Huang <cwhuang@linux.org.tw>,
LKML <linux-kernel@vger.kernel.org>,
Corentin Chary <corentincj@iksaif.net>
Subject: [PATCH 1/2] staging/android: fix build issues
Date: Sat, 28 Nov 2009 09:45:14 +0100 [thread overview]
Message-ID: <1259397915-762-2-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <1259397915-762-1-git-send-email-corentincj@iksaif.net>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/staging/android/logger.c | 1 +
drivers/staging/android/lowmemorykiller.c | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 6c10b45..64cc2a1 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -17,6 +17,7 @@
* GNU General Public License for more details.
*/
+#include <linux/sched.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 935d281..32314e8 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -100,15 +100,17 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
read_lock(&tasklist_lock);
for_each_process(p) {
struct mm_struct *mm;
+ struct signal_struct *sig;
int oom_adj;
task_lock(p);
mm = p->mm;
- if (!mm) {
+ sig = p->signal;
+ if (!mm || !sig) {
task_unlock(p);
continue;
}
- oom_adj = mm->oom_adj;
+ oom_adj = sig->oom_adj;
if (oom_adj < min_adj) {
task_unlock(p);
continue;
--
1.6.5.2
next prev parent reply other threads:[~2009-11-28 8:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-28 8:45 [PATCH 0/2] staging/android fixes Corentin Chary
2009-11-28 8:45 ` Corentin Chary [this message]
2009-11-28 8:45 ` [PATCH 2/2] staging/android: remove BROKEN flag Corentin Chary
2009-11-28 10:19 ` [PATCH 0/2] staging/android fixes Brian Swetland
2009-11-29 8:43 ` Pavel Machek
2009-11-29 9:38 ` Brian Swetland
2009-11-30 12:30 ` Pavel Machek
2009-11-28 18:58 ` Greg KH
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=1259397915-762-2-git-send-email-corentincj@iksaif.net \
--to=corentincj@iksaif.net \
--cc=cwhuang@linux.org.tw \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=swetland@google.com \
/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
all inboxes | Powered by JetHome®