Merge branch 'for-4.9' into for-4.10

This commit is contained in:
Tejun Heo 2016-10-19 12:12:40 -04:00
commit 8bc4a04455
8 changed files with 102 additions and 48 deletions

View file

@ -590,14 +590,6 @@ static inline bool schedule_delayed_work(struct delayed_work *dwork,
return queue_delayed_work(system_wq, dwork, delay);
}
/**
* keventd_up - is workqueue initialized yet?
*/
static inline bool keventd_up(void)
{
return system_wq != NULL;
}
#ifndef CONFIG_SMP
static inline long work_on_cpu(int cpu, long (*fn)(void *), void *arg)
{
@ -632,4 +624,7 @@ int workqueue_online_cpu(unsigned int cpu);
int workqueue_offline_cpu(unsigned int cpu);
#endif
int __init workqueue_init_early(void);
int __init workqueue_init(void);
#endif