diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/s390/cio/qdio.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/s390/cio/qdio.c')
| -rw-r--r-- | drivers/s390/cio/qdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index 7c93a8798d23..cde822d8b5c8 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c | |||
| @@ -115,7 +115,7 @@ qdio_min(int a,int b) | |||
| 115 | static inline __u64 | 115 | static inline __u64 |
| 116 | qdio_get_micros(void) | 116 | qdio_get_micros(void) |
| 117 | { | 117 | { |
| 118 | return (get_clock() >> 10); /* time>>12 is microseconds */ | 118 | return (get_clock() >> 12); /* time>>12 is microseconds */ |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | /* | 121 | /* |
| @@ -1129,7 +1129,7 @@ out: | |||
| 1129 | 1129 | ||
| 1130 | #ifdef QDIO_USE_PROCESSING_STATE | 1130 | #ifdef QDIO_USE_PROCESSING_STATE |
| 1131 | if (last_position>=0) | 1131 | if (last_position>=0) |
| 1132 | set_slsb(q, &last_position, SLSB_P_INPUT_NOT_INIT, &count); | 1132 | set_slsb(q, &last_position, SLSB_P_INPUT_PROCESSING, &count); |
| 1133 | #endif /* QDIO_USE_PROCESSING_STATE */ | 1133 | #endif /* QDIO_USE_PROCESSING_STATE */ |
| 1134 | 1134 | ||
| 1135 | QDIO_DBF_HEX4(0,trace,&q->first_to_check,sizeof(int)); | 1135 | QDIO_DBF_HEX4(0,trace,&q->first_to_check,sizeof(int)); |