Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c

2 files changed, 23 insertions, 25 deletions

diff --git a/fs/proc/array.c b/fs/proc/array.c
index f4bc0e789539..bb9f4b05703d 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -388,20 +388,20 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
 
                 /* add up live thread stats at the group level */
                 if (whole) {
+                        struct task_cputime cputime;
                         struct task_struct *t = task;
                         do {
                                 min_flt += t->min_flt;
                                 maj_flt += t->maj_flt;
-                                utime = cputime_add(utime, task_utime(t));
-                                stime = cputime_add(stime, task_stime(t));
                                 gtime = cputime_add(gtime, task_gtime(t));
                                 t = next_thread(t);
                         } while (t != task);
 
                         min_flt += sig->min_flt;
                         maj_flt += sig->maj_flt;
-                        utime = cputime_add(utime, sig->utime);
-                        stime = cputime_add(stime, sig->stime);
+                        thread_group_cputime(task, &cputime);
+                        utime = cputime.utime;
+                        stime = cputime.stime;
                         gtime = cputime_add(gtime, sig->gtime);
                 }
 
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 61b25f4eabe6..7ea52c79b2da 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -30,6 +30,7 @@
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/pagemap.h>
+#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
@@ -521,17 +522,13 @@ static const struct file_operations proc_vmalloc_operations = {
 
 static int show_stat(struct seq_file *p, void *v)
 {
-        int i;
+        int i, j;
         unsigned long jif;
         cputime64_t user, nice, system, idle, iowait, irq, softirq, steal;
         cputime64_t guest;
         u64 sum = 0;
         struct timespec boottime;
-        unsigned int *per_irq_sum;
-
-        per_irq_sum = kzalloc(sizeof(unsigned int)*NR_IRQS, GFP_KERNEL);
-        if (!per_irq_sum)
-                return -ENOMEM;
+        unsigned int per_irq_sum;
 
         user = nice = system = idle = iowait =
                 irq = softirq = steal = cputime64_zero;
@@ -540,8 +537,6 @@ static int show_stat(struct seq_file *p, void *v)
         jif = boottime.tv_sec;
 
         for_each_possible_cpu(i) {
-                int j;
-
                 user = cputime64_add(user, kstat_cpu(i).cpustat.user);
                 nice = cputime64_add(nice, kstat_cpu(i).cpustat.nice);
                 system = cputime64_add(system, kstat_cpu(i).cpustat.system);
@@ -551,11 +546,10 @@ static int show_stat(struct seq_file *p, void *v)
                 softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq);
                 steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
                 guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest);
-                for (j = 0; j < NR_IRQS; j++) {
-                        unsigned int temp = kstat_cpu(i).irqs[j];
-                        sum += temp;
-                        per_irq_sum[j] += temp;
-                }
+
+                for_each_irq_nr(j)
+                        sum += kstat_irqs_cpu(j, i);
+
                 sum += arch_irq_stat_cpu(i);
         }
         sum += arch_irq_stat();
@@ -597,8 +591,15 @@ static int show_stat(struct seq_file *p, void *v)
         }
         seq_printf(p, "intr %llu", (unsigned long long)sum);
 
-        for (i = 0; i < NR_IRQS; i++)
-                seq_printf(p, " %u", per_irq_sum[i]);
+        /* sum again ? it could be updated? */
+        for_each_irq_nr(j) {
+                per_irq_sum = 0;
+
+                for_each_possible_cpu(i)
+                        per_irq_sum += kstat_irqs_cpu(j, i);
+
+                seq_printf(p, " %u", per_irq_sum);
+        }
 
         seq_printf(p,
                 "\nctxt %llu\n"
@@ -612,7 +613,6 @@ static int show_stat(struct seq_file *p, void *v)
                 nr_running(),
                 nr_iowait());
 
-        kfree(per_irq_sum);
         return 0;
 }
 
@@ -651,15 +651,14 @@ static const struct file_operations proc_stat_operations = {
  */
 static void *int_seq_start(struct seq_file *f, loff_t *pos)
 {
-        return (*pos <= NR_IRQS) ? pos : NULL;
+        return (*pos <= nr_irqs) ? pos : NULL;
 }
 
+
 static void *int_seq_next(struct seq_file *f, void *v, loff_t *pos)
 {
         (*pos)++;
-        if (*pos > NR_IRQS)
-                return NULL;
-        return pos;
+        return (*pos <= nr_irqs) ? pos : NULL;
 }
 
 static void int_seq_stop(struct seq_file *f, void *v)
@@ -667,7 +666,6 @@ static void int_seq_stop(struct seq_file *f, void *v)
         /* Nothing to do */
 }
 
-
 static const struct seq_operations int_seq_ops = {
         .start = int_seq_start,
         .next  = int_seq_next,