Patches contributed by Eötvös Lorand University

commit d9e24427f339e5c18419769d41697062811c5cd8
Merge: d87f69a16eb2 65c1e0452a33
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Dec 20 20:32:37 2011 +0100

    Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core

commit d87f69a16eb2cb96459117b06949a560679002e4
Merge: 124ba9403318 384703b8e6cd
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Dec 20 20:32:03 2011 +0100

    Merge commit 'v3.2-rc6' into perf/core
    
    Merge reason: Update with the latest fixes.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 45aa0663cc408617b79a2b53f0a5f50e94688a48
Merge: 511585a28e5b 7bd0b0f0da3b
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Dec 20 12:14:26 2011 +0100

    Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock

commit 124ba9403318d834ef21bcd899c22c870708d2c4
Merge: 74eec26facad dd3c4670d7fa
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Dec 20 12:10:29 2011 +0100

    Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core

commit 6e5ed276374c329b93a968d640f4d26c8c05411b
Merge: d79a8869d8a4 384703b8e6cd
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun Dec 18 10:35:16 2011 +0100

    Merge commit 'v3.2-rc6' into x86/platform

commit a228b5892b0527b8574c06edc72cacaf8c25418d
Merge: 715a43182a20 2c29d9dd577b
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun Dec 18 09:18:45 2011 +0100

    Merge branch 'mce-inject' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce

commit 6a54aebf6978e9f296a4d3da3e40af425163c22e
Merge: 067491b7313c dc47ce90c3a8
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Dec 15 08:21:21 2011 +0100

    Merge commit 'v3.2-rc5' into sched/core
    
    Merge reason: Pick up the latest fixes.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc fs/proc/stat.c
index 8a6ab666e9f8,2a30d67dd6b8..2527a68057fc
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@@ -28,10 -29,10 +28,10 @@@ static u64 get_idle_time(int cpu
  
  	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 = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
 +		idle += arch_idle_time(cpu);
  	} else
- 		idle = usecs_to_cputime(idle_time);
+ 		idle = nsecs_to_jiffies64(1000 * idle_time);
  
  	return idle;
  }
@@@ -42,9 -44,9 +42,9 @@@ static u64 get_iowait_time(int cpu
  
  	if (iowait_time == -1ULL)
  		/* !NO_HZ so we can rely on cpustat.iowait */
 -		iowait = kstat_cpu(cpu).cpustat.iowait;
 +		iowait = kcpustat_cpu(cpu).cpustat[CPUTIME_IOWAIT];
  	else
- 		iowait = usecs_to_cputime(iowait_time);
+ 		iowait = nsecs_to_jiffies64(1000 * iowait_time);
  
  	return iowait;
  }

commit 715a43182a20a9e2bae59b4e0826a91ee30f355c
Merge: 29e9bf1841e4 093719571571
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Dec 15 08:13:40 2011 +0100

    Merge branch 'early-mce-decode' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/mce

commit 304fb45374918b166233855bcf498b02586afd80
Merge: 373da0a2a330 597e11a367e8
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Dec 15 08:12:15 2011 +0100

    Merge branch 'ucode-verify-size' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/microcode

commit 919b83452b2e7c1dbced0456015508b4b9585db3
Merge: 373da0a2a330 a513f6bab093
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Dec 14 08:16:43 2011 +0100

    Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu