diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-19 23:50:09 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:52:32 -0400 |
commit | 7f95ec9e4c12fd067febfd57532da1166d75d858 (patch) | |
tree | b395b6776485f60e3f5d9d820ad665161ef76771 /fs/proc/proc_misc.c | |
parent | 3060d6fe28570640c2d7d66d38b9eaa848c3b9e3 (diff) |
x86: move kstat_irqs from kstat to irq_desc
based on Eric's patch ...
together mold it with dyn_array for irq_desc, will allcate kstat_irqs for
nr_irq_desc alltogether if needed. -- at that point nr_cpus is known already.
v2: make sure system without generic_hardirqs works they don't have irq_desc
v3: fix merging
v4: [mingo@elte.hu] fix typo
[ mingo@elte.hu ] irq: build fix
fix:
arch/x86/xen/spinlock.c: In function 'xen_spin_lock_slow':
arch/x86/xen/spinlock.c:90: error: 'struct kernel_stat' has no member named 'irqs'
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/proc/proc_misc.c')
-rw-r--r-- | fs/proc/proc_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index a2173a2a5625..aa069acf61a0 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
@@ -532,7 +532,7 @@ static int show_stat(struct seq_file *p, void *v) | |||
532 | steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal); | 532 | steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal); |
533 | guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest); | 533 | guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest); |
534 | for (j = 0; j < nr_irqs; j++) { | 534 | for (j = 0; j < nr_irqs; j++) { |
535 | unsigned int temp = kstat_cpu(i).irqs[j]; | 535 | unsigned int temp = kstat_irqs_cpu(j, i); |
536 | sum += temp; | 536 | sum += temp; |
537 | per_irq_sum[j] += temp; | 537 | per_irq_sum[j] += temp; |
538 | } | 538 | } |