1 files changed, 18 insertions, 7 deletions

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 5fd49e47f83a..bee251cb87c8 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -105,6 +105,7 @@ static int uptime_read_proc(char *page, char **start, off_t off,
         cputime_t idletime = cputime_add(init_task.utime, init_task.stime);
 
         do_posix_clock_monotonic_gettime(&uptime);
+        monotonic_to_bootbased(&uptime);
         cputime_to_timespec(idletime, &idle);
         len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
                         (unsigned long) uptime.tv_sec,
@@ -443,12 +444,17 @@ static int show_stat(struct seq_file *p, void *v)
         unsigned long jif;
         cputime64_t user, nice, system, idle, iowait, irq, softirq, steal;
         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;
 
         user = nice = system = idle = iowait =
                 irq = softirq = steal = cputime64_zero;
-        jif = - wall_to_monotonic.tv_sec;
-        if (wall_to_monotonic.tv_nsec)
-                --jif;
+        getboottime(&boottime);
+        jif = boottime.tv_sec;
 
         for_each_possible_cpu(i) {
                 int j;
@@ -461,8 +467,11 @@ static int show_stat(struct seq_file *p, void *v)
                 irq = cputime64_add(irq, kstat_cpu(i).cpustat.irq);
                 softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq);
                 steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
-                for (j = 0 ; j < NR_IRQS ; j++)
-                        sum += kstat_cpu(i).irqs[j];
+                for (j = 0; j < NR_IRQS; j++) {
+                        unsigned int temp = kstat_cpu(i).irqs[j];
+                        sum += temp;
+                        per_irq_sum[j] += temp;
+                }
         }
 
         seq_printf(p, "cpu  %llu %llu %llu %llu %llu %llu %llu %llu\n",
@@ -498,9 +507,10 @@ static int show_stat(struct seq_file *p, void *v)
         }
         seq_printf(p, "intr %llu", (unsigned long long)sum);
 
-#if !defined(CONFIG_PPC64) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
+#ifndef CONFIG_SMP
+        /* Touches too many cache lines on SMP setups */
         for (i = 0; i < NR_IRQS; i++)
-                seq_printf(p, " %u", kstat_irqs(i));
+                seq_printf(p, " %u", per_irq_sum[i]);
 #endif
 
         seq_printf(p,
@@ -515,6 +525,7 @@ static int show_stat(struct seq_file *p, void *v)
                 nr_running(),
                 nr_iowait());
 
+        kfree(per_irq_sum);
         return 0;
 }