diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
commit | 65133033ee6ee34724ea3d82d5d1cfc6839ffdae (patch) | |
tree | 2fca9fd5630bbfd503a75e3cc69f30056a629c92 /kernel/kthread.c | |
parent | 27a0a90d6301dd883a748538e4db692a5fb923e1 (diff) | |
parent | 652521d460cbfa24ef27717b4b28acfac4281be6 (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/kthread.c')
-rw-r--r-- | kernel/kthread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/kthread.c b/kernel/kthread.c index 621467c33fef..b262f47046ca 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -866,9 +866,9 @@ void kthread_delayed_work_timer_fn(struct timer_list *t) } EXPORT_SYMBOL(kthread_delayed_work_timer_fn); -void __kthread_queue_delayed_work(struct kthread_worker *worker, - struct kthread_delayed_work *dwork, - unsigned long delay) +static void __kthread_queue_delayed_work(struct kthread_worker *worker, + struct kthread_delayed_work *dwork, + unsigned long delay) { struct timer_list *timer = &dwork->timer; struct kthread_work *work = &dwork->work; |