diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 10:16:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 10:16:10 -0700 |
| commit | a21e40877ad130de837b0394583e4f68dc2ab6c5 (patch) | |
| tree | c990fba6ef5f2ed464c906615c5c327f2d02b318 /fs/proc | |
| parent | b9b16a792241e304834f43e2a5f02e6e43576f09 (diff) | |
| parent | 073d8224d299528778e90773becd1e890953443c (diff) | |
| download | op-kernel-dev-a21e40877ad130de837b0394583e4f68dc2ab6c5.zip op-kernel-dev-a21e40877ad130de837b0394583e4f68dc2ab6c5.tar.gz | |
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 'fs/proc')
| -rw-r--r-- | fs/proc/stat.c | 2 | ||||
| -rw-r--r-- | fs/proc/uptime.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/stat.c b/fs/proc/stat.c index 6f599c6..9d231e9 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c @@ -9,7 +9,7 @@ #include <linux/slab.h> #include <linux/time.h> #include <linux/irqnr.h> -#include <asm/cputime.h> +#include <linux/cputime.h> #include <linux/tick.h> #ifndef arch_irq_stat_cpu diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c index 7141b8d..33de567 100644 --- a/fs/proc/uptime.c +++ b/fs/proc/uptime.c @@ -5,7 +5,7 @@ #include <linux/seq_file.h> #include <linux/time.h> #include <linux/kernel_stat.h> -#include <asm/cputime.h> +#include <linux/cputime.h> static int uptime_proc_show(struct seq_file *m, void *v) { |
