1. 19 12月, 2014 1 次提交
    • T
      tick/powerclamp: Remove tick_nohz_idle abuse · a5fd9733
      Thomas Gleixner 提交于
      commit 4dbd2771 "tick: export nohz tick idle symbols for module
      use" was merged via the thermal tree without an explicit ack from the
      relevant maintainers.
      
      The exports are abused by the intel powerclamp driver which implements
      a fake idle state from a sched FIFO task. This causes all kinds of
      wreckage in the NOHZ core code which rightfully assumes that
      tick_nohz_idle_enter/exit() are only called from the idle task itself.
      
      Recent changes in the NOHZ core lead to a failure of the powerclamp
      driver and now people try to hack completely broken and backwards
      workarounds into the NOHZ core code. This is completely unacceptable
      and just papers over the real problem. There are way more subtle
      issues lurking around the corner.
      
      The real solution is to fix the powerclamp driver by rewriting it with
      a sane concept, but that's beyond the scope of this.
      
      So the only solution for now is to remove the calls into the core NOHZ
      code from the powerclamp trainwreck along with the exports. 
      
      Fixes: d6d71ee4 "PM: Introduce Intel PowerClamp Driver"
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
      Cc: Viresh Kumar <viresh.kumar@linaro.org>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Fengguang Wu <fengguang.wu@intel.com>
      Cc: Frederic Weisbecker <frederic@kernel.org>
      Cc: Pan Jacob jun <jacob.jun.pan@intel.com>
      Cc: LKP <lkp@01.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Zhang Rui <rui.zhang@intel.com>
      Cc: stable@vger.kernel.org
      Link: http://lkml.kernel.org/r/alpine.DEB.2.11.1412181110110.17382@nanosSigned-off-by: NThomas Gleixner <tglx@linutronix.de>
      a5fd9733
  2. 09 12月, 2014 1 次提交
  3. 15 5月, 2014 1 次提交
  4. 14 1月, 2014 1 次提交
  5. 03 1月, 2014 1 次提交
  6. 20 12月, 2013 1 次提交
  7. 09 10月, 2013 2 次提交
  8. 01 3月, 2013 1 次提交
    • L
      Fix mis-merge of intel_powerclamp.c resulting in compile error · 19cc90f5
      Linus Torvalds 提交于
      The new intel_powerclamp thermal cooling device driver was merged in
      commit 2af78448 (Pull thermal management updates from Zhang Rui)
      without any data conflicts.  But there was a more subtle conflict I
      missed: the driver uses MAX_USER_RT_PRIO, but commit 8bd75c77
      ("sched/rt: Move rt specific bits into new header file") had moved that
      define from <linux/sched.h> to <linux/sched/rt.h>.
      
      Which caused this build failure:
      
        drivers/thermal/intel_powerclamp.c: In function ‘clamp_thread’:
        drivers/thermal/intel_powerclamp.c:360:21: error: ‘MAX_USER_RT_PRIO’ undeclared (first use in this function)
        drivers/thermal/intel_powerclamp.c:360:21: note: each undeclared identifier is reported only once for each function it appears in
      
      And because I don't do a full "make allmodconfig" build after each pull,
      I didn't notice until too late.  So now the fix is here, separately from
      the merge commit.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      19cc90f5
  9. 06 2月, 2013 2 次提交