[<prev] [next>] [day] [month] [year] [list]
Message-Id: <201201192240.q0JMer4j003534@tazenda.hos.anvin.org>
Date: Thu, 19 Jan 2012 14:40:53 -0800
From: "H. Peter Anvin" <hpa@...or.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Glauber Costa <glommer@...allels.com>,
"H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...e.hu>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Paul Tuner <pjt@...gle.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Russell King <rmk+kernel@....linux.org.uk>,
Steven Rostedt <rostedt@...dmis.org>,
Thomas Gleixner <tglx@...utronix.de>,
Tony Luck <tony.luck@...el.com>
Subject: [GIT PULL] sched fixes for v3.3-rc1
Hi Linus,
The following changes since commit bced76aeaca03b45e3b4bdb868cada328e497847:
sched: Fix lockup by limiting load-balance retries on lock-break (2012-01-11 17:15:12 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
The head of this tree is f7e6746ebae984ea67b0a1a1e23c7e6698240631.
Russell King (1):
sched/accounting, proc: Fix /proc/stat interrupts sum
fs/proc/stat.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index d76ca6a..121f77c 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -77,6 +77,8 @@ static int show_stat(struct seq_file *p, void *v)
steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
+ sum += kstat_cpu_irqs_sum(i);
+ sum += arch_irq_stat_cpu(i);
for (j = 0; j < NR_SOFTIRQS; j++) {
unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists