From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 04:29:27 +0000 (+1100)
Subject: Merge remote-tracking branch 'cputime/cputime'
X-Git-Tag: next-20111213~33
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e4047fce57addcb04126ce37d211c389fe2bd3b;p=karo-tx-linux.git

Merge remote-tracking branch 'cputime/cputime'
---

1e4047fce57addcb04126ce37d211c389fe2bd3b
diff --cc fs/proc/stat.c
index 2a30d67dd6b8,762961f7c335..714d5d131e76
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@@ -30,9 -30,9 +30,9 @@@ static cputime64_t get_idle_time(int cp
  	if (idle_time == -1ULL) {
  		/* !NO_HZ so we can rely on cpustat.idle */
  		idle = kstat_cpu(cpu).cpustat.idle;
- 		idle = cputime64_add(idle, arch_idle_time(cpu));
+ 		idle += arch_idle_time(cpu);
  	} else
 -		idle = usecs_to_cputime(idle_time);
 +		idle = nsecs_to_jiffies64(1000 * idle_time);
  
  	return idle;
  }