Merge branch 'core' of git://amd64.org/linux/rric into perf/core

2011-11-15 11:05:18 +01:00
parent 5d81e5cfb3 de346b6949
commit c23205c848
11 changed files with 252 additions and 94 deletions
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1885,6 +1885,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			arch_perfmon: [X86] Force use of architectural
 				perfmon on Intel CPUs instead of the
 				CPU specific event set.
+			timer: [X86] Force use of architectural NMI
+				timer mode (see also oprofile.timer
+				for generic hr timer mode)

 	oops=panic	Always panic on oopses. Default is to just kill the
 			process, but there is a small probability of