[S390] Use del_timer instead of del_timer_sync
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>
Mon, 22 Jun 2009 10:08:09 +0000 (12:08 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 22 Jun 2009 10:08:19 +0000 (12:08 +0200)
commitf3dfa86caa4a54aceb2b235bf28a6f6ad73b2716
treecff505c68093e1bb1569c8151cd34782c5b7957f
parent66d51f3e81b1067bdc836b3aba609eec957c693c
[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 <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/sclp_con.c