linux-hardened/drivers/power
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
..
avs ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ 2012-09-12 18:06:30 -07:00
ab8500_btemp.c workqueue: make deferrable delayed_work initializer names consistent 2012-08-21 13:18:23 -07:00
ab8500_charger.c workqueue: make deferrable delayed_work initializer names consistent 2012-08-21 13:18:23 -07:00
ab8500_fg.c workqueue: make deferrable delayed_work initializer names consistent 2012-08-21 13:18:23 -07:00
abx500_chargalg.c workqueue: make deferrable delayed_work initializer names consistent 2012-08-21 13:18:23 -07:00
apm_power.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
bq27x00_battery.c bq27x00_battery: Add support for BQ27425 chip 2012-07-13 20:26:20 -07:00
charger-manager.c workqueue: use mod_delayed_work() instead of cancel + queue 2012-08-13 16:27:37 -07:00
collie_battery.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
da9030_battery.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
da9052-battery.c da9052-battery: Convert to use module_platform_driver 2012-03-26 20:41:17 +04:00
ds2760_battery.c workqueue: use mod_delayed_work() instead of cancel + queue 2012-08-13 16:27:37 -07:00
ds2780_battery.c W1: split master mutex to avoid deadlocks. 2012-06-13 16:38:40 -07:00
ds2781_battery.c The tag contains just a few battery-related changes for v3.6. It's is 2012-07-31 18:08:25 -07:00
ds2782_battery.c power_supply: Convert i2c drivers to module_i2c_driver 2012-03-26 20:41:22 +04:00
generic-adc-battery.c power: battery: Generic battery driver using IIO 2012-09-22 10:40:23 +01:00
gpio-charger.c gpio-charger: Use cansleep version of gpio_set_value 2012-06-19 20:48:37 -07:00
intel_mid_battery.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
isp1704_charger.c usb: phy: fix return value check of usb_get_phy 2012-07-02 10:40:49 +03:00
jz4740-battery.c workqueue: use mod_delayed_work() instead of cancel + queue 2012-08-13 16:27:37 -07:00
Kconfig power: battery: Generic battery driver using IIO 2012-09-22 10:40:23 +01:00
lp8727_charger.c lp8727_charger: Move header file into platform_data directory 2012-07-14 01:14:35 -07:00
Makefile power: battery: Generic battery driver using IIO 2012-09-22 10:40:23 +01:00
max8903_charger.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
max8925_power.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
max8997_charger.c max8997_charger: Remove duplicate module.h 2012-01-06 04:59:25 +04:00
max8998_charger.c Revert "max8998_charger: Include linux/module.h just once" 2012-03-26 20:41:27 +04:00
max17040_battery.c workqueue: make deferrable delayed_work initializer names consistent 2012-08-21 13:18:23 -07:00
max17042_battery.c max17042_battery: Support CHARGE_COUNTER power supply attribute 2012-06-19 16:48:08 -07:00
olpc_battery.c Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc 2012-08-02 11:52:39 -07:00
pcf50633-charger.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
pda_power.c This patch series contains a major revamp of how we collect entropy 2012-07-31 19:07:42 -07:00
pmu_battery.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
power_supply.h device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
power_supply_core.c Merge with upstream to accommodate with thermal changes 2012-07-31 05:16:47 -07:00
power_supply_leds.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
power_supply_sysfs.c power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT 2012-07-13 20:41:58 -07:00
s3c_adc_battery.c s3c_adc_battery: Average over more than one adc sample 2012-01-06 06:13:35 +04:00
sbs-battery.c sbs-battery: Don't trigger false supply_changed event 2012-06-19 19:26:40 -07:00
smb347-charger.c smb347-charger: Add constant charge and current properties 2012-06-19 16:47:37 -07:00
test_power.c test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties 2012-06-20 22:45:41 -07:00
tosa_battery.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
twl4030_charger.c The tag contains just a few battery-related changes for v3.6. It's is 2012-07-31 18:08:25 -07:00
wm97xx_battery.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
wm831x_backup.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
wm831x_power.c mfd: Convert wm831x to irq_domain 2012-05-20 17:27:07 +02:00
wm8350_power.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
z2_battery.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00