summaryrefslogtreecommitdiff
path: root/fs/proc/stat.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 21:06:54 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 21:06:54 (GMT)
commit9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf (patch)
tree158cd337307a4a4e09a3fb5110f29ab0136bef6c /fs/proc/stat.c
parent4e7682d077d693e34a993ae7a2831b522930ebcb (diff)
parent0af5e4c36e70cfd4ae96d3704a425c414f530f2a (diff)
downloadlinux-fsl-qoriq-9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf.tar.xz
Merge branch 'sa11x0-mcp-fixes' into fixes
Diffstat (limited to 'fs/proc/stat.c')
-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 d76ca6a..121f77c 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);