diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-29 08:25:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-29 08:25:19 +0200 |
| commit | 6de465a50a900b29793aaba67f41f98f0e5354a0 (patch) | |
| tree | f13eaeb75f0bfa3f7e609a58bcb891a869164042 /drivers/char | |
| parent | 41db5f8397eee75afff82655a4884b5786a1d302 (diff) | |
| parent | 609488bc979f99f805f34e9a32c1e3b71179d10b (diff) | |
| download | linux-6de465a50a900b29793aaba67f41f98f0e5354a0.tar.gz linux-6de465a50a900b29793aaba67f41f98f0e5354a0.tar.bz2 linux-6de465a50a900b29793aaba67f41f98f0e5354a0.zip | |
Merge 5.3-rc2 into char-misc-next
We want the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hpet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 5c39f20378b8..9ac6671bb514 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -567,8 +567,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets, unsigned long long m; m = hpets->hp_tick_freq + (dis >> 1); - do_div(m, dis); - return (unsigned long)m; + return div64_ul(m, dis); } static int |