From: Michael Holzheu Date: Mon, 22 Jun 2009 10:08:09 +0000 (+0200) Subject: [S390] Use del_timer instead of del_timer_sync X-Git-Tag: v2.6.31-rc1~59^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3dfa86caa4a54aceb2b235bf28a6f6ad73b2716;p=platform%2Fupstream%2Fkernel-adaptation-pc.git [S390] Use del_timer instead of del_timer_sync When syncing the sclp console queue, we call del_timer_sync() while holding the "sclp_con_lock" spinlock. This lock is also taken in the timer function "sclp_console_timeout". Therefore the sync version of del_timer() cannot be used here. Because the synchronous deletion of the timer is only needed in the suspend callback and in that case only one CPU is remaining and therefore it is not possible that the timer function is running in parallel, we can safely use del_timer() instead of del_timer_sync(). Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky --- diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c index fb54e7e..ad698d3 100644 --- a/drivers/s390/char/sclp_con.c +++ b/drivers/s390/char/sclp_con.c @@ -109,7 +109,7 @@ static void sclp_console_sync_queue(void) spin_lock_irqsave(&sclp_con_lock, flags); if (timer_pending(&sclp_con_timer)) - del_timer_sync(&sclp_con_timer); + del_timer(&sclp_con_timer); while (sclp_con_queue_running) { spin_unlock_irqrestore(&sclp_con_lock, flags); sclp_sync_wait();