Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a2829b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

Pull workqueue update from Tejun Heo:
 "Just one patch to add destroy_work_on_stack() annotations to help
  debugobj debugging"

* 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Calling destroy_work_on_stack() to pair with INIT_WORK_ONSTACK()
parents ff0bc6cc 440a1136

kernel/workqueue.c

+2 −0
Original line number Diff line number Diff line
@@ -4789,6 +4789,7 @@ static int workqueue_cpu_down_callback(struct notifier_block *nfb, 


		/* wait for per-cpu unbinding to finish */

		flush_work(&unbind_work);

		destroy_work_on_stack(&unbind_work);

		break;

	}

	return NOTIFY_OK;
@@ -4828,6 +4829,7 @@ long work_on_cpu(int cpu, long (*fn)(void *), void *arg) 
	INIT_WORK_ONSTACK(&wfc.work, work_for_cpu_fn);

	schedule_work_on(cpu, &wfc.work);

	flush_work(&wfc.work);

	destroy_work_on_stack(&wfc.work);

	return wfc.ret;

}

EXPORT_SYMBOL_GPL(work_on_cpu);