summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-10 16:22:57 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-10 16:22:57 +0200
commit6db883830687df1e7395de2e11e8de2a7ccb179b (patch)
tree81df26ac47ea95ad1c3199025c5cf626aab2d033 /fs
parentd7a56bafbddd724ade25247f4dfe5e7d3800ab33 (diff)
parenta2eddfa95919a730e0e5ed17e9c303fe5ba249cd (diff)
Merge branch 'x86/irqstats' into auto-x86-next
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/proc_misc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 15f7bd41029b..c652d469dc08 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -479,6 +479,13 @@ static const struct file_operations proc_vmalloc_operations = {
};
#endif
+#ifndef arch_irq_stat_cpu
+#define arch_irq_stat_cpu(cpu) 0
+#endif
+#ifndef arch_irq_stat
+#define arch_irq_stat() 0
+#endif
+
static int show_stat(struct seq_file *p, void *v)
{
int i;
@@ -516,7 +523,9 @@ static int show_stat(struct seq_file *p, void *v)
sum += temp;
per_irq_sum[j] += temp;
}
+ sum += arch_irq_stat_cpu(i);
}
+ sum += arch_irq_stat();
seq_printf(p, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu\n",
(unsigned long long)cputime64_to_clock_t(user),