aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <[email protected]>2012-01-14 00:01:01 +0000
committerIngo Molnar <[email protected]>2012-01-16 08:13:27 +0100
commitf7e6746ebae984ea67b0a1a1e23c7e6698240631 (patch)
treeb77704a47d3b00ed3cd39226c51b7a8ba7f92710
parentbced76aeaca03b45e3b4bdb868cada328e497847 (diff)
sched/accounting, proc: Fix /proc/stat interrupts sum
Commit 3292beb340c7688 ("sched/accounting: Change cpustat fields to an array") deleted the code which provides us with the sum of all interrupts in the system, causing vmstat to report zero interrupts occuring in the system. Fix this by restoring the code. Signed-off-by: Russell King <[email protected]> Tested-by: Russell King <[email protected]> # [on ARM] Tested-by: Tony Luck <[email protected]> Tested-by: Steven Rostedt <[email protected]> Cc: Glauber Costa <[email protected]> Cc: KAMEZAWA Hiroyuki <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Paul Tuner <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
-rw-r--r--fs/proc/stat.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index d76ca6ae2b1b..121f77cfef76 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -77,6 +77,8 @@ static int show_stat(struct seq_file *p, void *v)
steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
+ sum += kstat_cpu_irqs_sum(i);
+ sum += arch_irq_stat_cpu(i);
for (j = 0; j < NR_SOFTIRQS; j++) {
unsigned int softirq_stat = kstat_softirqs_cpu(j, i);