diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:01:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:01:49 +0200 |
| commit | 64b7aad5798478ffff52e110878ccaae4c3aaa34 (patch) | |
| tree | 211764492dba48c45cbf186c66efa320ab7540db /kernel/locking | |
| parent | 078194f8e9fe3cf54c8fd8bded48a1db5bd8eb8a (diff) | |
| parent | 2548d546d40c0014efdde88a53bf7896e917dcce (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/qspinlock_stat.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/locking/qspinlock_stat.h b/kernel/locking/qspinlock_stat.h index eb2a2c9bc3fc..d734b7502001 100644 --- a/kernel/locking/qspinlock_stat.h +++ b/kernel/locking/qspinlock_stat.h @@ -136,10 +136,12 @@ static ssize_t qstat_read(struct file *file, char __user *user_buf, } if (counter == qstat_pv_hash_hops) { - u64 frac; + u64 frac = 0; - frac = 100ULL * do_div(stat, kicks); - frac = DIV_ROUND_CLOSEST_ULL(frac, kicks); + if (kicks) { + frac = 100ULL * do_div(stat, kicks); + frac = DIV_ROUND_CLOSEST_ULL(frac, kicks); + } /* * Return a X.XX decimal number |