diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 | 
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 | 
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /include/linux/kernel_stat.h | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/kernel_stat.h')
| -rw-r--r-- | include/linux/kernel_stat.h | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index dba27749b428..a484572c302e 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h  | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/smp.h> | 6 | #include <linux/smp.h> | 
| 7 | #include <linux/threads.h> | 7 | #include <linux/threads.h> | 
| 8 | #include <linux/percpu.h> | 8 | #include <linux/percpu.h> | 
| 9 | #include <linux/cpumask.h> | ||
| 9 | #include <asm/cputime.h> | 10 | #include <asm/cputime.h> | 
| 10 | 11 | ||
| 11 | /* | 12 | /* | 
| @@ -43,11 +44,10 @@ extern unsigned long long nr_context_switches(void); | |||
| 43 | */ | 44 | */ | 
| 44 | static inline int kstat_irqs(int irq) | 45 | static inline int kstat_irqs(int irq) | 
| 45 | { | 46 | { | 
| 46 | int i, sum=0; | 47 | int cpu, sum = 0; | 
| 47 | 48 | ||
| 48 | for (i = 0; i < NR_CPUS; i++) | 49 | for_each_cpu(cpu) | 
| 49 | if (cpu_possible(i)) | 50 | sum += kstat_cpu(cpu).irqs[irq]; | 
| 50 | sum += kstat_cpu(i).irqs[irq]; | ||
| 51 | 51 | ||
| 52 | return sum; | 52 | return sum; | 
| 53 | } | 53 | } | 
