diff options
| author | Brian Behlendorf <[email protected]> | 2015-12-22 09:26:10 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-12-22 10:32:35 -0800 |
| commit | 2a552736b7fc2bcb810cc520abd2ff9e229a9904 (patch) | |
| tree | edecde74c8a426a7b000f26cdac6128f1e23fcb4 | |
| parent | b4ad50ac5f16de9220452f0da493e67c060d701b (diff) | |
Fix do_div() types in condvar:timeout
The do_div() macro expects unsigned types and this is detected in
powerpc implementation of do_div().
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #516
| -rw-r--r-- | module/splat/splat-condvar.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/module/splat/splat-condvar.c b/module/splat/splat-condvar.c index ed633acda..af40a7258 100644 --- a/module/splat/splat-condvar.c +++ b/module/splat/splat-condvar.c @@ -383,8 +383,8 @@ splat_condvar_test5(struct file *file, void *arg) kcondvar_t condvar; kmutex_t mtx; clock_t time_left, time_before, time_after, time_delta; - int64_t whole_delta; - int32_t remain_delta; + uint64_t whole_delta; + uint32_t remain_delta; int rc = 0; mutex_init(&mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL); @@ -408,19 +408,20 @@ splat_condvar_test5(struct file *file, void *arg) splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, "Thread correctly timed out and was asleep " "for %d.%d seconds (%d second min)\n", - (int)whole_delta, remain_delta, 1); + (int)whole_delta, (int)remain_delta, 1); } else { splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, "Thread correctly timed out but was only " "asleep for %d.%d seconds (%d second " - "min)\n", (int)whole_delta, remain_delta, 1); + "min)\n", (int)whole_delta, + (int)remain_delta, 1); rc = -ETIMEDOUT; } } else { splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, "Thread exited after only %d.%d seconds, it " "did not hit the %d second timeout\n", - (int)whole_delta, remain_delta, 1); + (int)whole_delta, (int)remain_delta, 1); rc = -ETIMEDOUT; } |