linux-sg2042/drivers/isdn/mISDN
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
..
Kconfig trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
Makefile mISDN: Add ISDN sample clock API to mISDN core 2009-01-09 22:44:27 +01:00
clock.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
core.c mISDN: Help to identify the card 2012-05-04 11:56:19 -04:00
core.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp.h mISDN: DSP scheduling fix (version 2) 2012-04-26 03:10:45 -04:00
dsp_audio.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_biquad.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_blowfish.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_cmx.c mISDN: DSP scheduling fix (version 2) 2012-04-26 03:10:45 -04:00
dsp_core.c mISDN: Implement MISDN_CTRL_FILL_EMPTY for more drivers 2012-05-16 15:24:05 -04:00
dsp_dtmf.c mISDN: Fix division by zero 2012-04-26 03:10:45 -04:00
dsp_ecdis.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_hwec.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_hwec.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_pipeline.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_tones.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
fsm.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
fsm.h Add mISDN core files 2008-07-27 01:54:58 +02:00
hwchannel.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
l1oip.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
l1oip_codec.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
l1oip_core.c mISDN: Allow to set a minimum length for transparent data 2012-05-16 15:23:46 -04:00
layer1.c mISDN: Layer1 statemachine fix 2012-05-04 11:55:39 -04:00
layer1.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
layer2.c mISDN: Bugfix for layer2 fixed TEI mode 2012-08-06 13:22:50 -07:00
layer2.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
socket.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
stack.c drivers/isdn/mISDN/stack.c: remove invalid reference to list iterator variable 2012-07-09 15:24:33 -07:00
tei.c mISDN: L2 timeouts need to be queued as L2 event 2012-05-04 11:54:27 -04:00
timerdev.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00