summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 10:15:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 10:15:31 -0800
commitd25e8dbdab203ed8b4fd0a174bb5259e35ecd87c (patch)
tree46aadc89806daebe509f35daa962114b7a730090 /init
parent642c4c75a765d7a3244ab39c8e6fb09be21eca5b (diff)
parentcfc9c0b450176a077205ef39092f0dc1a04e020a (diff)
downloadkernel-d25e8dbdab203ed8b4fd0a174bb5259e35ecd87c.tar.gz
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
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index d038a57004a2..207ae29354a3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1128,7 +1128,7 @@ config MMAP_ALLOW_UNINITIALIZED
See Documentation/nommu-mmap.txt for more information.
config PROFILING
- bool "Profiling support (EXPERIMENTAL)"
+ bool "Profiling support"
help
Say Y here to enable the extended profiling support mechanisms used
by profilers such as OProfile.