commit 766fd5f6cdaf1d558afba19850493b2603c9625d
author Linus Torvalds <torvalds@linux-foundation.org> Mon Jul 25 14:43:00 2016 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jul 25 14:43:00 2016 -0700
tree fcb4eb4a041aa0b0f9309c30a982c5b7bdad76ae
parent cca08cd66ce6cc37812b6b36986ba7eaabd33e0b
parent 553bf6bbfd8a540c70aee28eb50e24caff456a03

Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull NOHZ updates from Ingo Molnar:

 - fix system/idle cputime leaked on cputime accounting (all nohz
   configs) (Rik van Riel)

 - remove the messy, ad-hoc irqtime account on nohz-full and make it
   compatible with CONFIG_IRQ_TIME_ACCOUNTING=y instead (Rik van Riel)

 - cleanups (Frederic Weisbecker)

 - remove unecessary irq disablement in the irqtime code (Rik van Riel)

* 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/cputime: Drop local_irq_save/restore from irqtime_account_irq()
  sched/cputime: Reorganize vtime native irqtime accounting headers
  sched/cputime: Clean up the old vtime gen irqtime accounting completely
  sched/cputime: Replace VTIME_GEN irq time code with IRQ_TIME_ACCOUNTING code
  sched/cputime: Count actually elapsed irq & softirq time