Merge 4.16-rc6 into tty-next

We want the serial/tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 65e18c86d9b9..986b6796b631 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -166,7 +166,7 @@ static int __init __gic_clocksource_init(void)
 
         /* Set clocksource mask. */
         count_width = read_gic_config() & GIC_CONFIG_COUNTBITS;
-        count_width >>= __fls(GIC_CONFIG_COUNTBITS);
+        count_width >>= __ffs(GIC_CONFIG_COUNTBITS);
         count_width *= 4;
         count_width += 32;
         gic_clocksource.mask = CLOCKSOURCE_MASK(count_width);