diff options
| author | Linus Torvalds | 2014-04-01 19:16:10 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-04-01 19:16:10 +0200 |
| commit | a21e40877ad130de837b0394583e4f68dc2ab6c5 (patch) | |
| tree | c990fba6ef5f2ed464c906615c5c327f2d02b318 /arch/cris | |
| parent | Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | arch: Remove stub cputime.h headers (diff) | |
| download | kernel-qcow2-linux-a21e40877ad130de837b0394583e4f68dc2ab6c5.tar.gz kernel-qcow2-linux-a21e40877ad130de837b0394583e4f68dc2ab6c5.tar.xz kernel-qcow2-linux-a21e40877ad130de837b0394583e4f68dc2ab6c5.zip | |
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
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/cris/include/asm/cputime.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 056027f38351..afff5105909d 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -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 diff --git a/arch/cris/include/asm/cputime.h b/arch/cris/include/asm/cputime.h deleted file mode 100644 index 4446a65656fa..000000000000 --- a/arch/cris/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __CRIS_CPUTIME_H -#define __CRIS_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __CRIS_CPUTIME_H */ |