Use the patch in Gerrit
k3.0 - https://review.source.android.com/25356
k39 - https://review.source.android.com/21450
On Aug 18, 6:20 am, Maxime Ripard <maxime.rip...@free-electrons.com>
wrote:
> The commit ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff changed the
> functions used to acquire/release the console lock. This resulted in a
> compilation breakage for kernel/power/consoleearlysuspend.c which used
> these functions.
>
> Signed-off-by: Maxime Ripard <maxime.rip...@free-electrons.com>
> ---
> kernel/power/consoleearlysuspend.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/power/consoleearlysuspend.c
> b/kernel/power/consoleearlysuspend.c
> index a3edcb2..3f0c868 100644
> --- a/kernel/power/consoleearlysuspend.c
> +++ b/kernel/power/consoleearlysuspend.c
> @@ -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;
> --
> 1.7.4.1
--
unsubscribe: android-kernel+unsubscr...@googlegroups.com
website: http://groups.google.com/group/android-kernel
