tmp_suning_uos_patched/drivers/misc
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
..
altera-stapl
c2port char/misc: remove CONFIG_EXPERIMENTAL dependencies 2012-09-18 16:14:53 +01:00
carma carma: remove unnecessary DMA_INTERRUPT capability 2012-08-16 10:10:02 -07:00
cb710 PCI: do not call pci_set_power_state with PCI_D3cold 2012-06-23 10:50:44 -06:00
eeprom char/misc: remove CONFIG_EXPERIMENTAL dependencies 2012-09-18 16:14:53 +01:00
ibmasm 8250: three way resolve of the 8250 diffs 2012-07-17 09:11:50 -07:00
lis3lv02d drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init 2012-09-26 14:18:48 -07:00
mei char/misc: remove CONFIG_EXPERIMENTAL dependencies 2012-09-18 16:14:53 +01:00
sgi-gru Add #includes needed to permit the removal of asm/system.h 2012-03-28 18:30:03 +01:00
sgi-xp drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources 2012-08-21 16:45:03 -07:00
ti-st ti-st: Fix check for pdata->chip_awake function pointer 2012-08-16 12:32:34 -07:00
ab8500-pwm.c mfd: Register ab8500 devices using the newly DT:ed MFD API 2012-07-09 00:16:13 +02:00
ad525x_dpot-i2c.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
ad525x_dpot-spi.c MISC: convert drivers/misc/* to use module_spi_driver() 2012-01-24 16:31:49 -08:00
ad525x_dpot.c misc: do not mark exported functions __devexit 2012-04-18 14:54:31 -07:00
ad525x_dpot.h Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 2012-01-09 12:08:59 -08:00
apds990x.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
apds9802als.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
arm-charlcd.c
atmel_pwm.c
atmel_tclib.c ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter 2012-03-01 13:38:49 +01:00
atmel-ssc.c drivers/misc: Add module.h to files who are really modular. 2011-10-31 19:31:53 -04:00
bh1770glc.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
bh1780gli.c misc: add missing __devexit_p() annotations 2012-04-18 14:54:31 -07:00
bmp085-i2c.c driver: misc: bmp085: remove "of_match_table" property. 2012-08-16 10:10:02 -07:00
bmp085-spi.c misc: use module_spi_driver 2012-09-05 14:10:29 -07:00
bmp085.c misc: add support for bmp18x chips to the bmp085 driver 2012-04-18 14:57:14 -07:00
bmp085.h misc: add support for bmp18x chips to the bmp085 driver 2012-04-18 14:57:14 -07:00
cs5535-mfgpt.c char and misc driver merge for 3.4-rc1 2012-03-20 11:15:18 -07:00
ds1682.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
enclosure.c
ep93xx_pwm.c
fsa9480.c misc: fsa9480: Remove obsolete cleanup for clientdata 2012-02-24 14:16:42 -08:00
hmc6352.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
hpilo.c MISC: hpilo, remove pci_disable_device 2012-09-26 13:20:40 -07:00
hpilo.h misc: hpilo: increase number of max supported channels 2012-06-14 17:22:12 -07:00
ics932s401.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
ioc4.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
isl29003.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
isl29020.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
Kconfig char/misc: remove CONFIG_EXPERIMENTAL dependencies 2012-09-18 16:14:53 +01:00
kgdbts.c x86,kgdb: Fix DEBUG_RODATA limitation using text_poke() 2012-03-29 17:41:25 -05:00
lkdtm.c drivers/misc/lkdtm.c: fix missing allocation failure check 2012-07-30 17:25:22 -07:00
Makefile iwmc3200top: remove driver for unavailable hardware 2012-07-11 15:40:22 -04:00
pch_phub.c pch_phub: use module_pci_driver 2012-08-16 10:09:15 -07:00
phantom.c
pti.c misc: pti, use tty_port_register_device 2012-08-10 13:29:57 -07:00
spear13xx_pcie_gadget.c MISC: convert drivers/misc/* to use module_platform_driver() 2012-01-24 16:31:48 -08:00
ti_dac7512.c MISC: convert drivers/misc/* to use module_spi_driver() 2012-01-24 16:31:49 -08:00
tifm_7xx1.c tifm: use module_pci_driver 2012-09-05 14:10:29 -07:00
tifm_core.c drivers/misc: Add module.h to files who are really modular. 2011-10-31 19:31:53 -04:00
tsl2550.c MISC: convert drivers/misc/* to use module_i2c_driver() 2012-01-24 16:31:49 -08:00
vmw_balloon.c vmw_balloon: fix for a -Wuninitialized warning 2012-02-02 16:28:13 -08:00