[GIT pull] timer fixes for 4.18

[Thomas Gleixner]

Linus,

please pull the latest timers-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

Two oneliners addressing NOHZ failures:

  - Use a bitmask to check for the pending timer softirq and not the bit
    number. The existing code using the bit number checked for the wrong
    bit, which caused timers to either expire late or stop completely.

  - Make the nohz evaluation on interrupt exit more robust. The existing
    code did not rearm the hardware when interrupting a running softirq in
    task context (ksoftirqd or tail of local_bh_enable()), which caused
    timers to either expire late or stop completely.

Thanks,

	tglx

------------------>
Anna-Maria Gleixner (1):
      nohz: Fix local_timer_softirq_pending()

Frederic Weisbecker (1):
      nohz: Fix missing tick reprogram when interrupting an inline softirq


 kernel/softirq.c         | 2 +-
 kernel/time/tick-sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 75ffc1d1a2e0..6f584861d329 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -390,7 +390,7 @@ static inline void tick_irq_exit(void)
 
 	/* Make sure that timer wheel updates are propagated */
 	if ((idle_cpu(cpu) && !need_resched()) || tick_nohz_full_cpu(cpu)) {
-		if (!in_interrupt())
+		if (!in_irq())
 			tick_nohz_irq_exit();
 	}
 #endif
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index da9455a6b42b..5b33e2f5c0ed 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -642,7 +642,7 @@ static void tick_nohz_restart(struct tick_sched *ts, ktime_t now)
 
 static inline bool local_timer_softirq_pending(void)
 {
-	return local_softirq_pending() & TIMER_SOFTIRQ;
+	return local_softirq_pending() & BIT(TIMER_SOFTIRQ);
 }
 
 static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)