diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-05-29 16:50:55 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-06-15 10:50:57 +0200 |
| commit | 2e4aa2f2bdcf9b80bace0b0c460bd407d76f49d3 (patch) | |
| tree | e15f05bfe523236f04db9e7b0e2f284ac2afceb0 /drivers/s390/char | |
| parent | 4e0a64124f80029d787d2d1fd2b0daf2b431cb70 (diff) | |
| download | talos-op-linux-2e4aa2f2bdcf9b80bace0b0c460bd407d76f49d3.tar.gz talos-op-linux-2e4aa2f2bdcf9b80bace0b0c460bd407d76f49d3.zip | |
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>
Diffstat (limited to 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/sclp_sdias.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c index eb7cb076c001..7cdd13dd7be1 100644 --- a/drivers/s390/char/sclp_sdias.c +++ b/drivers/s390/char/sclp_sdias.c @@ -21,7 +21,6 @@ #define TRACE(x...) debug_sprintf_event(sdias_dbf, 1, x) #define SDIAS_RETRIES 300 -#define SDIAS_SLEEP_TICKS 50 static struct debug_info *sdias_dbf; @@ -68,7 +67,7 @@ static int sdias_sclp_send(struct sclp_req *req) /* not initiated, wait some time and retry */ set_current_state(TASK_INTERRUPTIBLE); TRACE("add request failed: rc = %i\n",rc); - schedule_timeout(SDIAS_SLEEP_TICKS); + schedule_timeout(msecs_to_jiffies(500)); continue; } /* initiated, wait for completion of service call */ |
