Merge branch 'at91-4.14-trunk/fixes' into linux-4.14-at91

cristibirsan · cristibirsan · commit b60483e43e4c · 2018-10-02T16:49:02.000+03:00
diff --git a/kernel/softirq.c b/kernel/softirq.c
@@ -368,7 +368,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

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ static inline void tick_irq_exit(void)`
`368`	`368`
`369`	`369`	`/* Make sure that timer wheel updates are propagated */`
`370`	`370`	`if ((idle_cpu(cpu) && !need_resched()) \|\| tick_nohz_full_cpu(cpu)) {`
`371`		`- if (!in_interrupt())`
	`371`	`+ if (!in_irq())`
`372`	`372`	`tick_nohz_irq_exit();`
`373`	`373`	`}`
`374`	`374`	`#endif`