linux/arch/arm/mach-pxa
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
..
include/mach Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
am200epd.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
am300epd.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
balloon3.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
capc7117.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
clock-pxa2xx.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
clock-pxa3xx.c ARM: pxa: support CKENC in clk_enable 2012-08-16 16:15:44 +08:00
clock.c ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
clock.h ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
cm-x2xx-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
cm-x2xx-pci.h
cm-x2xx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
cm-x255.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
cm-x270.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
cm-x300.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-evalboard.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-pxa3xx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-pxa270-income.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-pxa270.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
colibri-pxa300.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-pxa320.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
corgi_pm.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
corgi.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
cpufreq-pxa2xx.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
cpufreq-pxa3xx.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
csb701.c
csb726.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
devices.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
devices.h ARM: pxa: change gpio to platform device 2011-11-15 19:08:27 +08:00
em-x270.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
eseries.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
ezx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
generic.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
generic.h ARM: pxa: remove duplicated registeration on pxa-gpio 2012-03-06 14:40:59 +08:00
gumstix.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
h5000.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
himalaya.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
hx4700.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
icontrol.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
idp.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
irq.c ARM: pxa: add devicetree code for irq handling 2012-08-16 16:14:50 +08:00
Kconfig ARM: pxa3xx: add generic DT machine code 2012-08-16 16:15:12 +08:00
littleton.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
lpd270.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
lubbock.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
magician.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
mainstone.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
Makefile ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp-pxa2xx.c ARM: PXA2xx: MFP: fix potential direction bug 2012-04-27 11:14:06 +08:00
mfp-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
mioa701_bootresume.S
mioa701.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
mp900.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
mxm8x10.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palm27x.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmld.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmt5.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmtc.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmte2.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmtreo.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmtx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmz72.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pcm027.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
pcm990-baseboard.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pm.c ARM: pm: move cpu_init() call into core code 2011-06-24 08:48:43 +01:00
poodle.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa2xx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa3xx-ulpi.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa3xx.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
pxa25x.c Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards 2012-03-10 09:15:30 -08:00
pxa27x.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa95x.c Merge branch 'next/fixes-non-critical' into next/drivers 2012-03-20 22:42:24 +00:00
pxa300.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
pxa320.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
pxa930.c ARM: pxa: support pxa95x 2010-12-18 21:02:14 +08:00
pxa-dt.c ARM: pxa3xx: add generic DT machine code 2012-08-16 16:15:12 +08:00
raumfeld.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
reset.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
saar.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
saarb.c arch/arm/mach-pxa/: included linux/gpio.h twice 2012-02-16 23:26:19 +08:00
sharpsl_pm.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
sleep.S ARM: pm: pxa: move cpu_suspend into C code 2011-06-24 08:48:45 +01:00
smemc.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
spitz_pm.c ARM: pxa: fix wrong parsing gpio event on spitz 2012-02-16 10:28:53 +08:00
spitz.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
standby.S
stargate2.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
tavorevb3.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
tavorevb.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
time.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
tosa-bt.c ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now 2011-02-27 21:38:18 +08:00
tosa.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
trizeps4.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
viper.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
vpac270.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
xcep.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
z2.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
zeus.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
zylonite_pxa300.c ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
zylonite_pxa320.c [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot 2009-12-29 14:11:34 +08:00
zylonite.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00