Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390/sclp: pass timeout as HZ independent value

schedule_timeout takes a timeout in jiffies but the code currently is
passing in a constant SDIAS_SLEEP_TICKS, as this is otherwise unused
it is replaced by 500ms as recommended by Michael Holzheu
<holzheu@linux.vnet.ibm.com> and converted with msecs_to_jiffies();
As SDIAS_SLEEP_TICKS was only used in this one location it is dropped.

Patch was compile tested with (s390) defconfig +
CONFIG_MARCH_Z10=y, (implies CONFIG_CRASH_DUMP=y)

Patch is against 4.1-rc5 (localversion-next is -next-20150529)

Link: http://lkml.org/lkml/2015/5/29/235
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Nicholas Mc Guire and committed by
Martin Schwidefsky
2e4aa2f2 4e0a6412

+1 -2
+1 -2
drivers/s390/char/sclp_sdias.c
··· 21 21 #define TRACE(x...) debug_sprintf_event(sdias_dbf, 1, x) 22 22 23 23 #define SDIAS_RETRIES 300 24 - #define SDIAS_SLEEP_TICKS 50 25 24 26 25 static struct debug_info *sdias_dbf; 27 26 ··· 67 68 /* not initiated, wait some time and retry */ 68 69 set_current_state(TASK_INTERRUPTIBLE); 69 70 TRACE("add request failed: rc = %i\n",rc); 70 - schedule_timeout(SDIAS_SLEEP_TICKS); 71 + schedule_timeout(msecs_to_jiffies(500)); 71 72 continue; 72 73 } 73 74 /* initiated, wait for completion of service call */