Linus Torvalds
033d9959ed
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq ...
Pull workqueue changes from Tejun Heo:
"This is workqueue updates for v3.7-rc1. A lot of activities this
round including considerable API and behavior cleanups.
* delayed_work combines a timer and a work item. The handling of the
timer part has always been a bit clunky leading to confusing
cancelation API with weird corner-case behaviors. delayed_work is
updated to use new IRQ safe timer and cancelation now works as
expected.
* Another deficiency of delayed_work was lack of the counterpart of
mod_timer() which led to cancel+queue combinations or open-coded
timer+work usages. mod_delayed_work[_on]() are added.
These two delayed_work changes make delayed_work provide interface
and behave like timer which is executed with process context.
* A work item could be executed concurrently on multiple CPUs, which
is rather unintuitive and made flush_work() behavior confusing and
half-broken under certain circumstances. This problem doesn't
exist for non-reentrant workqueues. While non-reentrancy check
isn't free, the overhead is incurred only when a work item bounces
across different CPUs and even in simulated pathological scenario
the overhead isn't too high.
All workqueues are made non-reentrant. This removes the
distinction between flush_[delayed_]work() and
flush_[delayed_]_work_sync(). The former is now as strong as the
latter and the specified work item is guaranteed to have finished
execution of any previous queueing on return.
* In addition to the various bug fixes, Lai redid and simplified CPU
hotplug handling significantly.
* Joonsoo introduced system_highpri_wq and used it during CPU
hotplug.
There are two merge commits - one to pull in IRQ safe timer from
tip/timers/core and the other to pull in CPU hotplug fixes from
wq/for-3.6-fixes as Lai's hotplug restructuring depended on them."
Fixed a number of trivial conflicts, but the more interesting conflicts
were silent ones where the deprecated interfaces had been used by new
code in the merge window, and thus didn't cause any real data conflicts.
Tejun pointed out a few of them, I fixed a couple more.
* 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)
workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()
workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()
workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()
workqueue: remove @delayed from cwq_dec_nr_in_flight()
workqueue: fix possible stall on try_to_grab_pending() of a delayed work item
workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()
workqueue: use __cpuinit instead of __devinit for cpu callbacks
workqueue: rename manager_mutex to assoc_mutex
workqueue: WORKER_REBIND is no longer necessary for idle rebinding
workqueue: WORKER_REBIND is no longer necessary for busy rebinding
workqueue: reimplement idle worker rebinding
workqueue: deprecate __cancel_delayed_work()
workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()
workqueue: use mod_delayed_work() instead of __cancel + queue
workqueue: use irqsafe timer for delayed_work
workqueue: clean up delayed_work initializers and add missing one
workqueue: make deferrable delayed_work initializer names consistent
workqueue: cosmetic whitespace updates for macro definitions
workqueue: deprecate system_nrt[_freezable]_wq
workqueue: deprecate flush[_delayed]_work_sync()
...
2012-10-02 09:54:49 -07:00
mfd: Remove __devexit annotation for pm80x_deinit
2012-07-16 15:26:45 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Add ability to wake the system for 88pm860x
2012-03-06 18:46:49 +01:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Fix memory leak in ab3100_otp_probe
2010-08-12 11:27:17 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Register ab8500 devices using the newly DT:ed MFD API
2012-07-09 00:16:13 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
mfd: Register ab8500 devices using the newly DT:ed MFD API
2012-07-09 00:16:13 +02:00
mfd: Add module.h to the implicit drivers/mfd users
2011-10-31 19:32:04 -04:00
mfd: Guard adp5520 PM methods with CONFIG_PM_SLEEP
2012-07-09 00:16:13 +02:00
mfd: Matches should be NULL when populate anatop child devices
2012-07-17 11:17:24 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Initial support for the WM5110
2012-07-16 15:00:32 +02:00
mfd: Initial support for the WM5110
2012-07-16 15:00:32 +02:00
mfd: Initial support for the WM5110
2012-07-16 15:00:32 +02:00
mfd: Initial support for the WM5110
2012-07-16 15:00:32 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Set da903x bits if new value is different from the old one
2011-12-20 18:50:56 +01:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd/da9052: make i2c_device_id array const
2012-09-11 08:57:36 +02:00
mfd: Convert da9052 to use devm_* APIs
2012-05-20 17:27:03 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
The common clk framework changes for 3.7 are dominated by ARM platform
2012-10-01 12:09:04 -07:00
mfd: dbx500: Provide a more accurate smp_twd clock
2012-09-06 17:57:21 -07:00
mfd: Use gpio_request_one from dm355evm_msp
2012-01-09 00:37:38 +01:00
ARM: pxa: remove irq_to_gpio from ezx-pcap driver
2012-08-09 15:16:41 +02:00
mfd: Fold irq_set_chip/irq_set_handler
2011-03-27 00:09:52 +01:00
mfd: Fold irq_set_chip/irq_set_handler
2011-03-27 00:09:52 +01:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
gpu/mfd/usb: Fix USB randconfig problems
2012-08-20 11:52:41 -07:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Use SI-units for the lm3533 max-current interface
2012-05-20 17:27:02 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Initial support for the WM5110
2012-07-16 15:00:32 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Add pm ops to max8925
2012-01-09 01:03:34 +01:00
mfd: Add irq domain support for max8997 interrupts
2012-07-09 00:16:13 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Cleanup irq namespace
2011-03-27 00:09:51 +01:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Allow to specify max77686 interrupt through DT or platform file also
2012-07-09 15:13:42 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: MAX77693: Fix interrupt handling bug
2012-09-16 00:32:57 +02:00
mfd: MAX77693: Fix NULL pointer error when initializing irqs
2012-09-16 00:33:09 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Drop modifying mc13xxx driver's id_table in probe
2012-07-16 15:40:17 +02:00
mfd: Drop modifying mc13xxx driver's id_table in probe
2012-07-16 15:40:17 +02:00
mfd: Move the mc13xxx-core spi specific code into a separate module
2012-05-01 12:35:40 +02:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
ARM: sa1100: move platform_data definitions
2012-09-14 11:18:57 +02:00
workqueue: deprecate flush[_delayed]_work_sync()
2012-08-20 14:51:24 -07:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix issues.
2012-07-09 00:16:25 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Convert MFD drivers to use module_platform_driver
2012-01-09 00:37:31 +01:00
mfd: Add missing out of memory check for pcf50633
2012-07-16 15:55:41 +02:00
mfd: Include linux/mfd/pcf50633/pmic.h in pcf50633-gpio.c
2012-03-06 18:46:51 +01:00
mfd: Include linux/mfd/pcf50633/mbc.h in pcf50633-irq.c
2012-03-06 18:46:51 +01:00
mfd: Add pm8xxx irq support
2011-05-26 19:45:28 +02:00
mfd: Add pm8xxx irq support
2011-05-26 19:45:28 +02:00
mfd: Add support for RICOH PMIC RC5T583
2012-03-16 20:05:45 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Add s2mps11 irq driver
2012-07-16 14:31:59 +02:00
mfd: Use DIV_ROUND_CLOSEST for sm501 clock
2012-03-16 20:37:47 +01:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
Viresh has moved
2012-06-20 14:39:36 -07:00
Viresh has moved
2012-06-20 14:39:36 -07:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Add support for stmpe variant 801
2012-01-09 00:37:44 +01:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
[media] mfd: Add timberdale video-in driver to timberdale
2010-12-29 08:16:46 -02:00
mfd: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required
2011-10-31 19:32:05 -04:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next
2012-09-28 14:45:07 +01:00
mfd: remove IRQF_SAMPLE_RANDOM which is now a no-op
2012-07-19 10:38:33 -04:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Add tps65910-irq devicetree init and irqdomain support
2012-05-20 17:27:08 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: printk/comment fixes
2012-09-01 10:01:31 -07:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Fix off-by-one value range checking for tps65912_i2c_write
2011-07-31 23:28:25 +02:00
tps65912: irq: add interrupt controller
2011-07-31 23:28:22 +02:00
mfd: Remove redundant spi driver bus initialization
2012-01-09 00:37:31 +01:00
mfd: Fix compile for twl-core.c by removing cpu_is_omap usage
2012-09-17 16:26:10 -07:00
mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files
2012-03-22 13:04:33 +01:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: enable wakeup on twl4030 IRQ.
2012-05-09 18:02:51 +02:00
mfd: Convert MFD drivers to use module_platform_driver
2012-01-09 00:37:31 +01:00
ARM: omap: fix section mismatch errors in TWL PMIC driver
2012-02-13 10:00:35 +00:00
mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups
2012-03-22 13:05:34 +01:00
mfd: twl6030-pwm.c needs MODULE_LICENSE
2011-07-31 23:28:27 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Add support for Device Tree to twl6040
2012-05-20 17:27:12 +02:00
MFD: ucb1x00-assabet: add support for UCB1x00 GPIO switches
2012-02-18 23:15:44 +00:00
MFD: ucb1x00-core: add wakeup support
2012-02-18 23:15:43 +00:00
MFD: ucb1x00: convert to use genirq
2012-02-18 23:15:43 +00:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: Convert wm831x to irq_domain
2012-05-20 17:27:07 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: wm831x: Convert to devm_regmap_init()
2012-02-22 13:57:05 +00:00
mfd: Emulate active low IRQs as well as active high IRQs for wm831x
2012-05-20 17:27:14 +02:00
mfd: wm831x: Feed the device UUID into device_add_randomness()
2012-07-19 10:38:31 -04:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
mfd: Mark headphone detect readback wm5102 register volatile
2012-07-09 00:46:29 +02:00
mfd: Add data tables for the WM5110
2012-07-16 14:59:56 +02:00
mfd: Remove custom wm8350 cache implementation
2012-07-09 00:16:10 +02:00
mfd: Rename wm8350 static gpio_set_debounce()
2011-09-06 16:37:58 +02:00
mfd: Add regmap cache support for wm8350
2012-07-09 00:16:10 +02:00
mfd: Rely on regmap cache in wm8350 interrupt controller
2012-07-09 00:16:10 +02:00
mfd: Remove custom wm8350 cache implementation
2012-07-09 00:16:10 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: core: Push irqdomain mapping out into devices
2012-09-15 23:22:04 +02:00
mfd: wm8994: Flag the interrupt block as requiring runtime PM be enabled
2012-08-07 20:30:00 +01:00
mfd: Cache wm8994 chip revision
2012-05-01 12:00:21 +02:00
mfd: Initialise WM8994 register cache after reading chip ID registers
2011-12-13 00:11:13 +08:00
033d9959ed