diff --git a/[refs] b/[refs] index 190fd2a90722..d5ff270f1378 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18b4a4d59e97e7ff13ee84b5bec79f3fc70a9f0a +refs/heads/master: b309a294e5b24692d0f7ea1defa168074cea619e diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index 25e69f727a2e..d67787241813 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -3,7 +3,7 @@ # config OPROFILE - tristate "OProfile system profiling (EXPERIMENTAL)" + tristate "OProfile system profiling" depends on PROFILING depends on HAVE_OPROFILE select RING_BUFFER diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index d95ca7cd5d45..b7c583956107 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -1112,7 +1112,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.