From a34dbd3bf2fc5b88fd922812ca321c551de38b1c Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 25 Oct 2011 11:42:23 +0800 Subject: earlysuspend: Update acquire/release_console_sem usage to console_lock/unlock aquire/release_console_sem() has been removed from the kernel since 2.6.37 So this patch updates earlysuspend to use the current console_lock/unlock() methods. Reported-by: Sachin Kamat Signed-off-by: John Stultz --- kernel/power/consoleearlysuspend.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/power/consoleearlysuspend.c b/kernel/power/consoleearlysuspend.c index a3edcb26738..3f0c8685fe1 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; -- cgit v1.2.3