diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-09-19 12:43:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-09-19 12:43:31 +1000 |
| commit | a06b51b5fa1122f664cc45c64c0df757debb94c4 (patch) | |
| tree | d0553cfa6b79fea82c81eeca15b74832069a4797 /kernel/time | |
| parent | f99b7e66cd8d3fa3bb76e971dc33cf57ad2cc1f6 (diff) | |
| parent | 09dd109d8241cd570391d4488337b77a4525f24e (diff) | |
Merge remote-tracking branch 'kspp/for-next/kspp'
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 32bf6f75a8fe..2d47980a1bc4 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1633,7 +1633,7 @@ static inline void __run_timers(struct timer_base *base) /* * This function runs timers and the timer-tq in bottom half context. */ -static void run_timer_softirq(struct softirq_action *h) +static __latent_entropy void run_timer_softirq(struct softirq_action *h) { struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]); |