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

Commit bc3adfc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long
  workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'
  workqueue: wake up a worker when a rescuer is leaving a gcwq
parents 3c18d4de 3233cdbd

Documentation/workqueue.txt

+2 −2
Original line number Diff line number Diff line
@@ -190,9 +190,9 @@ resources, scheduled and executed. 
	* Long running CPU intensive workloads which can be better

	  managed by the system scheduler.



  WQ_FREEZEABLE

  WQ_FREEZABLE



	A freezeable wq participates in the freeze phase of the system

	A freezable wq participates in the freeze phase of the system

	suspend operations.  Work items on the wq are drained and no

	new work item starts execution until thawed.

drivers/memstick/core/memstick.c

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static int __init memstick_init(void) 
{

	int rc;



	workqueue = create_freezeable_workqueue("kmemstick");

	workqueue = create_freezable_workqueue("kmemstick");

	if (!workqueue)

		return -ENOMEM;

drivers/misc/tifm_core.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static int __init tifm_init(void) 
{

	int rc;



	workqueue = create_freezeable_workqueue("tifm");

	workqueue = create_freezable_workqueue("tifm");

	if (!workqueue)

		return -ENOMEM;

drivers/misc/vmw_balloon.c

+1 −1
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ static int __init vmballoon_init(void) 
	if (x86_hyper != &x86_hyper_vmware)

		return -ENODEV;



	vmballoon_wq = create_freezeable_workqueue("vmmemctl");

	vmballoon_wq = create_freezable_workqueue("vmmemctl");

	if (!vmballoon_wq) {

		pr_err("failed to create workqueue\n");

		return -ENOMEM;

drivers/mtd/nand/r852.c

+1 −1
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 


	init_completion(&dev->dma_done);



	dev->card_workqueue = create_freezeable_workqueue(DRV_NAME);

	dev->card_workqueue = create_freezable_workqueue(DRV_NAME);



	if (!dev->card_workqueue)

		goto error9;