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

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

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

* 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: fix build failure introduced by s/freezeable/freezable/
  workqueue: add system_freezeable_wq
  rds/ib: use system_wq instead of rds_ib_fmr_wq
  net/9p: replace p9_poll_task with a work
  net/9p: use system_wq instead of p9_mux_wq
  xfs: convert to alloc_workqueue()
  reiserfs: make commit_wq use the default concurrency level
  ocfs2: use system_wq instead of ocfs2_quota_wq
  ext4: convert to alloc_workqueue()
  scsi/scsi_tgt_lib: scsi_tgtd isn't used in memory reclaim path
  scsi/be2iscsi,qla2xxx: convert to alloc_workqueue()
  misc/iwmc3200top: use system_wq instead of dedicated workqueues
  i2o: use alloc_workqueue() instead of create_workqueue()
  acpi: kacpi*_wq don't need WQ_MEM_RECLAIM
  fs/aio: aio_wq isn't used in memory reclaim path
  input/tps6507x-ts: use system_wq instead of dedicated workqueue
  cpufreq: use system_wq instead of dedicated workqueues
  wireless/ipw2x00: use system_wq instead of dedicated workqueues
  arm/omap: use system_wq in mailbox
  workqueue: use WQ_MEM_RECLAIM instead of WQ_RESCUER
parents 016aa2ed 24d51add

arch/arm/plat-omap/mailbox.c

+2 −8
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#include <plat/mailbox.h>



static struct workqueue_struct *mboxd;

static struct omap_mbox **mboxes;



static int mbox_configured;
@@ -197,7 +196,7 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox) 
	/* no more messages in the fifo. clear IRQ source. */

	ack_mbox_irq(mbox, IRQ_RX);

nomem:

	queue_work(mboxd, &mbox->rxq->work);

	schedule_work(&mbox->rxq->work);

}



static irqreturn_t mbox_interrupt(int irq, void *p)
@@ -307,7 +306,7 @@ static void omap_mbox_fini(struct omap_mbox *mbox) 
	if (!--mbox->use_count) {

		free_irq(mbox->irq, mbox);

		tasklet_kill(&mbox->txq->tasklet);

		flush_work(&mbox->rxq->work);

	flush_work_sync(&mbox->rxq->work);

		mbox_queue_free(mbox->txq);

		mbox_queue_free(mbox->rxq);

	}
@@ -409,10 +408,6 @@ static int __init omap_mbox_init(void) 
	if (err)

		return err;



	mboxd = create_workqueue("mboxd");

	if (!mboxd)

		return -ENOMEM;



	/* kfifo size sanity check: alignment and minimal size */

	mbox_kfifo_size = ALIGN(mbox_kfifo_size, sizeof(mbox_msg_t));

	mbox_kfifo_size = max_t(unsigned int, mbox_kfifo_size,
@@ -424,7 +419,6 @@ subsys_initcall(omap_mbox_init); 


static void __exit omap_mbox_exit(void)

{

	destroy_workqueue(mboxd);

	class_unregister(&omap_mbox_class);

}

module_exit(omap_mbox_exit);

drivers/acpi/osl.c

+3 −3
Original line number Diff line number Diff line
@@ -1589,9 +1589,9 @@ acpi_status __init acpi_os_initialize(void) 


acpi_status __init acpi_os_initialize1(void)

{

	kacpid_wq = create_workqueue("kacpid");

	kacpi_notify_wq = create_workqueue("kacpi_notify");

	kacpi_hotplug_wq = create_workqueue("kacpi_hotplug");

	kacpid_wq = alloc_workqueue("kacpid", 0, 1);

	kacpi_notify_wq = alloc_workqueue("kacpi_notify", 0, 1);

	kacpi_hotplug_wq = alloc_workqueue("kacpi_hotplug", 0, 1);

	BUG_ON(!kacpid_wq);

	BUG_ON(!kacpi_notify_wq);

	BUG_ON(!kacpi_hotplug_wq);

drivers/cpufreq/cpufreq_conservative.c

+3 −19
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ static unsigned int dbs_enable; /* number of CPUs using this policy */ 
 */

static DEFINE_MUTEX(dbs_mutex);



static struct workqueue_struct	*kconservative_wq;



static struct dbs_tuners {

	unsigned int sampling_rate;

	unsigned int sampling_down_factor;
@@ -560,7 +558,7 @@ static void do_dbs_timer(struct work_struct *work) 


	dbs_check_cpu(dbs_info);



	queue_delayed_work_on(cpu, kconservative_wq, &dbs_info->work, delay);

	schedule_delayed_work_on(cpu, &dbs_info->work, delay);

	mutex_unlock(&dbs_info->timer_mutex);

}
@@ -572,8 +570,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) 


	dbs_info->enable = 1;

	INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);

	queue_delayed_work_on(dbs_info->cpu, kconservative_wq, &dbs_info->work,

				delay);

	schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);

}



static inline void dbs_timer_exit(struct cpu_dbs_info_s *dbs_info)
@@ -716,25 +713,12 @@ struct cpufreq_governor cpufreq_gov_conservative = { 


static int __init cpufreq_gov_dbs_init(void)

{

	int err;



	kconservative_wq = create_workqueue("kconservative");

	if (!kconservative_wq) {

		printk(KERN_ERR "Creation of kconservative failed\n");

		return -EFAULT;

	}



	err = cpufreq_register_governor(&cpufreq_gov_conservative);

	if (err)

		destroy_workqueue(kconservative_wq);



	return err;

	return cpufreq_register_governor(&cpufreq_gov_conservative);

}



static void __exit cpufreq_gov_dbs_exit(void)

{

	cpufreq_unregister_governor(&cpufreq_gov_conservative);

	destroy_workqueue(kconservative_wq);

}

drivers/cpufreq/cpufreq_ondemand.c

+3 −17
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ static unsigned int dbs_enable; /* number of CPUs using this policy */ 
 */

static DEFINE_MUTEX(dbs_mutex);



static struct workqueue_struct	*kondemand_wq;



static struct dbs_tuners {

	unsigned int sampling_rate;

	unsigned int up_threshold;
@@ -667,7 +665,7 @@ static void do_dbs_timer(struct work_struct *work) 
		__cpufreq_driver_target(dbs_info->cur_policy,

			dbs_info->freq_lo, CPUFREQ_RELATION_H);

	}

	queue_delayed_work_on(cpu, kondemand_wq, &dbs_info->work, delay);

	schedule_delayed_work_on(cpu, &dbs_info->work, delay);

	mutex_unlock(&dbs_info->timer_mutex);

}
@@ -681,8 +679,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) 


	dbs_info->sample_type = DBS_NORMAL_SAMPLE;

	INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);

	queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,

		delay);

	schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);

}



static inline void dbs_timer_exit(struct cpu_dbs_info_s *dbs_info)
@@ -814,7 +811,6 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, 


static int __init cpufreq_gov_dbs_init(void)

{

	int err;

	cputime64_t wall;

	u64 idle_time;

	int cpu = get_cpu();
@@ -838,22 +834,12 @@ static int __init cpufreq_gov_dbs_init(void) 
			MIN_SAMPLING_RATE_RATIO * jiffies_to_usecs(10);

	}



	kondemand_wq = create_workqueue("kondemand");

	if (!kondemand_wq) {

		printk(KERN_ERR "Creation of kondemand failed\n");

		return -EFAULT;

	}

	err = cpufreq_register_governor(&cpufreq_gov_ondemand);

	if (err)

		destroy_workqueue(kondemand_wq);



	return err;

	return cpufreq_register_governor(&cpufreq_gov_ondemand);

}



static void __exit cpufreq_gov_dbs_exit(void)

{

	cpufreq_unregister_governor(&cpufreq_gov_ondemand);

	destroy_workqueue(kondemand_wq);

}

drivers/input/touchscreen/tps6507x-ts.c

+4 −8
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ struct tps6507x_ts { 
	struct input_dev	*input_dev;

	struct device		*dev;

	char			phys[32];

	struct workqueue_struct *wq;

	struct delayed_work	work;

	unsigned		polling;	/* polling is active */

	struct ts_event		tc;
@@ -220,7 +219,7 @@ static void tps6507x_ts_handler(struct work_struct *work) 
	poll = 1;



	if (poll) {

		schd = queue_delayed_work(tsc->wq, &tsc->work,

		schd = schedule_delayed_work(&tsc->work,

					msecs_to_jiffies(tsc->poll_period));

		if (schd)

			tsc->polling = 1;
@@ -303,7 +302,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev) 
	tsc->input_dev = input_dev;



	INIT_DELAYED_WORK(&tsc->work, tps6507x_ts_handler);

	tsc->wq = create_workqueue("TPS6507x Touchscreen");



	if (init_data) {

		tsc->poll_period = init_data->poll_period;
@@ -325,7 +323,7 @@ static int tps6507x_ts_probe(struct platform_device *pdev) 
	if (error)

		goto err2;



	schd = queue_delayed_work(tsc->wq, &tsc->work,

	schd = schedule_delayed_work(&tsc->work,

				     msecs_to_jiffies(tsc->poll_period));



	if (schd)
@@ -341,7 +339,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev) 


err2:

	cancel_delayed_work_sync(&tsc->work);

	destroy_workqueue(tsc->wq);

	input_free_device(input_dev);

err1:

	kfree(tsc);
@@ -357,7 +354,6 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev) 
	struct input_dev *input_dev = tsc->input_dev;



	cancel_delayed_work_sync(&tsc->work);

	destroy_workqueue(tsc->wq);



	input_unregister_device(input_dev);