diff --git a/[refs] b/[refs] index 9d2caf341c31..56df9ffce9a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e030655dda5b5efc4305e2a8f46c4967d32eb3d +refs/heads/master: f26542600e605482a1231c44ddb2966d69bd09b0 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 823ee0a2d2a3..3f7e60995c80 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -940,6 +940,7 @@ menu "Performance Counters" config PERF_COUNTERS bool "Kernel Performance Counters" + default y if PROFILING depends on HAVE_PERF_COUNTERS select ANON_INODES help