|
@@ -195,7 +195,6 @@ static void delayed_work_timer_fn(unsigned long __data)
|
|
int queue_delayed_work(struct workqueue_struct *wq,
|
|
int queue_delayed_work(struct workqueue_struct *wq,
|
|
struct delayed_work *dwork, unsigned long delay)
|
|
struct delayed_work *dwork, unsigned long delay)
|
|
{
|
|
{
|
|
- timer_stats_timer_set_start_info(&dwork->timer);
|
|
|
|
if (delay == 0)
|
|
if (delay == 0)
|
|
return queue_work(wq, &dwork->work);
|
|
return queue_work(wq, &dwork->work);
|
|
|
|
|
|
@@ -219,11 +218,12 @@ int queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
|
|
struct timer_list *timer = &dwork->timer;
|
|
struct timer_list *timer = &dwork->timer;
|
|
struct work_struct *work = &dwork->work;
|
|
struct work_struct *work = &dwork->work;
|
|
|
|
|
|
- timer_stats_timer_set_start_info(&dwork->timer);
|
|
|
|
if (!test_and_set_bit(WORK_STRUCT_PENDING, work_data_bits(work))) {
|
|
if (!test_and_set_bit(WORK_STRUCT_PENDING, work_data_bits(work))) {
|
|
BUG_ON(timer_pending(timer));
|
|
BUG_ON(timer_pending(timer));
|
|
BUG_ON(!list_empty(&work->entry));
|
|
BUG_ON(!list_empty(&work->entry));
|
|
|
|
|
|
|
|
+ timer_stats_timer_set_start_info(&dwork->timer);
|
|
|
|
+
|
|
/* This stores cwq for the moment, for the timer_fn */
|
|
/* This stores cwq for the moment, for the timer_fn */
|
|
set_wq_data(work, wq_per_cpu(wq, raw_smp_processor_id()));
|
|
set_wq_data(work, wq_per_cpu(wq, raw_smp_processor_id()));
|
|
timer->expires = jiffies + delay;
|
|
timer->expires = jiffies + delay;
|
|
@@ -564,7 +564,6 @@ EXPORT_SYMBOL(schedule_work);
|
|
int schedule_delayed_work(struct delayed_work *dwork,
|
|
int schedule_delayed_work(struct delayed_work *dwork,
|
|
unsigned long delay)
|
|
unsigned long delay)
|
|
{
|
|
{
|
|
- timer_stats_timer_set_start_info(&dwork->timer);
|
|
|
|
return queue_delayed_work(keventd_wq, dwork, delay);
|
|
return queue_delayed_work(keventd_wq, dwork, delay);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(schedule_delayed_work);
|
|
EXPORT_SYMBOL(schedule_delayed_work);
|
|
@@ -581,7 +580,6 @@ EXPORT_SYMBOL(schedule_delayed_work);
|
|
int schedule_delayed_work_on(int cpu,
|
|
int schedule_delayed_work_on(int cpu,
|
|
struct delayed_work *dwork, unsigned long delay)
|
|
struct delayed_work *dwork, unsigned long delay)
|
|
{
|
|
{
|
|
- timer_stats_timer_set_start_info(&dwork->timer);
|
|
|
|
return queue_delayed_work_on(cpu, keventd_wq, dwork, delay);
|
|
return queue_delayed_work_on(cpu, keventd_wq, dwork, delay);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(schedule_delayed_work_on);
|
|
EXPORT_SYMBOL(schedule_delayed_work_on);
|