History

Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: oprofile/x86: fix msr access to reserved counters oprofile/x86: use kzalloc() instead of kmalloc() oprofile/x86: fix perfctr nmi reservation for mulitplexing oprofile/x86: add comment to counter-in-use warning oprofile/x86: warn user if a counter is already active oprofile/x86: implement randomization for IBS periodic op counter oprofile/x86: implement lsfr pseudo-random number generator for IBS oprofile/x86: implement IBS cpuid feature detection oprofile/x86: remove node check in AMD IBS initialization oprofile/x86: remove OPROFILE_IBS config option oprofile: remove EXPERIMENTAL from the config option description oprofile: remove tracing build dependency

Linus Torvalds committed 16 years ago

Commit d25e8db2 parents 642c4c7 cfc9c0b7 files · +200 −124Browse files

Showing the changes to init (1 of 7 files). Show all

Unified · Split

init/Kconfig+1−1
@@ -1128,7 +1128,7 @@ config MMAP_ALLOW_UNINITIALIZED · 1127 unmodified lines
11281128 See Documentation/nommu-mmap.txt for more information.
11291129
11301130 config PROFILING
1131− bool "Profiling support (EXPERIMENTAL)"
1131+ bool "Profiling support"
11321132 help
11331133 Say Y here to enable the extended profiling support mechanisms used
11341134 by profilers such as OProfile.