diff options
| author |   Tony Lindgren <tony@atomide.com> | 2018-11-08 09:32:24 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-11-08 09:32:24 -0800 |
| commit | 91e43395820baad80248987608216c35da9df65b (patch) | |
| tree | 29d41d1a036eb1abd6a60f16ad37aa578acd8159 /kernel/workqueue.c | |
| parent | ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup (diff) | |
| parent | ARM: OMAP1: ams-delta: Fix possible use of uninitialized field (diff) | |
Merge branch 'fixes-dts' into omap-for-v4.20/fixes
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 60e80198c3df..0280deac392e 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5574,7 +5574,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused) mod_timer(&wq_watchdog_timer, jiffies + thresh); } -void wq_watchdog_touch(int cpu) +notrace void wq_watchdog_touch(int cpu) { if (cpu >= 0) per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies; |