Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a21e4087 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timer updates from Ingo Molnar:
 "The main purpose is to fix a full dynticks bug related to
  virtualization, where steal time accounting appears to be zero in
  /proc/stat even after a few seconds of competing guests running busy
  loops in a same host CPU.  It's not a regression though as it was
  there since the beginning.

  The other commits are preparatory work to fix the bug and various
  cleanups"

* 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arch: Remove stub cputime.h headers
  sched: Remove needless round trip nsecs <-> tick conversion of steal time
  cputime: Fix jiffies based cputime assumption on steal accounting
  cputime: Bring cputime -> nsecs conversion
  cputime: Default implementation of nsecs -> cputime conversion
  cputime: Fix nsecs_to_cputime() return type cast
parents b9b16a79 073d8224
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line


generic-y += clkdev.h
generic-y += cputime.h
generic-y += exec.h
generic-y += hash.h
generic-y += mcs_spinlock.h

arch/alpha/include/asm/cputime.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line
#ifndef __ALPHA_CPUTIME_H
#define __ALPHA_CPUTIME_H

#include <asm-generic/cputime.h>

#endif /* __ALPHA_CPUTIME_H */
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ header-y += arch-v32/

generic-y += barrier.h
generic-y += clkdev.h
generic-y += cputime.h
generic-y += exec.h
generic-y += hash.h
generic-y += kvm_para.h

arch/cris/include/asm/cputime.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line
#ifndef __CRIS_CPUTIME_H
#define __CRIS_CPUTIME_H

#include <asm-generic/cputime.h>

#endif /* __CRIS_CPUTIME_H */
+1 −0
Original line number Diff line number Diff line

generic-y += clkdev.h
generic-y += cputime.h
generic-y += exec.h
generic-y += hash.h
generic-y += mcs_spinlock.h
Loading