diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-09-19 10:46:07 -0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-09-19 10:46:07 -0400 |
| commit | d20bbfab01802e195a50435940f7e4aa747c217c (patch) | |
| tree | 82b0007e33c083050a4e60a49dbb2f5477b4c99d /drivers/s390/cio/qdio.h | |
| parent | a37933c37c14b64e81c7c9cc44a5d3f5e0c91412 (diff) | |
| parent | 136333d104bd3a62d783b0ac3d0f32ac0108c5d0 (diff) | |
Merge branch 'slab/urgent' into slab/next
Diffstat (limited to 'drivers/s390/cio/qdio.h')
| -rw-r--r-- | drivers/s390/cio/qdio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h index 7bc643f3f5ab..e5c966462c5a 100644 --- a/drivers/s390/cio/qdio.h +++ b/drivers/s390/cio/qdio.h | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | #include "chsc.h" | 14 | #include "chsc.h" |
| 15 | 15 | ||
| 16 | #define QDIO_BUSY_BIT_PATIENCE (100 << 12) /* 100 microseconds */ | 16 | #define QDIO_BUSY_BIT_PATIENCE (100 << 12) /* 100 microseconds */ |
| 17 | #define QDIO_BUSY_BIT_RETRY_DELAY 10 /* 10 milliseconds */ | ||
| 18 | #define QDIO_BUSY_BIT_RETRIES 1000 /* = 10s retry time */ | ||
| 17 | #define QDIO_INPUT_THRESHOLD (500 << 12) /* 500 microseconds */ | 19 | #define QDIO_INPUT_THRESHOLD (500 << 12) /* 500 microseconds */ |
| 18 | 20 | ||
| 19 | /* | 21 | /* |