diff options
| author | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-07-26 16:27:13 +0800 |
|---|---|---|
| committer | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-09-16 13:32:44 +0800 |
| commit | b33180dfa318663e1ef259d86256ef86619315cd (patch) | |
| tree | 9195dec7f71079049093a8ec835be667069384ec /kernel | |
| parent | bbf7dbd546da98123f5243db532e01d54f755c7b (diff) | |
ENGR00156905 mx6q: add android msl part, pmem, etc
Android: fix android build error.
fix build error
Update the imx6_android_defconfig
create an android.h for android devices.
add mx6q fixup for pmem.
Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpuset.c | 2 | ||||
| -rw-r--r-- | kernel/power/consoleearlysuspend.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index e210b3d30085..beae43e46efc 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1382,7 +1382,7 @@ static int cpuset_can_attach(struct cgroup_subsys *ss, struct cgroup *cont, int ret; struct cpuset *cs = cgroup_cs(cont); - if ((current != task) && (!capable(CAP_SYS_ADMIN))) { + if ((current != tsk) && (!capable(CAP_SYS_ADMIN))) { const struct cred *cred = current_cred(), *tcred; if (cred->euid != tcred->uid && cred->euid != tcred->suid) diff --git a/kernel/power/consoleearlysuspend.c b/kernel/power/consoleearlysuspend.c index a3edcb267389..2b9bfae33438 100644 --- a/kernel/power/consoleearlysuspend.c +++ b/kernel/power/consoleearlysuspend.c @@ -1,4 +1,4 @@ -/* kernel/power/consoleearlysuspend.c + /* kernel/power/consoleearlysuspend.c * * Copyright (C) 2005-2008 Google, Inc. * @@ -25,28 +25,28 @@ static int orig_fgconsole; static void console_early_suspend(struct early_suspend *h) { - acquire_console_sem(); + console_lock(); orig_fgconsole = fg_console; if (vc_allocate(EARLY_SUSPEND_CONSOLE)) goto err; if (set_console(EARLY_SUSPEND_CONSOLE)) goto err; - release_console_sem(); + console_unlock(); if (vt_waitactive(EARLY_SUSPEND_CONSOLE + 1)) pr_warning("console_early_suspend: Can't switch VCs.\n"); return; err: pr_warning("console_early_suspend: Can't set console\n"); - release_console_sem(); + console_unlock(); } static void console_late_resume(struct early_suspend *h) { int ret; - acquire_console_sem(); + console_lock(); ret = set_console(orig_fgconsole); - release_console_sem(); + console_unlock(); if (ret) { pr_warning("console_late_resume: Can't set console.\n"); return; |